From 72cb631cc8e7fc6f2c3bab694853397baae21972 Mon Sep 17 00:00:00 2001
From: Tomas Smetana <tsmetana@fedoraproject.org>
Date: Jan 30 2008 13:30:55 +0000
Subject: - fix #348701 - apcupsd control script does not invoke shutdown properly


---

diff --git a/apcupsd-3.14.2-shutdown.patch b/apcupsd-3.14.2-shutdown.patch
new file mode 100644
index 0000000..e8c4f81
--- /dev/null
+++ b/apcupsd-3.14.2-shutdown.patch
@@ -0,0 +1,12 @@
+diff -up apcupsd-3.14.2/platforms/apccontrol.in.shutdown apcupsd-3.14.2/platforms/apccontrol.in
+--- apcupsd-3.14.2/platforms/apccontrol.in.shutdown	2008-01-30 13:39:33.000000000 +0100
++++ apcupsd-3.14.2/platforms/apccontrol.in	2008-01-30 13:45:00.000000000 +0100
+@@ -104,7 +104,7 @@ case "$1" in
+     ;;
+     doshutdown)
+ 	echo "UPS ${2} initiated Shutdown Sequence" | ${WALL}
+-	${SHUTDOWN} -h now "apcupsd UPS ${2} initiated shutdown"
++	${SHUTDOWN} -h -H now "apcupsd UPS ${2} initiated shutdown"
+     ;;
+     annoyme)
+ 	echo "Power problems with UPS ${2}. Please logoff." | ${WALL}
diff --git a/apcupsd.spec b/apcupsd.spec
index f2fce38..f732684 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.14.2
-Release:      1%{?dist}
+Release:      2%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -10,6 +10,7 @@ Source0:      http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz
 Source1:      apcupsd.logrotate
 Source2:      apcupsd-httpd.conf
 Patch0:       apcupsd-3.14.1-init.patch
+Patch1:       apcupsd-3.14.2-shutdown.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0
@@ -54,7 +55,9 @@ A GUI interface to the APC UPS monitoring daemon.
 
 %prep
 %setup -q
-%patch -p1 -b .init
+%patch0 -p1 -b .init
+%patch1 -p1 -b .shutdown
+
 # Don't strip binaries
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in
 
@@ -170,6 +173,9 @@ fi
 
 
 %changelog
+* Wed Jan 30 2008 Tomas Smetana <tsmetana@redhat.com> - 3.14.2-2
+- fix #348701 - apcupsd control script does not invoke shutdown properly
+
 * Wed Oct 10 2007 - Orion Poplawski <orion@cora.nwra.com> - 3.14.2-1
 - Update to 3.14.2, remove upstreamed patches