rpms/apcupsd/F-8 apcupsd-3.14.2-shutdown.patch, NONE, 1.1 apcupsd.spec, 1.21, 1.22
Tomas Smetana (tsmetana)
fedora-extras-commits at redhat.com
Wed Jan 30 13:16:57 UTC 2008
Author: tsmetana
Update of /cvs/pkgs/rpms/apcupsd/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27896
Modified Files:
apcupsd.spec
Added Files:
apcupsd-3.14.2-shutdown.patch
Log Message:
* Wed Jan 30 2008 Tomas Smetana <tsmetana at redhat.com> - 3.14.2-2
- fix #348701 - apcupsd control script does not invoke shutdown properly
apcupsd-3.14.2-shutdown.patch:
--- NEW FILE apcupsd-3.14.2-shutdown.patch ---
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}
Index: apcupsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apcupsd/F-8/apcupsd.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- apcupsd.spec 10 Oct 2007 22:52:56 -0000 1.21
+++ apcupsd.spec 30 Jan 2008 13:16:15 -0000 1.22
@@ -10,6 +10,7 @@
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 @@
%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 @@
%changelog
+* Wed Jan 30 2008 Tomas Smetana <tsmetana at redhat.com> - 3.14.2-2
+- fix #348701 - apcupsd control script does not invoke shutdown properly
+
* Wed Oct 10 2007 - Orion Poplawski <orion at cora.nwra.com> - 3.14.2-1
- Update to 3.14.2, remove upstreamed patches
More information about the fedora-extras-commits
mailing list