This commit is contained in:
Ales Ledvinka 2013-11-07 11:49:37 +01:00
parent 57aa4d18cb
commit f6aad014c3

View File

@ -1,7 +1,7 @@
Summary: Software and/or Hardware watchdog daemon
Name: watchdog
Version: 5.13
Release: 6%{?dist}
Release: 7%{?dist}
License: GPLv2+
URL: http://sourceforge.net/projects/watchdog/
@ -10,6 +10,7 @@ Source1: watchdog.init
Source2: README.watchdog.ipmi
Source3: README.Fedora
Source4: watchdog.service
Source5: watchdog-ping.service
# Documentation fixes (RHBZ#948883).
# Sent upstream on 2013-05-16.
@ -70,6 +71,7 @@ install -d -m0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/watchdog.d
make DESTDIR=${RPM_BUILD_ROOT} install
install -Dp -m0644 %{name}.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/watchdog
install -Dp -m0644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_unitdir}/watchdog.service
install -Dp -m0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_unitdir}/watchdog-ping.service
install -Dd -m0755 ${RPM_BUILD_ROOT}%{_libexecdir}/watchdog/scripts
@ -84,7 +86,9 @@ fi
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/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
@ -93,6 +97,7 @@ fi
if [ $1 -ge 1 ] ; then
# 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
@ -104,6 +109,7 @@ fi
# Run these because the SysV package being removed won't do them
/sbin/chkconfig --del watchdog >/dev/null 2>&1 || :
/bin/systemctl try-restart watchdog.service >/dev/null 2>&1 || :
/bin/systemctl try-restart watchdog-ping.service >/dev/null 2>&1 || :
%files
@ -124,11 +130,12 @@ fi
%{_mandir}/man8/wd_identify.8*
%{_mandir}/man8/wd_keepalive.8*
%{_unitdir}/watchdog.service
%{_unitdir}/watchdog-ping.service
%{_libexecdir}/watchdog/scripts
%changelog
* Thu Nov 7 2013 Ales Ledvinka <aledvink@redhat.com> - 5.13-6
* Thu Nov 7 2013 Ales Ledvinka <aledvink@redhat.com> - 5.13-7
- Selinux: Add /usr/libexec/watchdog/scripts/ for test-bin and repair-bin to inherit from.
* Thu Oct 24 2013 Ales Ledvinka <aledvink@redhat.com> - 5.13-5