[ypserv] Run %triggerun regardless of systemd_post variable definition

Honza Horak hhorak at fedoraproject.org
Thu Oct 4 10:48:52 UTC 2012


commit cb4c6da01119d4b3291a058502416a8ec09df12e
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date:   Thu Oct 4 12:48:42 2012 +0200

    Run %triggerun regardless of systemd_post variable definition

 ypserv.spec |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/ypserv.spec b/ypserv.spec
index 67cb7b1..f0d7e40 100644
--- a/ypserv.spec
+++ b/ypserv.spec
@@ -4,7 +4,7 @@ Summary: The NIS (Network Information Service) server
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.29
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: http://www.linux-nis.org/download/ypserv/ypserv-%{version}.tar.bz2
@@ -139,19 +139,19 @@ install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sbindir}/rpc.yppasswdd.env
         # Package install, not upgrade
         /bin/systemctl daemon-reload >/dev/null 2>&1 || :
     fi
-
-    %triggerun -- ypserv < 2.25-2
-    if /sbin/chkconfig --level 3 ypserv ; then
-        /bin/systemctl --no-reload enable ypserv.service >/dev/null 2>&1 || :
-    fi
-    if /sbin/chkconfig --level 3 ypxfrd ; then
-        /bin/systemctl --no-reload enable ypxfrd.service >/dev/null 2>&1 || :
-    fi
-    if /sbin/chkconfig --level 3 yppasswdd ; then
-        /bin/systemctl --no-reload enable yppasswdd.service >/dev/null 2>&1 || :
-    fi
 %endif
 
+%triggerun -- ypserv < 2.25-2
+if /sbin/chkconfig --level 3 ypserv ; then
+    /bin/systemctl --no-reload enable ypserv.service >/dev/null 2>&1 || :
+fi
+if /sbin/chkconfig --level 3 ypxfrd ; then
+   /bin/systemctl --no-reload enable ypxfrd.service >/dev/null 2>&1 || :
+fi
+if /sbin/chkconfig --level 3 yppasswdd ; then
+    /bin/systemctl --no-reload enable yppasswdd.service >/dev/null 2>&1 || :
+fi
+
 %preun
 %if 0%{?systemd_preun:1}
   %systemd_preun ypserv.service
@@ -208,6 +208,9 @@ NOPUSH=true make -eC /var/yp >&2 || :
 %{_includedir}/*/*
 
 %changelog
+* Thu Oct 04 2012 Honza Horak <hhorak at redhat.com> - 2.29-3
+- Run %%triggerun regardless of systemd_post variable definition
+
 * Mon Sep 24 2012 Honza Horak <hhorak at redhat.com> - 2.29-2
 - Use new systemd macros
   Resolves: #850376


More information about the scm-commits mailing list