diff --git a/bacula.spec b/bacula.spec index 35bc7f6..cab7796 100644 --- a/bacula.spec +++ b/bacula.spec @@ -3,7 +3,7 @@ Name: bacula Version: 5.2.13 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -62,16 +62,13 @@ BuildRequires: zlib-devel %if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: qt4-devel >= 4.6.2 -%endif - -%if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: tcp_wrappers-devel %else BuildRequires: tcp_wrappers %endif %if 0%{?fedora} || 0%{?rhel} >= 7 -BuildRequires: systemd-units +BuildRequires: systemd %endif %description @@ -146,14 +143,7 @@ Obsoletes: bacula-director-sqlite < 5.2.3-5 Provides: bacula-director-postgresql = %{version}-%{release} Obsoletes: bacula-director-postgresql < 5.2.3-5 -%if 0%{?fedora} == 17 -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -%endif - -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -Requires(post): systemd-sysv +%if 0%{?fedora} || 0%{?rhel} >= 7 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -189,14 +179,7 @@ Obsoletes: bacula-storage-sqlite < 5.2.0 Provides: bacula-storage-postgresql = %{version}-%{release} Obsoletes: bacula-storage-postgresql < 5.2.0 -%if 0%{?fedora} == 17 -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -%endif - -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -Requires(post): systemd-sysv +%if 0%{?fedora} || 0%{?rhel} >= 7 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -224,14 +207,7 @@ Group: System Environment/Daemons Requires: bacula-common%{?_isa} = %{version}-%{release} Requires: bacula-libs%{?_isa} = %{version}-%{release} -%if 0%{?fedora} == 17 -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units -%endif - -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -Requires(post): systemd-sysv +%if 0%{?fedora} || 0%{?rhel} >= 7 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -528,101 +504,7 @@ getent passwd %username >/dev/null || useradd -u %uid -r -s /sbin/nologin \ -d /var/spool/bacula -M -c 'Bacula Backup System' -g %username %username &>/dev/null || : exit 0 -%if 0%{?fedora} == 17 - -%post client -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - -%preun client -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable bacula-fd.service > /dev/null 2>&1 || : - /bin/systemctl stop bacula-fd.service > /dev/null 2>&1 || : -fi - -%postun client -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart bacula-fd.service >/dev/null 2>&1 || : -fi - -%triggerun client -- bacula-client < 5.0.3-10 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply bacula-fd -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save bacula-fd >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del bacula-fd >/dev/null 2>&1 || : -/bin/systemctl try-restart bacula-fd.service >/dev/null 2>&1 || : - -%post director -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - -%preun director -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable bacula-dir.service > /dev/null 2>&1 || : - /bin/systemctl stop bacula-dir.service > /dev/null 2>&1 || : -fi - -%postun director -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart bacula-dir.service >/dev/null 2>&1 || : -fi - -%triggerun director -- bacula-director-common < 5.0.3-10 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply bacula-dir -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save bacula-dir >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del bacula-dir >/dev/null 2>&1 || : -/bin/systemctl try-restart bacula-dir.service >/dev/null 2>&1 || : - -%post storage -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - -%preun storage -if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable bacula-sd.service > /dev/null 2>&1 || : - /bin/systemctl stop bacula-sd.service > /dev/null 2>&1 || : -fi - -%postun storage -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart bacula-sd.service >/dev/null 2>&1 || : -fi - -%triggerun storage -- bacula-storage-common < 5.0.3-10 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply bacula-sd -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save bacula-sd >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del bacula-sd >/dev/null 2>&1 || : -/bin/systemctl try-restart bacula-sd.service >/dev/null 2>&1 || : - -%endif - -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 %post client %systemd_post %{name}-fd.service @@ -633,11 +515,6 @@ fi %postun client %systemd_postun_with_restart %{name}-fd.service -%triggerun client -- bacula-client < 5.0.3-10 -/usr/bin/systemd-sysv-convert --save bacula-fd >/dev/null 2>&1 ||: -/sbin/chkconfig --del bacula-fd >/dev/null 2>&1 || : -/bin/systemctl try-restart bacula-fd.service >/dev/null 2>&1 || : - %post director %systemd_post %{name}-dir.service @@ -647,11 +524,6 @@ fi %postun director %systemd_postun_with_restart %{name}-dir.service -%triggerun director -- bacula-director-common < 5.0.3-10 -/usr/bin/systemd-sysv-convert --save bacula-dir >/dev/null 2>&1 ||: -/sbin/chkconfig --del bacula-dir >/dev/null 2>&1 || : -/bin/systemctl try-restart bacula-dir.service >/dev/null 2>&1 || : - %post storage %systemd_post %{name}-sd.service @@ -661,11 +533,6 @@ fi %postun storage %systemd_postun_with_restart %{name}-sd.service -%triggerun storage -- bacula-storage-common < 5.0.3-10 -/usr/bin/systemd-sysv-convert --save bacula-sd >/dev/null 2>&1 ||: -/sbin/chkconfig --del bacula-sd >/dev/null 2>&1 || : -/bin/systemctl try-restart bacula-sd.service >/dev/null 2>&1 || : - %endif %if 0%{?rhel} == 5 || 0%{?rhel} == 6 @@ -887,6 +754,10 @@ fi %{_libdir}/nagios/plugins/check_bacula %changelog +* Tue Aug 06 2013 Simone Caronni - 5.2.13-16 +- Remove Fedora 17 conditionals, distribution EOL. +- Remove systemd-sysv dependency as per new packaging guidelines. + * Sat Aug 03 2013 Fedora Release Engineering - 5.2.13-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -1215,88 +1086,3 @@ fi - Conditional on Fedora 11 / RHEL 6 for bat build. - Obsolete bacula-sysconfdir. - Removed bwxconsole. - -* Thu Nov 3 2011 Lukáš Nykrýn - 5.0.3-13 -- fixed creating of bacula MySQL tables and bump - -* Sun Oct 9 2011 Lukáš Nykrýn - 5.0.3-12 -- fixed restart option in service files (#745529) -- fixed creating of bacula MySQL tables (#724894) - -* Fri Sep 9 2011 Tom Callaway - 5.0.3-11 -- add missing scriptlets - -* Thu Sep 8 2011 Tom Callaway - 5.0.3-10 -- convert to systemd - -* Wed Mar 23 2011 Dan Horák - 5.0.3-9 -- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) - -* Mon Feb 07 2011 Fedora Release Engineering - 5.0.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 03 2011 Jon Ciesla - 5.0.3-7 -- Rebuild for MySQL 5.5, with patch. - -* Fri Nov 26 2010 Jan Görig - 5.0.3-6 -- Fixed previous fix of alternatives -- Changed initscript return value for non-configured service -- Director address is required in tray-monitor config now (#626490) - -* Tue Nov 23 2010 Jan Görig - 5.0.3-5 -- Fixed alternatives for dbcheck (#650224) -- Moved director log file to /var/log/bacula/ -- Changed permission of bacula-dir.conf (RHEL #651786) -- SQLite database is created as bacula user - -* Tue Oct 19 2010 Jan Görig - 5.0.3-4 -- Fixed initscripts and changed default group of bacula-sd (#629697) -- Better warning for non-configured password (#556669) - -* Wed Sep 29 2010 jkeating - 5.0.3-3 -- Rebuilt for gcc bug 634757 - -* Thu Sep 23 2010 Jan Görig - 5.0.3-2 -- fixed openssl patch, thanks to Enrico Scholz - -* Tue Aug 10 2010 Jon Ciesla - 5.0.3-1 -- New upstream. -- DSOlink fix for same. - -* Fri Jul 30 2010 Jon Ciesla - 5.0.2-8 -- Patched configure scripts for Python 2.7. - -* Fri Jul 30 2010 Jon Ciesla - 5.0.2-7 -- Rebuild against Python 2.7. - -* Wed Jul 14 2010 Dan Horák - 5.0.2-6 -- rebuilt against wxGTK-2.8.11-2 - -* Thu Jun 3 2010 Jan Görig 5.0.2-5 -- removed no longer needed sysconfig subpackage (#593307] -- build with $RPM_OPT_FLAGS, show compiler commands in build log (#575425) - fixed by Ville Skyttä -- dropped tcp_wrappers build conditional (#537250) -- fixed location of query.xml in config file (#556480) - -* Wed Jun 2 2010 Jan Görig 5.0.2-4 -- initscripts improvements -- fixed consolehelper settings and menu entries - -* Tue Jun 01 2010 Jon Ciesla