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,19 +87,19 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind if [ $1 -eq 1 ]; then /bin/systemctl daemon-reload >dev/null || : fi - - # 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 +# 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 || : + %preun %if 0%{?systemd_preun:1} %systemd_preun %{name}.service @@ -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 - 3:1.36-7 +- Run %%triggerun regardless of systemd_post variable definition + * Mon Sep 24 2012 Honza Horak - 3:1.36-6 - Use sdnotify to inform systemd that daemon is ready - Minor spec file cleanup