rpms/apcupsd/F-9 apcupsd-3.14.3-init.patch, NONE, 1.1 apcupsd-3.14.4-shutdown.patch, NONE, 1.1 apcupsd.spec, 1.24, 1.25 apcupsd-3.14.1-init.patch, 1.1, NONE apcupsd-3.14.2-shutdown.patch, 1.1, NONE

Wed May 28 12:22:11 UTC 2008

Author: tsmetana

Update of /cvs/pkgs/rpms/apcupsd/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11652

Modified Files:
	apcupsd.spec 
Added Files:
	apcupsd-3.14.3-init.patch apcupsd-3.14.4-shutdown.patch 
Removed Files:
	apcupsd-3.14.1-init.patch apcupsd-3.14.2-shutdown.patch 
Log Message:
* Wed May 28 2008 Tomas Smetana <tsmetana at redhat.com> - 3.14.4-1
- new upstream version
- fix #448637 - hosts.conf and multimon.conf should be in apcupsd-cgi
- fix #448633 - error in the initscript


apcupsd-3.14.3-init.patch:

--- NEW FILE apcupsd-3.14.3-init.patch ---
diff -up apcupsd-3.14.3/platforms/redhat/apcupsd.in.init apcupsd-3.14.3/platforms/redhat/apcupsd.in
--- apcupsd-3.14.3/platforms/redhat/apcupsd.in.init	2007-04-24 01:35:33.000000000 +0200
+++ apcupsd-3.14.3/platforms/redhat/apcupsd.in	2008-05-28 09:05:39.000000000 +0200
@@ -3,9 +3,19 @@
 # apcupsd      This shell script takes care of starting and stopping
 #	       the apcupsd UPS monitoring daemon.
 #
-# chkconfig: 2345 60 99
+# chkconfig: - 60 99
 # description: apcupsd monitors power and takes action if necessary
 #
+### BEGIN INIT INFO
+# Provides: apcupsd
+# Required-Start: $syslog $local_fs
+# Required-Stop: $syslog $local_fs
+# Default-Start:
+# Default-Stop: 0 1 6
+# Short-Description: apcupsd daemon
+# Description: APC UPS Power Control Daemon for Linux
+### END INIT INFO
+
 APCPID=@PIDDIR@/apcupsd.pid
 
 if test -f /etc/whitebox-release ; then
@@ -44,9 +54,11 @@ case "$1" in
        ;;
     restart|force-reload)
        $0 stop
-       sleep 15
        $0 start
        ;;
+    condrestart)
+       [ -f @LOCKDIR@/subsys/apcupsd ] && $0 restart || :
+       ;;
     reload)
        echo "$0: reload not implemented"
        exit 3
@@ -62,7 +74,7 @@ case "$1" in
        fi
        ;;
     *)
-       echo "Usage: $0 {start|stop|restart|status}"
+       echo "Usage: $0 {start|stop|restart|condrestart|status}"
        exit 1
        ;;
 esac

apcupsd-3.14.4-shutdown.patch:

--- NEW FILE apcupsd-3.14.4-shutdown.patch ---
diff -up apcupsd-3.14.4/platforms/apccontrol.in.shutdown apcupsd-3.14.4/platforms/apccontrol.in
--- apcupsd-3.14.4/platforms/apccontrol.in.shutdown	2008-05-28 09:15:47.000000000 +0200
+++ apcupsd-3.14.4/platforms/apccontrol.in	2008-05-28 09:16:04.000000000 +0200
@@ -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-9/apcupsd.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- apcupsd.spec	12 Feb 2008 07:29:41 -0000	1.24
+++ apcupsd.spec	28 May 2008 12:21:21 -0000	1.25
@@ -1,16 +1,17 @@
 Name:         apcupsd
-Version:      3.14.3
-Release:      2.1%{?dist}
+Version:      3.14.4
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
-License:      GPL
+License:      GPLv2
 URL:          http://www.apcupsd.com
 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
+Patch0:       apcupsd-3.14.3-init.patch
+Patch1:       apcupsd-3.14.4-shutdown.patch
+Patch2:       apcupsd-3.14.1-cloexec.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0
@@ -57,10 +58,7 @@
 %setup -q
 %patch0 -p1 -b .init
 %patch1 -p1 -b .shutdown
-
-# Don't strip binaries
-sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in
-
+%patch2 -p1 -b .cloexec
 
 %build
 %configure \
@@ -74,8 +72,6 @@
         --enable-net-snmp \
         --enable-snmp \
         --enable-usb \
-        --enable-powerflute \
-        --enable-nls \
         --enable-gapcmon \
         --enable-pcnet \
         --with-libwrap=%{_libdir} \
@@ -83,8 +79,7 @@
         --with-upstype=usb \
         --with-upscable=usb \
         APCUPSD_MAIL=/bin/mail
-make
-
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -99,7 +94,7 @@
 
 install -m744 platforms/apccontrol \
               $RPM_BUILD_ROOT%{_sysconfdir}/apcupsd/apccontrol
-	      
+
 install -m755 platforms/redhat/apcupsd $RPM_BUILD_ROOT%{_initrddir}
 
 install -d %{buildroot}%{_sysconfdir}/logrotate.d
@@ -127,8 +122,6 @@
 %dir %{_sysconfdir}/apcupsd
 %{_initrddir}/apcupsd
 %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf
-%config(noreplace) %{_sysconfdir}/apcupsd/hosts.conf
-%config(noreplace) %{_sysconfdir}/apcupsd/multimon.conf
 %attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol
 %config(noreplace) %{_sysconfdir}/apcupsd/changeme
 %config(noreplace) %{_sysconfdir}/apcupsd/commfailure
@@ -144,6 +137,8 @@
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.css
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/apcupsd.conf
+%config(noreplace) %{_sysconfdir}/apcupsd/hosts.conf
+%config(noreplace) %{_sysconfdir}/apcupsd/multimon.conf
 %{_localstatedir}/www/apcupsd/
 
 %files gui
@@ -174,6 +169,11 @@
 
 
 %changelog
+* Wed May 28 2008 Tomas Smetana <tsmetana at redhat.com> - 3.14.4-1
+- new upstream version
+- fix #448637 - hosts.conf and multimon.conf should be in apcupsd-cgi
+- fix #448633 - error in the initscript
+
 * Tue Feb 12 2008 Tomas Smetana <tsmetana at redhat.com> - 3.14.3-2.1
 - rebuild (gcc-4.3)
 


--- apcupsd-3.14.1-init.patch DELETED ---


--- apcupsd-3.14.2-shutdown.patch DELETED ---


