[bacula/f18: 1/2] Various fixes
Simone Caronni
slaanesh at fedoraproject.org
Tue Aug 6 14:00:49 UTC 2013
commit 65662da44842095629b8bc1d7015ee0f718abf5a
Author: Simone Caronni <negativo17 at gmail.com>
Date: Tue Aug 6 15:59:59 2013 +0200
Various fixes
- Fix dependencies for devel subpackage.
- Explicitly declare dependency also on libs-sql subpackage where required, so we can save one extra cpu cycle during the upgrade (...).
- Bat subpackage used to rely on files in %%_docdir for operation, move them elsewhere. Fixes also Fedora 20 unversioned %%_docdir feature.
- Make sure any package combination results in installed license files.
bacula.spec | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index cab7796..3468cfe 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
Name: bacula
Version: 5.2.13
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details
License: AGPLv3 with exceptions
@@ -132,6 +132,7 @@ Summary: Bacula Director files
Group: System Environment/Daemons
Requires: bacula-common%{?_isa} = %{version}-%{release}
Requires: bacula-libs%{?_isa} = %{version}-%{release}
+Requires: bacula-libs-sql%{?_isa} = %{version}-%{release}
Requires: logwatch
# Director backends merged into core.
Provides: bacula-director-common = %{version}-%{release}
@@ -168,6 +169,7 @@ Summary: Bacula storage daemon files
Group: System Environment/Daemons
Requires: bacula-common%{?_isa} = %{version}-%{release}
Requires: bacula-libs%{?_isa} = %{version}-%{release}
+Requires: bacula-libs-sql%{?_isa} = %{version}-%{release}
Requires: mt-st
# Storage backends merged into core.
Provides: bacula-storage-common = %{version}-%{release}
@@ -273,6 +275,8 @@ bacula server.
%package devel
Summary: Bacula development files
Group: Development/Libraries
+Requires: bacula-libs%{?_isa} = %{version}-%{release}
+Requires: bacula-libs-sql%{?_isa} = %{version}-%{release}
%description devel
Bacula is a set of programs that allow you to manage the backup, recovery, and
@@ -343,12 +347,13 @@ export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
--with-sqlite3 \
--with-mysql \
--with-postgresql \
+ --docdir=%{_datadir}/bacula \
$*
}
%if 0%{?fedora} || 0%{?rhel} >= 6
export QMAKE=/usr/bin/qmake-qt4
-build --enable-bat --docdir=%{_datadir}/doc/bacula-console-bat-%{version}
+build --enable-bat
%else
build --disable-bat
%endif
@@ -444,7 +449,11 @@ rm -f %{buildroot}%{_sbindir}/bacula
rm -f %{buildroot}%{_mandir}/man8/bacula.8.gz
rm -f %{buildroot}%{_mandir}/man1/bacula-bwxconsole.1*
rm -f %{buildroot}%{_mandir}/man1/bacula-tray-monitor.1*
-rm -rf %{buildroot}%{_datadir}/doc/bacula/
+%if 0%{?fedora} || 0%{?rhel} >= 6
+rm -f %{buildroot}%{_datadir}/bacula/{ChangeLog,INSTALL,LICENSE,README,ReleaseNotes,VERIFYING,technotes}
+%else
+rm -rf %{buildroot}%{_datadir}/bacula
+%endif
# Fix up some perms so rpmlint does not complain too much
chmod 755 %{buildroot}%{_sbindir}/*
@@ -582,6 +591,7 @@ fi
%endif
%files libs
+%doc AUTHORS ChangeLog LICENSE SUPPORT ReleaseNotes
%defattr(-,root,root,-)
%{_libdir}/libbac-%{version}.so
%{_libdir}/libbaccfg-%{version}.so
@@ -600,7 +610,6 @@ fi
%files common
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog LICENSE SUPPORT
%doc README.Redhat quickstart_*
%config(noreplace) %{_sysconfdir}/logrotate.d/bacula
%attr(755,root,root) %dir %{_sysconfdir}/%{name}
@@ -716,11 +725,12 @@ fi
%if 0%{?fedora} || 0%{?rhel} >= 6
%files console-bat
%defattr(-,root,root,-)
-%doc %{_datadir}/doc/bacula-console-bat-%{version}/*
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
%{_sbindir}/bat
%{_mandir}/man1/bat.1*
%{_datadir}/applications/bacula-bat.desktop
+%{_datadir}/bacula/*.html
+%{_datadir}/bacula/*.png
%{_datadir}/pixmaps/bat.png
%files traymonitor
@@ -754,6 +764,14 @@ fi
%{_libdir}/nagios/plugins/check_bacula
%changelog
+* Tue Aug 06 2013 Simone Caronni <negativo17 at gmail.com> - 5.2.13-17
+- Fix dependencies for devel subpackage.
+- Explicitly declare dependency also on libs-sql subpackage where required, so
+ we can save one extra cpu cycle during the upgrade (...).
+- Bat subpackage used to rely on files in %%_docdir for operation, move them
+ elsewhere. Fixes also Fedora 20 unversioned %%_docdir feature.
+- Make sure any package combination results in installed license files.
+
* Tue Aug 06 2013 Simone Caronni <negativo17 at gmail.com> - 5.2.13-16
- Remove Fedora 17 conditionals, distribution EOL.
- Remove systemd-sysv dependency as per new packaging guidelines.
More information about the scm-commits
mailing list