[watchdog] - New upstream version 5.12 (RHBZ#837949). - Bring specfile up to modern standards. - Remove comment

[Richard W.M. Jones]

commit af4e55c497ac49cda487d0c693437f53a2e636db
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Jul 6 09:05:46 2012 +0100

    - New upstream version 5.12 (RHBZ#837949).
    - Bring specfile up to modern standards.
    - Remove commented sections from previous commit.
    - Remove both patches (equivalent changes now upstream).

 .gitignore                                  |    1 +
 sources                                     |    2 +-
 watchdog-5.9-cleanups.patch                 |   70 ---------------------------
 watchdog-5.9-write-warn-unused-result.patch |   28 -----------
 watchdog.spec                               |   47 ++++--------------
 5 files changed, 12 insertions(+), 136 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ad7b606..5f3fa94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 watchdog-5.5.tar.gz
 /watchdog-5.9.tar.gz
+/watchdog-5.12.tar.gz
diff --git a/sources b/sources
index 00a1aca..0a8d1fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7cae3c9829f5d9a680764f314234867  watchdog-5.9.tar.gz
+cea28bea70e54f3625062bc808aef9af  watchdog-5.12.tar.gz
diff --git a/watchdog.spec b/watchdog.spec
index 2617af4..85d0a76 100644
--- a/watchdog.spec
+++ b/watchdog.spec
@@ -1,7 +1,7 @@
 Summary:          Software and/or Hardware watchdog daemon
 Name:             watchdog
-Version:          5.9
-Release:          4%{?dist}
+Version:          5.12
+Release:          1%{?dist}
 License:          GPL+
 Group:            System Environment/Daemons
 
@@ -12,23 +12,11 @@ Source2:          README.watchdog.ipmi
 Source3:          README.Fedora
 Source4:          watchdog.service
 
-# This was sent upstream as part of a large bundle of cleanups, but
-# this part was not applied, so I assume they don't want it.
-Patch0:           watchdog-5.9-write-warn-unused-result.patch
-
-# Sent upstream on 2011-01-17.
-Patch1:           watchdog-5.9-cleanups.patch
-
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#Requires(post):   /sbin/chkconfig
-#Requires(postun): /sbin/chkconfig
-#Requires(post):   /sbin/service
-#Requires(postun): /sbin/service
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 
+
 %description
 The watchdog program can be used as a powerful software watchdog daemon 
 or may be alternately used with a hardware watchdog device such as the 
@@ -49,9 +37,6 @@ expiration) initiated by the BMC.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch0 -p1
-%patch1 -p1
-
 cp %{SOURCE2} .
 cp %{SOURCE3} .
 
@@ -65,32 +50,20 @@ make %{?_smp_mflags}
 
 
 %install
-rm -Rf ${RPM_BUILD_ROOT}
 install -d -m0755 ${RPM_BUILD_ROOT}%{_sysconfdir}
 make DESTDIR=${RPM_BUILD_ROOT} install
 install -Dp -m0644 %{name}.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/watchdog
-#install -Dp -m0755 %%{SOURCE1} ${RPM_BUILD_ROOT}%%{_initrddir}/watchdog
 install -Dp -m0644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_unitdir}/watchdog.service
 
 
-%clean
-rm -Rf ${RPM_BUILD_ROOT}
-
-
 %post
-#if [ $1 -eq 1 ]; then
-#  /sbin/chkconfig --add %{name}
-#fi
 if [ $1 -eq 1 ] ; then 
     # Initial installation 
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 fi
 
+
 %preun 
-#if [ $1 -eq 0 ]; then
-#  /sbin/service %{name} stop >/dev/null 2>&1
-#  /sbin/chkconfig --del %{name}
-#fi
 if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
     /bin/systemctl --no-reload disable watchdog.service > /dev/null 2>&1 || :
@@ -98,11 +71,7 @@ if [ $1 -eq 0 ] ; then
 fi
 
 
-
 %postun 
-#if [ $1 -ge 1 ]; then
-#  /sbin/service %{name} condrestart >/dev/null  2>&1
-#fi
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
@@ -121,11 +90,9 @@ fi
 
 
 %files
-%defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING examples/ IAFA-PACKAGE NEWS README TODO README.watchdog.ipmi README.Fedora
 %config(noreplace) %{_sysconfdir}/watchdog.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/watchdog
-#%%{_sysconfdir}/rc.d/init.d/watchdog
 %{_sbindir}/watchdog
 %{_sbindir}/wd_identify
 %{_sbindir}/wd_keepalive
@@ -137,6 +104,12 @@ fi
 
 
 %changelog
+* Fri Jul 06 2012 Richard W.M. Jones <rjones at redhat.com> - 5.12-1
+- New upstream version 5.12 (RHBZ#837949).
+- Bring specfile up to modern standards.
+- Remove commented sections from previous commit.
+- Remove both patches (equivalent changes now upstream).
+
 * Wed Mar 14 2012 Jon Ciesla <limburgher at gmail.com> - 5.9-4
 - Migrate to systemd, BZ 661220.