rpms/watchdog
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: #850364 - scriptlets replaced with new systemd macros

Browse Source
This commit is contained in:
Josef Ridky 2017-03-06 10:54:40 +01:00
parent d649f38a1d
commit d426b88277
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
watchdog.spec
View File

@ -1,7 +1,7 @@
Summary: Software and/or Hardware watchdog daemon Summary: Software and/or Hardware watchdog daemon
Name: watchdog Name: watchdog
Version: 5.13 Version: 5.13
Release: 15%{?dist} Release: 16%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://sourceforge.net/projects/watchdog/ URL: http://sourceforge.net/projects/watchdog/
@ -21,9 +21,9 @@ Patch4: 0004-watchdog-5.13-rhseldoc.patch
BuildRequires: systemd-units BuildRequires: systemd-units
Requires(post): systemd-units Requires(post): systemd
Requires(preun): systemd-units Requires(preun): systemd
Requires(postun): systemd-units Requires(postun): systemd
%description %description
@ -76,29 +76,15 @@ install -Dd -m0755 ${RPM_BUILD_ROOT}%{_libexecdir}/watchdog/scripts
%post %post
if [ $1 -eq 1 ] ; then %systemd_post watchdog.service
# Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
%preun %preun
if [ $1 -eq 0 ] ; then %systemd_preun watchdog.service
# Package removal, not upgrade %systemd_preun watchdog.ping.service
/bin/systemctl --no-reload disable watchdog.service > /dev/null 2>&1 || :
/bin/systemctl --no-reload disable watchdog-ping.service > /dev/null 2>&1 || :
/bin/systemctl stop watchdog.service > /dev/null 2>&1 || :
/bin/systemctl stop watchdog-ping.service > /dev/null 2>&1 || :
fi
%postun %postun
/bin/systemctl daemon-reload >/dev/null 2>&1 || : %systemd_postun_with_restart watchdog.service
if [ $1 -ge 1 ] ; then %systemd_postun_with_restart watchdog.ping.service
# Package upgrade, not uninstall
/bin/systemctl try-restart watchdog.service >/dev/null 2>&1 || :
/bin/systemctl try-restart watchdog-ping.service >/dev/null 2>&1 || :
fi
%triggerun -- watchdog < 5.9-4 %triggerun -- watchdog < 5.9-4
# Save the current service runlevel info # Save the current service runlevel info
@ -135,6 +121,9 @@ fi
%changelog %changelog
* Mon Mar 06 2017 Josef Ridky <jridky@redhat.com> - 5.13-16
- Scriptlets replaced with new systemd macros (#850364)
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.13-15 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.13-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild