resolve broken deps

This commit is contained in:
Tom "spot" Callaway 2011-12-01 13:02:53 -05:00
parent 16d9a36e02
commit 0e92b95995

View File

@ -1,6 +1,6 @@
Name: bacula
Version: 5.2.2
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details
License: GPLv2 with exceptions
@ -175,8 +175,15 @@ system to be backed up.
%package storage-common
Summary: Common Bacula storage daemon files
Group: System Environment/Daemons
Requires: bacula-storage = %{version}-%{release}
Requires: bacula-common%{?_isa} = %{version}-%{release}
# Storage backends merged into core.
Provides: bacula-storage = %{version}-%{release}
Provides: bacula-storage-mysql = %{version}-%{release}
Obsoletes: bacula-storage-mysql < 5.2.0
Provides: bacula-storage-sqlite = %{version}-%{release}
Obsoletes: bacula-storage-sqlite < 5.2.0
Provides: bacula-storage-postgresql = %{version}-%{release}
Obsoletes: bacula-storage-postgresql < 5.2.0
%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
Requires(post): systemd-sysv
Requires(post): systemd-units
@ -200,57 +207,6 @@ writing the data received from the clients onto tape drives or other
mass storage devices.
%package storage-mysql
Summary: MySQL Bacula storage daemon files
Group: System Environment/Daemons
Provides: bacula-storage = %{version}-%{release}
Requires: bacula-storage-common%{?_isa} = %{version}-%{release}
Requires: bacula-common%{?_isa} = %{version}-%{release}
%description storage-mysql
Bacula is a set of programs that allow you to manage the backup,
recovery, and verification of computer data across a network of
different computers. It is based on a client/server architecture.
This package contains the storage daemon, the daemon responsible for
writing the data received from the clients onto tape drives or other
mass storage devices.
%package storage-sqlite
Summary: SQLite Bacula storage daemon files
Group: System Environment/Daemons
Provides: bacula-storage = %{version}-%{release}
Requires: bacula-storage-common%{?_isa} = %{version}-%{release}
Requires: bacula-common%{?_isa} = %{version}-%{release}
%description storage-sqlite
Bacula is a set of programs that allow you to manage the backup,
recovery, and verification of computer data across a network of
different computers. It is based on a client/server architecture.
This package contains the storage daemon, the daemon responsible for
writing the data received from the clients onto tape drives or other
mass storage devices.
%package storage-postgresql
Summary: Common Bacula storage daemon files
Group: System Environment/Daemons
Provides: bacula-storage = %{version}-%{release}
Requires: bacula-storage-common%{?_isa} = %{version}-%{release}
Requires: bacula-common%{?_isa} = %{version}-%{release}
%description storage-postgresql
Bacula is a set of programs that allow you to manage the backup,
recovery, and verification of computer data across a network of
different computers. It is based on a client/server architecture.
This package contains the storage daemon, the daemon responsible for
writing the data received from the clients onto tape drives or other
mass storage devices.
%package common
Summary: Common Bacula utilities
Group: System Environment/Daemons
@ -419,7 +375,7 @@ make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_libexecdir}/bacula/bconsole
rm -f %{buildroot}%{_mandir}/man1/bacula-bwxconsole.1*
rm -f %{buildroot}%{_mandir}/man1/bacula-tray-monitor.1*
rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so
# rm -f %{buildroot}%{_libdir}/libbaccats-%{version}.so
mkdir -p %{buildroot}%{_bindir}
@ -693,6 +649,7 @@ fi
%{_libexecdir}/%{name}/btraceback.mdb
%{_libdir}/libbac-%{version}.so
%{_libdir}/libbac.so
%{_libdir}/libbaccats-%{version}.so
%{_libdir}/libbaccats.so
%{_libdir}/libbaccfg-%{version}.so
%{_libdir}/libbaccfg.so
@ -853,6 +810,9 @@ fi
%changelog
* Thu Dec 1 2011 Tom Callaway <spot@fedoraproject.org> - 5.2.2-2
- resolve broken dependency issues
* Tue Nov 29 2011 Tom Callaway <spot@fedoraproject.org> - 5.2.2-1
- Update to 5.2.2
- minor spec cleanups, conditionalized support for systemd