From b04737be2c6d80cd524884d6a07138f6aaafb2ab Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 30 Jul 2013 10:13:53 +0100
Subject: [PATCH] Enable /etc/watchdog.d directory for storing test binaries

  (RHBZ#657750, RHBZ#831190).
- Update .gitignore.
- Drop Group line, not required by modern RPM.
---
 .gitignore    | 10 ++++++----
 watchdog.spec | 11 +++++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 68ee66a..4f74e65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
-watchdog-5.5.tar.gz
-/watchdog-5.9.tar.gz
-/watchdog-5.12.tar.gz
-/watchdog-5.13.tar.gz
+*~
+
+/.build-*
+
+/clog
+/watchdog-*.tar.gz
diff --git a/watchdog.spec b/watchdog.spec
index 0659f8a..b48ebd0 100644
--- a/watchdog.spec
+++ b/watchdog.spec
@@ -1,9 +1,8 @@
 Summary:          Software and/or Hardware watchdog daemon
 Name:             watchdog
 Version:          5.13
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          GPL+
-Group:            System Environment/Daemons
 
 URL:              http://sourceforge.net/projects/watchdog/
 Source0:          http://downloads.sourceforge.net/watchdog/watchdog-%{version}.tar.gz
@@ -58,6 +57,7 @@ make %{?_smp_mflags}
 
 %install
 install -d -m0755 ${RPM_BUILD_ROOT}%{_sysconfdir}
+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
@@ -100,6 +100,7 @@ fi
 %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}/watchdog.d
 %{_sbindir}/watchdog
 %{_sbindir}/wd_identify
 %{_sbindir}/wd_keepalive
@@ -111,6 +112,12 @@ fi
 
 
 %changelog
+* Tue Jul 30 2013 Richard W.M. Jones <rjones@redhat.com> - 5.13-2
+- Enable /etc/watchdog.d directory for storing test binaries
+  (RHBZ#657750, RHBZ#831190).
+- Update .gitignore.
+- Drop Group line, not required by modern RPM.
+
 * Thu May 16 2013 Richard W.M. Jones <rjones@redhat.com> - 5.13-1
 - New upstream version 5.13.
 - Various documentation fixes (RHBZ#948883).