[ypbind] Run %triggerun regardless of systemd_post variable definition
Honza Horak
hhorak at fedoraproject.org
Thu Oct 4 07:54:05 UTC 2012
commit 2896f13244ce65c049dd1a56348aef50e7528b8a
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date: Thu Oct 4 09:53:57 2012 +0200
Run %triggerun regardless of systemd_post variable definition
ypbind.spec | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/ypbind.spec b/ypbind.spec
index 8587c55..8d99ddb 100644
--- a/ypbind.spec
+++ b/ypbind.spec
@@ -1,7 +1,7 @@
Summary: The NIS daemon which binds NIS clients to an NIS domain
Name: ypbind
Version: 1.36
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2
@@ -87,18 +87,18 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind
if [ $1 -eq 1 ]; then
/bin/systemctl daemon-reload >dev/null || :
fi
+%endif
- # Package with native systemd unit file is installed for the first time
- %triggerun -- %{name} < 3:1.32-9
- # Save the current service runlevel info
- # User must manually run systemd-sysv-convert --apply httpd
- # to migrate them to systemd targets
- /usr/bin/systemd-sysv-convert --save %{name} >/dev/null 2>&1 ||:
+# Package with native systemd unit file is installed for the first time
+%triggerun -- %{name} < 3:1.32-9
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply httpd
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save %{name} >/dev/null 2>&1 ||:
- # Run these because the SysV package being removed won't do them
- /sbin/chkconfig --del %{name} >/dev/null 2>&1 || :
- /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
-%endif
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del %{name} >/dev/null 2>&1 || :
+/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || :
%preun
%if 0%{?systemd_preun:1}
@@ -133,6 +133,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind
%doc README NEWS COPYING
%changelog
+* Thu Oct 04 2012 Honza Horak <hhorak at redhat.com> - 3:1.36-7
+- Run %%triggerun regardless of systemd_post variable definition
+
* Mon Sep 24 2012 Honza Horak <hhorak at redhat.com> - 3:1.36-6
- Use sdnotify to inform systemd that daemon is ready
- Minor spec file cleanup
More information about the scm-commits
mailing list