From 5663d98da830daf5ec25a432516642caf4085a1d Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: May 28 2012 20:54:40 +0000 Subject: Re-add explict BR on systemd-units and remove .gz suffix for man pages --- diff --git a/bacula.spec b/bacula.spec index 624c32b..37e6bbc 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,7 +3,7 @@ Name: bacula Version: 5.2.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -69,6 +69,9 @@ BuildRequires: tcp_wrappers-devel%{?_isa} BuildRequires: tcp_wrappers%{?_isa} %endif +%if 0%{?fedora} >= 15 || 0%{?rhel} > 6 +BuildRequires: systemd-units +%endif %description Bacula is a set of programs that allow you to manage the backup, @@ -696,7 +699,7 @@ fi %{_libexecdir}/%{name}/btraceback.gdb %{_libexecdir}/%{name}/bacula_config %{_libexecdir}/%{name}/btraceback.mdb -%{_mandir}/man8/btraceback.8.gz +%{_mandir}/man8/btraceback.8.* %dir %attr(750, bacula, bacula) %{_localstatedir}/log/bacula %dir %attr(750, bacula, bacula) %{_localstatedir}/spool/bacula %{_sbindir}/bacula-checkconf @@ -721,11 +724,11 @@ fi %{_sbindir}/bsmtp %{_sbindir}/bwild %{_sbindir}/dbcheck -%{_mandir}/man1/bsmtp.1.gz -%{_mandir}/man8/bacula-dir.8.gz -%{_mandir}/man8/bregex.8.gz -%{_mandir}/man8/bwild.8.gz -%{_mandir}/man8/dbcheck.8.gz +%{_mandir}/man1/bsmtp.1.* +%{_mandir}/man8/bacula-dir.8.* +%{_mandir}/man8/bregex.8.* +%{_mandir}/man8/bwild.8.* +%{_mandir}/man8/dbcheck.8.* %{_libexecdir}/%{name}/create_bacula_database %{_libexecdir}/%{name}/delete_catalog_backup %{_libexecdir}/%{name}/drop_bacula_database @@ -773,12 +776,12 @@ fi %{_libexecdir}/%{name}/dvd-handler %{_libexecdir}/%{name}/mtx-changer %{_libexecdir}/%{name}/mtx-changer.conf -%{_mandir}/man8/bacula-sd.8.gz -%{_mandir}/man8/bcopy.8.gz -%{_mandir}/man8/bextract.8.gz -%{_mandir}/man8/bls.8.gz -%{_mandir}/man8/bscan.8.gz -%{_mandir}/man8/btape.8.gz +%{_mandir}/man8/bacula-sd.8.* +%{_mandir}/man8/bcopy.8.* +%{_mandir}/man8/bextract.8.* +%{_mandir}/man8/bls.8.* +%{_mandir}/man8/bscan.8.* +%{_mandir}/man8/btape.8.* %files client %defattr(-,root,root,-) @@ -790,14 +793,14 @@ fi %endif %config(noreplace) %{_sysconfdir}/bacula/bacula-fd.conf %config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd -%{_mandir}/man8/bacula-fd.8.gz +%{_mandir}/man8/bacula-fd.8.* %{_libdir}/bacula/bpipe-fd.so %files console %defattr(-,root,root,-) %{_sbindir}/bconsole %attr(644,root,root) %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf -%{_mandir}/man8/bconsole.8.gz +%{_mandir}/man8/bconsole.8.* %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %files console-bat @@ -805,7 +808,7 @@ fi %doc %{_datadir}/doc/bacula-console-bat-%{version}/* %attr(644,root,root) %config(noreplace) %{_sysconfdir}/bacula/bat.conf %{_sbindir}/bat -%{_mandir}/man1/bat.1.gz +%{_mandir}/man1/bat.1.* %{_datadir}/applications/fedora-bacula-bat.desktop %{_datadir}/pixmaps/bat.png @@ -836,6 +839,10 @@ fi %changelog +* Mon May 28 2012 Simone Caronni - 5.2.6-6 +- Even if pulled in by dependencies, re-add explict BR on systemd-units. +- Remove .gz suffix for man pages in file lists as per packaging guidelines. + * Mon May 28 2012 Simone Caronni - 5.2.6-5 - Patch for bug #819158. - Updated hostname patch with official fix.