[rarpd] Run %triggerun regardless of systemd_post variable definition

Honza Horak hhorak at fedoraproject.org
Thu Oct 4 11:10:14 UTC 2012


commit a23d232048ac18215ffeba92f1e9743f9851e957
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date:   Thu Oct 4 13:10:04 2012 +0200

    Run %triggerun regardless of systemd_post variable definition

 rarpd.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/rarpd.spec b/rarpd.spec
index 360a532..5c0072f 100644
--- a/rarpd.spec
+++ b/rarpd.spec
@@ -1,7 +1,7 @@
 Summary: The RARP daemon
 Name: rarpd
 Version: ss981107
-Release: 36%{?dist}
+Release: 37%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Source: ftp://ftp.inr.ac.ru/ip-routing/dhcp.bootp.rarp/rarpd-%{version}.tar.gz
@@ -57,15 +57,15 @@ install -m 644 rarpd.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/rarpd.8
   if [ $1 = 1 ]; then
       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
   fi
+%endif
 
-  # Package with native systemd unit file is installed for the first time
-  %triggerun -- rarpd < ss981107-33
-  %{_bindir}/systemd-sysv-convert --save rarpd >/dev/null 2>&1 ||:
+# Package with native systemd unit file is installed for the first time
+%triggerun -- rarpd < ss981107-33
+%{_bindir}/systemd-sysv-convert --save rarpd >/dev/null 2>&1 ||:
 
-  # Run these because the SysV package being removed won't do them
-  /sbin/chkconfig --del rarpd >/dev/null 2>&1 || :
-  /bin/systemctl try-restart rarpd.service >/dev/null 2>&1 || :
-%endif
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del rarpd >/dev/null 2>&1 || :
+/bin/systemctl try-restart rarpd.service >/dev/null 2>&1 || :
 
 %preun
 %if 0%{?systemd_preun:1}
@@ -94,6 +94,9 @@ install -m 644 rarpd.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/rarpd.8
 %{_unitdir}/*
 
 %changelog
+* Thu Oct 04 2012 Honza Horak <hhorak at redhat.com> - ss981107-37
+- Run %%triggerun regardless of systemd_post variable definition
+
 * Tue Sep 11 2012 Honza Horak <hhorak at redhat.com> - ss981107-36
 - Minor spec file changes
 - Use new systemd macros (Resolves: #850293)


More information about the scm-commits mailing list