[bacula/f16] Keep sysv init scripts for Fedora 15

Simone Caronni slaanesh at fedoraproject.org
Mon Jan 2 14:30:20 UTC 2012


commit bc68f81d0dd2873c0049e974c5479d792802156c
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Mon Jan 2 14:05:45 2012 +0100

    Keep sysv init scripts for Fedora 15

 bacula.spec |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/bacula.spec b/bacula.spec
index a76b5c6..70577ab 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -2,7 +2,7 @@
 
 Name:			bacula
 Version:		5.0.3
-Release:		16%{?dist}
+Release:		17%{?dist}
 Summary:		Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:		GPLv2 with exceptions
@@ -66,7 +66,7 @@ BuildRequires:		tcp_wrappers
 BuildRequires:		dvipdfm
 %endif
 
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
 BuildRequires:		systemd-units
 %endif
 
@@ -142,7 +142,7 @@ Requires:		bacula-common = %{version}-%{release}
 Requires:		logwatch
 Requires(pre):		fedora-usermgmt
 Requires(postun):	fedora-usermgmt
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
 Requires(post):		systemd-sysv
 Requires(post):		systemd-units
 Requires(preun):	systemd-units
@@ -170,7 +170,7 @@ bacula-director-sqlite or bacula-director-postgresql.
 Summary:		Bacula backup client
 Group:			System Environment/Daemons
 Requires:		bacula-common = %{version}-%{release}
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
 Requires(post):		systemd-sysv
 Requires(post):		systemd-units
 Requires(preun):	systemd-units
@@ -196,7 +196,7 @@ Summary:		Common Bacula storage daemon files
 Group:			System Environment/Daemons
 Requires:		bacula-storage = %{version}-%{release}
 Requires:		bacula-common = %{version}-%{release}
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
 Requires(post):		systemd-sysv
 Requires(post):		systemd-units
 Requires(preun):	systemd-units
@@ -610,7 +610,7 @@ install -m 755 -D bacula-base/scripts/logwatch/applybaculadate %{buildroot}%{_sy
 install -m 644 -D bacula-base/scripts/logwatch/logfile.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
 install -m 644 -D bacula-base/scripts/logwatch/services.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/services/bacula.conf
 
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
 # Systemd unit files
 mkdir -p ${buildroot}%{_unitdir}
 install -m 755 -D %{SOURCE7}  %{buildroot}%{_unitdir}/bacula-fd.service
@@ -741,7 +741,7 @@ if [ "$1" = 0 ]; then
 	/usr/sbin/alternatives --remove bacula-sd /usr/sbin/bcopy.postgresql
 fi
 
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
 
 %post client
 if [ $1 -eq 1 ] ; then 
@@ -928,7 +928,7 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-fd
 %{_sbindir}/bacula-fd
 %{_libdir}/bacula/bpipe-fd.so
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
 %{_unitdir}/bacula-fd.service
 %else
 %{_initrddir}/bacula-fd
@@ -980,7 +980,7 @@ fi
 %config %{_sysconfdir}/logwatch/conf/services/bacula.conf
 %{_sysconfdir}/logwatch/scripts/services/bacula
 %{_sysconfdir}/logwatch/scripts/shared/applybaculadate
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
 %{_unitdir}/bacula-dir.service
 %else
 %{_initrddir}/bacula-dir
@@ -1054,7 +1054,7 @@ fi
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-sd
-%if 0%{?fedora} >= 15 || 0%{?rhel} > 6
+%if 0%{?fedora} >= 16 || 0%{?rhel} > 6
 %{_unitdir}/bacula-sd.service
 %else
 %{_initrddir}/bacula-sd
@@ -1126,6 +1126,10 @@ fi
 
 
 %changelog
+* Mon Jan 02 2012 Simone Caronni <negativo17 at gmail.com> - 5.0.3-17
+- Revert to SySV init scripts as packaging policies forbid systemd
+  migration if not changing Fedora release; thanks Lukáš.
+
 * Fri Dec 23 2011 Simone Caronni <negativo17 at gmail.com> - 5.0.3-16
 - Add Nagios plugin.
 - Add conditionals for RHEL building (initscripts, bat).


More information about the scm-commits mailing list