rpms/apcupsd/devel apcupsd-3.14.3-init.patch, NONE, 1.1 apcupsd-3.14.4-shutdown.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 apcupsd.spec, 1.24, 1.25 sources, 1.11, 1.12 apcupsd-3.14.1-init.patch, 1.1, NONE apcupsd-3.14.2-shutdown.patch, 1.1, NONE
Tomas Smetana (tsmetana)
fedora-extras-commits at redhat.com
Wed May 28 08:54:13 UTC 2008
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch, NONE, 1.1 openoffice.org.spec, 1.1514, 1.1515
- Next message (by thread): rpms/guitone/F-9 guitone-0.8-update-crash.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 guitone.spec, 1.4, 1.5 sources, 1.3, 1.4 guitone-0.7-gcc43.patch, 1.1, NONE guitone-0.7-qt-svg.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tsmetana
Update of /cvs/pkgs/rpms/apcupsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14607
Modified Files:
.cvsignore apcupsd.spec sources
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
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/apcupsd/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 23 Jan 2008 14:43:28 -0000 1.11
+++ .cvsignore 28 May 2008 08:53:42 -0000 1.12
@@ -1 +1 @@
-apcupsd-3.14.3.tar.gz
+apcupsd-3.14.4.tar.gz
Index: apcupsd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/apcupsd/devel/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 08:53:42 -0000 1.25
@@ -1,6 +1,6 @@
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
@@ -9,13 +9,14 @@
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
BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers-devel
-BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils
+BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils, autoconf
Requires: /bin/mail
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
@@ -57,12 +58,10 @@
%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
+cp -p /usr/lib/rpm/config.{guess,sub} autoconf/
%configure \
--sysconfdir="%{_sysconfdir}/apcupsd" \
--with-cgi-bin="%{_localstatedir}/www/apcupsd" \
@@ -99,7 +98,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
@@ -174,6 +173,9 @@
%changelog
+* Wed May 28 2008 Tomas Smetana <tsmetana at redhat.com> - 3.14.4-1
+- new upstream version
+
* Tue Feb 12 2008 Tomas Smetana <tsmetana at redhat.com> - 3.14.3-2.1
- rebuild (gcc-4.3)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/apcupsd/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 23 Jan 2008 14:43:28 -0000 1.11
+++ sources 28 May 2008 08:53:42 -0000 1.12
@@ -1 +1 @@
-a212351d21828e9344264614c7ad8ba1 apcupsd-3.14.3.tar.gz
+78811129db1a882b9a2b9afd540470b3 apcupsd-3.14.4.tar.gz
--- apcupsd-3.14.1-init.patch DELETED ---
--- apcupsd-3.14.2-shutdown.patch DELETED ---
- Previous message (by thread): rpms/openoffice.org/devel openoffice.org-3.0.0.ooo90055.swext.allowadmin.patch, NONE, 1.1 openoffice.org.spec, 1.1514, 1.1515
- Next message (by thread): rpms/guitone/F-9 guitone-0.8-update-crash.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 guitone.spec, 1.4, 1.5 sources, 1.3, 1.4 guitone-0.7-gcc43.patch, 1.1, NONE guitone-0.7-qt-svg.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list