Merge branch 'master' into f17
This commit is contained in:
commit
83c9bb807e
32
bacula.spec
32
bacula.spec
@ -35,30 +35,36 @@ Patch5: bacula-5.2.4-log-path.patch
|
|||||||
Patch6: bacula-5.0.3-sqlite-priv.patch
|
Patch6: bacula-5.0.3-sqlite-priv.patch
|
||||||
Patch8: bacula-5.2.2-qt-console-optflags.patch
|
Patch8: bacula-5.2.2-qt-console-optflags.patch
|
||||||
|
|
||||||
BuildRequires: openssl-devel, ncurses-devel, perl, glibc-devel
|
BuildRequires: perl sed desktop-file-utils
|
||||||
BuildRequires: libstdc++-devel, libxml2-devel, zlib-devel
|
BuildRequires: openssl-devel%{?_isa}
|
||||||
BuildRequires: mysql-devel, postgresql-devel, sqlite-devel
|
BuildRequires: ncurses-devel%{?_isa}
|
||||||
BuildRequires: desktop-file-utils, python-devel, sed
|
BuildRequires: glibc-devel%{?_isa}
|
||||||
BuildRequires: libacl-devel, readline-devel, libcap-devel
|
BuildRequires: libstdc++-devel%{?_isa}
|
||||||
|
BuildRequires: libxml2-devel%{?_isa}
|
||||||
|
BuildRequires: zlib-devel%{?_isa}
|
||||||
|
BuildRequires: mysql-devel%{?_isa}
|
||||||
|
BuildRequires: postgresql-devel%{?_isa}
|
||||||
|
BuildRequires: sqlite-devel%{?_isa}
|
||||||
|
BuildRequires: python-devel%{?_isa}
|
||||||
|
BuildRequires: libacl-devel%{?_isa}
|
||||||
|
BuildRequires: readline-devel%{?_isa}
|
||||||
|
BuildRequires: libcap-devel%{?_isa}
|
||||||
|
BuildRequires: lzo-devel%{?_isa}
|
||||||
|
|
||||||
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
|
%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
|
||||||
BuildRequires: qt4-devel >= 4.6.2
|
BuildRequires: qt4-devel%{?_isa} >= 4.6.2
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora} >= 7 || 0%{?rhel} >= 6
|
%if 0%{?fedora} >= 7 || 0%{?rhel} >= 6
|
||||||
BuildRequires: tcp_wrappers-devel
|
BuildRequires: tcp_wrappers-devel%{?_isa}
|
||||||
%else
|
%else
|
||||||
BuildRequires: tcp_wrappers
|
BuildRequires: tcp_wrappers%{?_isa}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
|
%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
|
||||||
BuildRequires: systemd-units
|
BuildRequires: systemd-units
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
|
|
||||||
BuildRequires: lzo-devel >= 2.02
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Bacula is a set of programs that allow you to manage the backup,
|
Bacula is a set of programs that allow you to manage the backup,
|
||||||
recovery, and verification of computer data across a network of
|
recovery, and verification of computer data across a network of
|
||||||
@ -825,6 +831,8 @@ fi
|
|||||||
%changelog
|
%changelog
|
||||||
* Mon May 21 2012 Simone Caronni <negativo17@gmail.com> - 5.2.6-3
|
* Mon May 21 2012 Simone Caronni <negativo17@gmail.com> - 5.2.6-3
|
||||||
- Removed _install, _mkdir and _make macro.
|
- Removed _install, _mkdir and _make macro.
|
||||||
|
- Added _isa to BuildRequires.
|
||||||
|
- Removed lzo-devel option for RHEL 4 (EOL).
|
||||||
|
|
||||||
* Fri Mar 16 2012 Simone Caronni <negativo17@gmail.com> - 5.2.6-2
|
* Fri Mar 16 2012 Simone Caronni <negativo17@gmail.com> - 5.2.6-2
|
||||||
- Move libbaccats and libbacsql into bacula-libs-sql package so only
|
- Move libbaccats and libbacsql into bacula-libs-sql package so only
|
||||||
|
Loading…
Reference in New Issue
Block a user