From ea481f03833a5781d7c25f94412bdd98f33d80b7 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 5 Jan 2007 18:35:30 +0000 Subject: [PATCH 01/17] Mark everything in /etc/apcupsd noreplace --- apcupsd.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 4e69cbf..3c39fbe 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.12.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -110,13 +110,13 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/apcupsd/hosts.conf %config(noreplace) %{_sysconfdir}/apcupsd/multimon.conf %attr(0755,root,root) %{_sysconfdir}/apcupsd/apccontrol -%{_sysconfdir}/apcupsd/changeme -%{_sysconfdir}/apcupsd/commfailure -%{_sysconfdir}/apcupsd/commok -%{_sysconfdir}/apcupsd/offbattery -%{_sysconfdir}/apcupsd/onbattery -%{_sysconfdir}/apcupsd/masterconnect -%{_sysconfdir}/apcupsd/mastertimeout +%config(noreplace) %{_sysconfdir}/apcupsd/changeme +%config(noreplace) %{_sysconfdir}/apcupsd/commfailure +%config(noreplace) %{_sysconfdir}/apcupsd/commok +%config(noreplace) %{_sysconfdir}/apcupsd/offbattery +%config(noreplace) %{_sysconfdir}/apcupsd/onbattery +%config(noreplace) %{_sysconfdir}/apcupsd/masterconnect +%config(noreplace) %{_sysconfdir}/apcupsd/mastertimeout %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd %attr(0755,root,root) %{_sbindir}/* %{_mandir}/*/* @@ -143,6 +143,9 @@ fi %changelog +* Fri Jan 5 2007 - Orion Poplawski - 3.12.4-4 +- Mark everying in /etc/apcupsd noreplace + * Mon Oct 9 2006 - Orion Poplawski - 3.12.4-3 - Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952). Patch from Clive Messer (clive@vacuumtube.org.uk) From fbf97dc6f4f73b8bb1deac3ab9cf619ac4b8d216 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Fri, 23 Mar 2007 02:34:29 +0000 Subject: [PATCH 02/17] Initialize branch EL-5 for apcupsd --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 77bf9ece609c872bd66a0b79dd4e840c6f7d8919 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 23 Mar 2007 15:24:26 +0000 Subject: [PATCH 03/17] Let's start with 3.14.0 --- .cvsignore | 2 +- apcupsd.spec | 59 +++++++++++++++++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1c0030b..70f8e67 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -apcupsd-3.12.4.tar.gz +apcupsd-3.14.0.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index 3c39fbe..b7d241a 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.12.4 -Release: 4%{?dist} +Version: 3.14.0 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -12,8 +12,9 @@ Source2: apcupsd-httpd.conf Patch0: apcupsd-3.10.18-init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0, dos2unix -BuildRequires: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers +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 Requires: /bin/mail Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig @@ -40,13 +41,22 @@ Requires: httpd A CGI interface to the APC UPS monitoring daemon. +%package gui +Summary: GUI interface for apcupsd +Group: Applications/System +Requires: %{name} = %{version}-%{release} + +%description gui +A GUI interface to the APC UPS monitoring daemon. + + %prep %setup -q %patch -p1 -b .init -dos2unix examples/*status examples/*.c # Don't strip binaries sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in + %build %configure \ --sysconfdir="%{_sysconfdir}/apcupsd" \ @@ -54,7 +64,6 @@ sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in --enable-cgi \ --enable-pthreads \ --enable-net \ - --enable-master-slave \ --enable-apcsmart \ --enable-dumb \ --enable-net-snmp \ @@ -62,13 +71,13 @@ sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in --enable-usb \ --enable-powerflute \ --enable-nls \ + --enable-gapcmon \ + --enable-pcnet \ --with-libwrap=%{_libdir} \ --with-serial-dev= \ --with-upstype=usb \ --with-upscable=usb \ APCUPSD_MAIL=/bin/mail - - make @@ -93,6 +102,12 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} install -d %{buildroot}%{_sysconfdir}/httpd/conf.d install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf +desktop-file-install --vendor="fedora" \ + --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ + --delete-original \ + ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop + +# Cleanup for later %doc processing chmod -x examples/*.conf examples/*.c rm examples/*.in @@ -115,8 +130,6 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/apcupsd/commok %config(noreplace) %{_sysconfdir}/apcupsd/offbattery %config(noreplace) %{_sysconfdir}/apcupsd/onbattery -%config(noreplace) %{_sysconfdir}/apcupsd/masterconnect -%config(noreplace) %{_sysconfdir}/apcupsd/mastertimeout %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd %attr(0755,root,root) %{_sbindir}/* %{_mandir}/*/* @@ -127,6 +140,17 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/httpd/conf.d/apcupsd.conf %{_localstatedir}/www/apcupsd/ +%files gui +%defattr(-,root,root,-) +%{_bindir}/gapcmon +%{_datadir}/applications/fedora-gapcmon.desktop +%{_datadir}/pixmaps/apcupsd.png +%{_datadir}/pixmaps/charging.png +%{_datadir}/pixmaps/gapc_prefs.png +%{_datadir}/pixmaps/onbatt.png +%{_datadir}/pixmaps/online.png +%{_datadir}/pixmaps/unplugged.png + %post # add our links @@ -143,8 +167,15 @@ fi %changelog -* Fri Jan 5 2007 - Orion Poplawski - 3.12.4-4 -- Mark everying in /etc/apcupsd noreplace +* Mon Feb 12 2007 - Orion Poplawski - 3.14.0-1 +- Update to 3.14.0 + +* Fri Jan 5 2007 - Orion Poplawski - 3.13.9-2 +- Mark everything in /etc/apcupsd noreplace +- Change BR to tcp_wrappers-devel + +* Thu Nov 30 2006 - Orion Poplawski - 3.13.9-1 +- Update to 3.13.9, add gui package * Mon Oct 9 2006 - Orion Poplawski - 3.12.4-3 - Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952). @@ -182,13 +213,13 @@ fi - Compile in snmp, net-snmp, powerflute, nls, add tcp_wrappers support * Mon Oct 17 2005 - Orion Poplawski - 3.10.18-3 -- Removed %{_smp_mflags} from make, broke builds +- Removed %%{_smp_mflags} from make, broke builds - Patch init file to not start automatically and add reload - Mark css file config - Require /sbin/chkconfig * Mon Oct 17 2005 - Orion Poplawski - 3.10.18-2 -- Add %defattr to -cgi package +- Add %%defattr to -cgi package * Wed Aug 17 2005 - Orion Poplawski - 3.10.18-1 - Initial Fedora Version diff --git a/sources b/sources index 77ac446..774c582 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -669c833ec02a2bc29fa98f845e5f5de5 apcupsd-3.12.4.tar.gz +334fe3413c08f14acec0226e71e98e0a apcupsd-3.14.0.tar.gz From 24d0ccfdd37b54d615fef7aa379d85b0fb453fbb Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 23 Mar 2007 15:36:51 +0000 Subject: [PATCH 04/17] No tcp_wrappers-devel in EL --- apcupsd.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index b7d241a..363d89f 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -13,7 +13,7 @@ Patch0: apcupsd-3.10.18-init.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: net-snmp-devel, gettext-devel, ncurses-devel, tcp_wrappers BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils Requires: /bin/mail Requires(post): /sbin/chkconfig @@ -167,8 +167,9 @@ fi %changelog -* Mon Feb 12 2007 - Orion Poplawski - 3.14.0-1 +* Fri Mar 23 2007 - Orion Poplawski - 3.14.0-1 - Update to 3.14.0 +- No tcp_wrappers-devel in EL * Fri Jan 5 2007 - Orion Poplawski - 3.13.9-2 - Mark everything in /etc/apcupsd noreplace From 591cc69adba6d1b5a02e4ea515ab1a4aec47ed66 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 19 Apr 2007 15:35:03 +0000 Subject: [PATCH 05/17] RHEL5 rebuild --- apcupsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 363d89f..585daf1 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -167,6 +167,9 @@ fi %changelog +* Fri Apr 19 2007 - Orion Poplawski - 3.14.0-2 +- Rebuild with RHEL5 final + * Fri Mar 23 2007 - Orion Poplawski - 3.14.0-1 - Update to 3.14.0 - No tcp_wrappers-devel in EL From 970d89410099e0d1620752d9586a3d25b6273eaf Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 23 Apr 2007 20:01:13 +0000 Subject: [PATCH 06/17] Fix init script for LSB compliance (bug #237532) --- apcupsd-3.10.18-init.patch | 20 -------------------- apcupsd-3.14.0-init.patch | 38 ++++++++++++++++++++++++++++++++++++++ apcupsd.spec | 5 ++++- 3 files changed, 42 insertions(+), 21 deletions(-) delete mode 100644 apcupsd-3.10.18-init.patch create mode 100644 apcupsd-3.14.0-init.patch diff --git a/apcupsd-3.10.18-init.patch b/apcupsd-3.10.18-init.patch deleted file mode 100644 index 9c36f93..0000000 --- a/apcupsd-3.10.18-init.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- apcupsd-3.10.18/platforms/redhat/apcupsd.in.orig 2005-01-09 15:55:41.000000000 -0700 -+++ apcupsd-3.10.18/platforms/redhat/apcupsd.in 2005-10-31 10:35:05.000000000 -0700 -@@ -3,7 +3,7 @@ - # 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 - # - APCPID=@PIDDIR@/apcupsd.pid -@@ -42,7 +42,7 @@ - rm -f $APCPID - rm -f @LOCKDIR@/subsys/apcupsd - ;; -- restart) -+ restart|reload) - $0 stop - sleep 15 - $0 start diff --git a/apcupsd-3.14.0-init.patch b/apcupsd-3.14.0-init.patch new file mode 100644 index 0000000..86062d9 --- /dev/null +++ b/apcupsd-3.14.0-init.patch @@ -0,0 +1,38 @@ +--- apcupsd-3.14.0/platforms/redhat/apcupsd.in.init 2005-01-09 15:55:41.000000000 -0700 ++++ apcupsd-3.14.0/platforms/redhat/apcupsd.in 2007-04-23 12:13:35.000000000 -0600 +@@ -3,7 +3,7 @@ + # 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 + # + APCPID=@PIDDIR@/apcupsd.pid +@@ -42,13 +42,24 @@ + rm -f $APCPID + rm -f @LOCKDIR@/subsys/apcupsd + ;; +- restart) ++ restart|force-reload) + $0 stop + sleep 15 + $0 start + ;; ++ reload) ++ echo "$0: reload not implemented" ++ exit 3 ++ ;; + status) +- @sbindir@/apcaccess status ++ status apcupsd ++ RETVAL=$? ++ if [ $RETVAL -eq 0 ] ++ then ++ @sbindir@/apcaccess status ++ else ++ exit $RETVAL ++ fi + ;; + *) + echo "Usage: $0 {start|stop|restart|status}" diff --git a/apcupsd.spec b/apcupsd.spec index 585daf1..392532c 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -167,6 +167,9 @@ fi %changelog +* Mon Apr 23 2007 - Orion Poplawski - 3.14.0-3 +- Fix init script for LSB compliance (bug #237532) + * Fri Apr 19 2007 - Orion Poplawski - 3.14.0-2 - Rebuild with RHEL5 final From 1b4be2f41b4b9f1650756736d36292eaed9fa2c7 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 23 Apr 2007 20:04:56 +0000 Subject: [PATCH 07/17] Change the patch --- apcupsd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index 392532c..4ce068c 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -9,7 +9,7 @@ URL: http://www.apcupsd.com Source0: http://download.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf -Patch0: apcupsd-3.10.18-init.patch +Patch0: apcupsd-3.14.0-init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 From 00dec58a2bdcb482c1b124c82666cd42924615a9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:28:14 +0000 Subject: [PATCH 08/17] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 92bb57a..30569d4 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := apcupsd SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 25ba924ac5d17ffee7a47b057d18658280986709 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:04:29 +0000 Subject: [PATCH 09/17] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 30569d4..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: apcupsd -# $Id$ -NAME := apcupsd -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 From 2a4f81b8f62512f9c713b2505d23d3e978c6709b Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Fri, 3 Dec 2010 12:01:21 +0100 Subject: [PATCH 10/17] - do not attempt to invoke directory as a script (#659219) --- apcupsd-httpd.conf | 6 +++++- apcupsd.spec | 11 +++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apcupsd-httpd.conf b/apcupsd-httpd.conf index 9e5ff87..973dec9 100644 --- a/apcupsd-httpd.conf +++ b/apcupsd-httpd.conf @@ -3,7 +3,11 @@ # # files are off the documentroot of Web server -ScriptAlias /apcupsd/ "/var/www/apcupsd/" +Alias /apcupsd /var/www/apcupsd + + AddHandler cgi-script cgi pl + Options ExecCGI + # # Allow only local access at default diff --git a/apcupsd.spec b/apcupsd.spec index 4ce068c..64b148a 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -57,6 +57,9 @@ A GUI interface to the APC UPS monitoring daemon. sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in +#we will handle fedora/redhat part ourselfs +printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile + %build %configure \ --sysconfdir="%{_sysconfdir}/apcupsd" \ @@ -89,9 +92,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/apcupsd make DESTDIR=$RPM_BUILD_ROOT install -rm $RPM_BUILD_ROOT%{_initrddir}/halt -rm $RPM_BUILD_ROOT%{_initrddir}/halt.old - install -m744 platforms/apccontrol \ $RPM_BUILD_ROOT%{_sysconfdir}/apcupsd/apccontrol @@ -167,6 +167,9 @@ fi %changelog +* Fri Dec 03 2010 Michal Hlavinka - 3.14.0-4 +- do not attempt to invoke directory as a script (#659219) + * Mon Apr 23 2007 - Orion Poplawski - 3.14.0-3 - Fix init script for LSB compliance (bug #237532) From 148efc229d6bad59a822543e07bbcd330793c0b3 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Fri, 3 Dec 2010 12:19:17 +0100 Subject: [PATCH 11/17] old version generates makefile --- apcupsd.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apcupsd.spec b/apcupsd.spec index 64b148a..febc615 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -52,13 +52,12 @@ A GUI interface to the APC UPS monitoring daemon. %prep %setup -q -%patch -p1 -b .init +%patch0 -p1 -b .init # Don't strip binaries sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in - #we will handle fedora/redhat part ourselfs -printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile +printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile.in %build %configure \ From 14730eb2b4701db9dace81de78f6f928705c15bf Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Fri, 3 Dec 2010 17:53:25 +0100 Subject: [PATCH 12/17] try even harder --- apcupsd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apcupsd.spec b/apcupsd.spec index febc615..5aa43ab 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -57,7 +57,7 @@ A GUI interface to the APC UPS monitoring daemon. sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in #we will handle fedora/redhat part ourselfs -printf 'install:\n\techo skipped\n' >platforms/redhat/Makefile.in +printf '@VARIABLES@\ntopdir = @topdir@\ntop_builddir = $(topdir)\n@TARGETS@\n\ninstall:\n\techo skipped\n' >platforms/redhat/Makefile.in %build %configure \ From ef07b647dd225f16ae477c56b7c4d233e06e6b19 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 9 Feb 2011 14:54:41 +0100 Subject: [PATCH 13/17] Apply 1 latest change(s) from master branch --- README.Red_Hat | 4 ++++ apcupsd.spec | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 README.Red_Hat diff --git a/README.Red_Hat b/README.Red_Hat new file mode 100644 index 0000000..a9a3916 --- /dev/null +++ b/README.Red_Hat @@ -0,0 +1,4 @@ +please be sure to configure /etc/init.d/halt as per +http://www.apcupsd.com/manual/manual.html#shutdown-sequence +the ups lines you already see in this script are specific to another UPS +monitoring daemon, nut. Leave them undisturbed. diff --git a/apcupsd.spec b/apcupsd.spec index 5aa43ab..1288ddc 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd Version: 3.14.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -9,6 +9,7 @@ URL: http://www.apcupsd.com Source0: http://download.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf +Source3: README.Red_Hat Patch0: apcupsd-3.14.0-init.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -55,6 +56,7 @@ A GUI interface to the APC UPS monitoring daemon. %patch0 -p1 -b .init # Don't strip binaries sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in +install -p -m 0666 %{SOURCE3} . #we will handle fedora/redhat part ourselfs printf '@VARIABLES@\ntopdir = @topdir@\ntop_builddir = $(topdir)\n@TARGETS@\n\ninstall:\n\techo skipped\n' >platforms/redhat/Makefile.in @@ -117,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING ChangeLog examples ReleaseNotes +%doc COPYING ChangeLog examples ReleaseNotes README.Red_Hat %dir %{_sysconfdir}/apcupsd %{_initrddir}/apcupsd %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf From 9b7ad4d6b3c2a0b4296b6ef9739ec4bae7d6ae87 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 9 Feb 2011 15:02:49 +0100 Subject: [PATCH 14/17] - add readme file to doc explaining needed configuration of halt script --- apcupsd.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apcupsd.spec b/apcupsd.spec index 1288ddc..f569032 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -168,6 +168,9 @@ fi %changelog +* Wed Feb 09 2011 Michal Hlavinka - 3.14.0-5 +- add readme file to doc explaining needed configuration of halt script + * Fri Dec 03 2010 Michal Hlavinka - 3.14.0-4 - do not attempt to invoke directory as a script (#659219) From 3a893e6ce3e61ae44d2991a0cec1bbd6d5999d2d Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Fri, 15 Apr 2011 14:59:37 +0200 Subject: [PATCH 15/17] update apcupsd to 3.14.8 (fixes #696722) --- .gitignore | 1 + apcupsd-3.14.0-init.patch | 32 +++----------------------------- apcupsd-3.14.8-cxxld.patch | 16 ++++++++++++++++ apcupsd.spec | 16 +++++++++++----- sources | 2 +- 5 files changed, 32 insertions(+), 35 deletions(-) create mode 100644 apcupsd-3.14.8-cxxld.patch diff --git a/.gitignore b/.gitignore index 70f8e67..d9ea4c3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ apcupsd-3.14.0.tar.gz +/apcupsd-3.14.8.tar.gz diff --git a/apcupsd-3.14.0-init.patch b/apcupsd-3.14.0-init.patch index 86062d9..4ef246d 100644 --- a/apcupsd-3.14.0-init.patch +++ b/apcupsd-3.14.0-init.patch @@ -1,5 +1,6 @@ ---- apcupsd-3.14.0/platforms/redhat/apcupsd.in.init 2005-01-09 15:55:41.000000000 -0700 -+++ apcupsd-3.14.0/platforms/redhat/apcupsd.in 2007-04-23 12:13:35.000000000 -0600 +diff -up apcupsd-3.14.8/platforms/redhat/apcupsd.in.init apcupsd-3.14.8/platforms/redhat/apcupsd.in +--- apcupsd-3.14.8/platforms/redhat/apcupsd.in.init 2008-11-01 16:03:26.000000000 +0100 ++++ apcupsd-3.14.8/platforms/redhat/apcupsd.in 2011-04-15 12:10:17.352352927 +0200 @@ -3,7 +3,7 @@ # apcupsd This shell script takes care of starting and stopping # the apcupsd UPS monitoring daemon. @@ -9,30 +10,3 @@ # description: apcupsd monitors power and takes action if necessary # APCPID=@PIDDIR@/apcupsd.pid -@@ -42,13 +42,24 @@ - rm -f $APCPID - rm -f @LOCKDIR@/subsys/apcupsd - ;; -- restart) -+ restart|force-reload) - $0 stop - sleep 15 - $0 start - ;; -+ reload) -+ echo "$0: reload not implemented" -+ exit 3 -+ ;; - status) -- @sbindir@/apcaccess status -+ status apcupsd -+ RETVAL=$? -+ if [ $RETVAL -eq 0 ] -+ then -+ @sbindir@/apcaccess status -+ else -+ exit $RETVAL -+ fi - ;; - *) - echo "Usage: $0 {start|stop|restart|status}" diff --git a/apcupsd-3.14.8-cxxld.patch b/apcupsd-3.14.8-cxxld.patch new file mode 100644 index 0000000..ba13d62 --- /dev/null +++ b/apcupsd-3.14.8-cxxld.patch @@ -0,0 +1,16 @@ +diff -up apcupsd-3.14.8/src/Makefile.cxxld apcupsd-3.14.8/src/Makefile +--- apcupsd-3.14.8/src/Makefile.cxxld 2009-09-30 01:20:45.000000000 +0200 ++++ apcupsd-3.14.8/src/Makefile 2010-09-22 11:18:03.550601657 +0200 +@@ -26,10 +26,10 @@ SRCS = $(common_srcs) $(apcupsd_srcs) $( + all-targets: apcupsd apcaccess apctest smtp + + apcupsd: $(common_obj) $(apcupsd_obj) $(APCDRVLIBS) $(APCLIBS) +- $(LINK) $(DRVLIBS) ++ $(LINK) -lstdc++ $(DRVLIBS) + + apctest: $(common_obj) $(apctest_obj) $(APCDRVLIBS) $(APCLIBS) +- $(LINK) $(DRVLIBS) ++ $(LINK) -lstdc++ $(DRVLIBS) + + apcaccess: $(apcaccess_obj) $(APCLIBS) + $(LINK) diff --git a/apcupsd.spec b/apcupsd.spec index f569032..61e5b47 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,6 +1,6 @@ Name: apcupsd -Version: 3.14.0 -Release: 5%{?dist} +Version: 3.14.8 +Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux Group: System Environment/Daemons @@ -11,6 +11,7 @@ Source1: apcupsd.logrotate Source2: apcupsd-httpd.conf Source3: README.Red_Hat Patch0: apcupsd-3.14.0-init.patch +Patch1: apcupsd-3.14.8-cxxld.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glibc-devel >= 2.3, gd-devel > 2.0 @@ -54,14 +55,15 @@ A GUI interface to the APC UPS monitoring daemon. %prep %setup -q %patch0 -p1 -b .init +%patch1 -p1 -b .cxxld # Don't strip binaries -sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' src{,/cgi}/Makefile.in install -p -m 0666 %{SOURCE3} . #we will handle fedora/redhat part ourselfs -printf '@VARIABLES@\ntopdir = @topdir@\ntop_builddir = $(topdir)\n@TARGETS@\n\ninstall:\n\techo skipped\n' >platforms/redhat/Makefile.in +sed -i 's|^.*init.d/halt,.*$|\nignore-following:\n\ttrue|' platforms/redhat/Makefile %build +export CPPFLAGS="$RPM_OPT_FLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS" %configure \ --sysconfdir="%{_sysconfdir}/apcupsd" \ --with-cgi-bin="%{_localstatedir}/www/apcupsd" \ @@ -109,7 +111,7 @@ desktop-file-install --vendor="fedora" \ ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop # Cleanup for later %doc processing -chmod -x examples/*.conf examples/*.c +chmod -x examples/*.c rm examples/*.in @@ -132,6 +134,7 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/apcupsd/offbattery %config(noreplace) %{_sysconfdir}/apcupsd/onbattery %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd +%{_datadir}/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi %attr(0755,root,root) %{_sbindir}/* %{_mandir}/*/* @@ -168,6 +171,9 @@ fi %changelog +* Fri Apr 15 2011 Michal Hlavinka - 3.14.8-1 +- update apcupsd to 3.14.8 (fixes #696722) + * Wed Feb 09 2011 Michal Hlavinka - 3.14.0-5 - add readme file to doc explaining needed configuration of halt script diff --git a/sources b/sources index 774c582..67ae4c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -334fe3413c08f14acec0226e71e98e0a apcupsd-3.14.0.tar.gz +cd17f0a903dc2220e55ed54e242359d2 apcupsd-3.14.8.tar.gz From 2f7ec47eb33bce80afd88840d73002cce081c0a7 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 28 May 2012 13:10:04 +0200 Subject: [PATCH 16/17] apcupsd updated to 3.14.10 --- .gitignore | 1 + apcupsd.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d9ea4c3..684ec96 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ apcupsd-3.14.0.tar.gz /apcupsd-3.14.8.tar.gz +/apcupsd-3.14.10.tar.gz diff --git a/apcupsd.spec b/apcupsd.spec index 61e5b47..15548ef 100644 --- a/apcupsd.spec +++ b/apcupsd.spec @@ -1,5 +1,5 @@ Name: apcupsd -Version: 3.14.8 +Version: 3.14.10 Release: 1%{?dist} Summary: APC UPS Power Control Daemon for Linux @@ -171,6 +171,9 @@ fi %changelog +* Mon May 28 2012 Michal Hlavinka - 3.14.10-1 +- apcupsd updated to 3.14.10 + * Fri Apr 15 2011 Michal Hlavinka - 3.14.8-1 - update apcupsd to 3.14.8 (fixes #696722) diff --git a/sources b/sources index 67ae4c0..b86e1ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd17f0a903dc2220e55ed54e242359d2 apcupsd-3.14.8.tar.gz +5928822d855c5cf7ac29655e3e0b8c23 apcupsd-3.14.10.tar.gz From 53bdfc6b3772d828b15ad13e32b65dfff1aef243 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Wed, 19 Oct 2016 08:24:38 +0200 Subject: [PATCH 17/17] 2016-10-19: Retired orphaned package, because it was orphaned for more than six weeks. --- .gitignore | 3 - README.Red_Hat | 4 - apcupsd-3.14.0-init.patch | 12 -- apcupsd-3.14.8-cxxld.patch | 16 --- apcupsd-httpd.conf | 26 ---- apcupsd.logrotate | 5 - apcupsd.spec | 248 ------------------------------------- dead.package | 3 + sources | 1 - 9 files changed, 3 insertions(+), 315 deletions(-) delete mode 100644 .gitignore delete mode 100644 README.Red_Hat delete mode 100644 apcupsd-3.14.0-init.patch delete mode 100644 apcupsd-3.14.8-cxxld.patch delete mode 100644 apcupsd-httpd.conf delete mode 100644 apcupsd.logrotate delete mode 100644 apcupsd.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 684ec96..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -apcupsd-3.14.0.tar.gz -/apcupsd-3.14.8.tar.gz -/apcupsd-3.14.10.tar.gz diff --git a/README.Red_Hat b/README.Red_Hat deleted file mode 100644 index a9a3916..0000000 --- a/README.Red_Hat +++ /dev/null @@ -1,4 +0,0 @@ -please be sure to configure /etc/init.d/halt as per -http://www.apcupsd.com/manual/manual.html#shutdown-sequence -the ups lines you already see in this script are specific to another UPS -monitoring daemon, nut. Leave them undisturbed. diff --git a/apcupsd-3.14.0-init.patch b/apcupsd-3.14.0-init.patch deleted file mode 100644 index 4ef246d..0000000 --- a/apcupsd-3.14.0-init.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up apcupsd-3.14.8/platforms/redhat/apcupsd.in.init apcupsd-3.14.8/platforms/redhat/apcupsd.in ---- apcupsd-3.14.8/platforms/redhat/apcupsd.in.init 2008-11-01 16:03:26.000000000 +0100 -+++ apcupsd-3.14.8/platforms/redhat/apcupsd.in 2011-04-15 12:10:17.352352927 +0200 -@@ -3,7 +3,7 @@ - # 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 - # - APCPID=@PIDDIR@/apcupsd.pid diff --git a/apcupsd-3.14.8-cxxld.patch b/apcupsd-3.14.8-cxxld.patch deleted file mode 100644 index ba13d62..0000000 --- a/apcupsd-3.14.8-cxxld.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up apcupsd-3.14.8/src/Makefile.cxxld apcupsd-3.14.8/src/Makefile ---- apcupsd-3.14.8/src/Makefile.cxxld 2009-09-30 01:20:45.000000000 +0200 -+++ apcupsd-3.14.8/src/Makefile 2010-09-22 11:18:03.550601657 +0200 -@@ -26,10 +26,10 @@ SRCS = $(common_srcs) $(apcupsd_srcs) $( - all-targets: apcupsd apcaccess apctest smtp - - apcupsd: $(common_obj) $(apcupsd_obj) $(APCDRVLIBS) $(APCLIBS) -- $(LINK) $(DRVLIBS) -+ $(LINK) -lstdc++ $(DRVLIBS) - - apctest: $(common_obj) $(apctest_obj) $(APCDRVLIBS) $(APCLIBS) -- $(LINK) $(DRVLIBS) -+ $(LINK) -lstdc++ $(DRVLIBS) - - apcaccess: $(apcaccess_obj) $(APCLIBS) - $(LINK) diff --git a/apcupsd-httpd.conf b/apcupsd-httpd.conf deleted file mode 100644 index 973dec9..0000000 --- a/apcupsd-httpd.conf +++ /dev/null @@ -1,26 +0,0 @@ -# -# apcupsd configuration file for Apache Web server -# - -# files are off the documentroot of Web server -Alias /apcupsd /var/www/apcupsd - - AddHandler cgi-script cgi pl - Options ExecCGI - - -# -# Allow only local access at default -# Change the ".example.com" to match your domain or modify -# access rights to your needs to enable remote access also. -# - - DirectoryIndex upsstats.cgi - AllowOverride None - Options ExecCGI Indexes - Order deny,allow - Deny from all - Allow from 127.0.0.1 - Allow from ::1 - # Allow from .example.com - diff --git a/apcupsd.logrotate b/apcupsd.logrotate deleted file mode 100644 index 0bfef2a..0000000 --- a/apcupsd.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/apcupsd.events { - missingok - copytruncate - notifempty -} diff --git a/apcupsd.spec b/apcupsd.spec deleted file mode 100644 index 15548ef..0000000 --- a/apcupsd.spec +++ /dev/null @@ -1,248 +0,0 @@ -Name: apcupsd -Version: 3.14.10 -Release: 1%{?dist} -Summary: APC UPS Power Control Daemon for Linux - -Group: System Environment/Daemons -License: GPL -URL: http://www.apcupsd.com -Source0: http://download.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz -Source1: apcupsd.logrotate -Source2: apcupsd-httpd.conf -Source3: README.Red_Hat -Patch0: apcupsd-3.14.0-init.patch -Patch1: apcupsd-3.14.8-cxxld.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 -BuildRequires: gtk2-devel, gnome-vfs2-devel, desktop-file-utils -Requires: /bin/mail -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig - -%description -Apcupsd can be used for controlling most APC UPSes. During a -power failure, apcupsd will inform the users about the power -failure and that a shutdown may occur. If power is not restored, -a system shutdown will follow when the battery is exausted, a -timeout (seconds) expires, or the battery runtime expires based -on internal APC calculations determined by power consumption -rates. If the power is restored before one of the above shutdown -conditions is met, apcupsd will inform users about this fact. -Some features depend on what UPS model you have (simple or smart). - - -%package cgi -Summary: Web interface for apcupsd -Group: Applications/Internet -Requires: %{name} = %{version}-%{release} -Requires: httpd - -%description cgi -A CGI interface to the APC UPS monitoring daemon. - - -%package gui -Summary: GUI interface for apcupsd -Group: Applications/System -Requires: %{name} = %{version}-%{release} - -%description gui -A GUI interface to the APC UPS monitoring daemon. - - -%prep -%setup -q -%patch0 -p1 -b .init -%patch1 -p1 -b .cxxld -# Don't strip binaries -install -p -m 0666 %{SOURCE3} . - -#we will handle fedora/redhat part ourselfs -sed -i 's|^.*init.d/halt,.*$|\nignore-following:\n\ttrue|' platforms/redhat/Makefile - -%build -export CPPFLAGS="$RPM_OPT_FLAGS -DNETSNMP_NO_LEGACY_DEFINITIONS" -%configure \ - --sysconfdir="%{_sysconfdir}/apcupsd" \ - --with-cgi-bin="%{_localstatedir}/www/apcupsd" \ - --enable-cgi \ - --enable-pthreads \ - --enable-net \ - --enable-apcsmart \ - --enable-dumb \ - --enable-net-snmp \ - --enable-snmp \ - --enable-usb \ - --enable-powerflute \ - --enable-nls \ - --enable-gapcmon \ - --enable-pcnet \ - --with-libwrap=%{_libdir} \ - --with-serial-dev= \ - --with-upstype=usb \ - --with-upscable=usb \ - APCUPSD_MAIL=/bin/mail -make - - -%install -rm -rf $RPM_BUILD_ROOT - -mkdir -p $RPM_BUILD_ROOT%{_initrddir} -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/www/apcupsd - -make DESTDIR=$RPM_BUILD_ROOT install - -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 -install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} -install -d %{buildroot}%{_sysconfdir}/httpd/conf.d -install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf - -desktop-file-install --vendor="fedora" \ - --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ - --delete-original \ - ${RPM_BUILD_ROOT}%{_datadir}/applications/gapcmon.desktop - -# Cleanup for later %doc processing -chmod -x examples/*.c -rm examples/*.in - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc COPYING ChangeLog examples ReleaseNotes README.Red_Hat -%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 -%config(noreplace) %{_sysconfdir}/apcupsd/commok -%config(noreplace) %{_sysconfdir}/apcupsd/offbattery -%config(noreplace) %{_sysconfdir}/apcupsd/onbattery -%config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd -%{_datadir}/hal/fdi/policy/20thirdparty/80-apcupsd-ups-policy.fdi -%attr(0755,root,root) %{_sbindir}/* -%{_mandir}/*/* - -%files cgi -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.css -%config(noreplace) %{_sysconfdir}/httpd/conf.d/apcupsd.conf -%{_localstatedir}/www/apcupsd/ - -%files gui -%defattr(-,root,root,-) -%{_bindir}/gapcmon -%{_datadir}/applications/fedora-gapcmon.desktop -%{_datadir}/pixmaps/apcupsd.png -%{_datadir}/pixmaps/charging.png -%{_datadir}/pixmaps/gapc_prefs.png -%{_datadir}/pixmaps/onbatt.png -%{_datadir}/pixmaps/online.png -%{_datadir}/pixmaps/unplugged.png - - -%post -# add our links -if [ "$1" -ge 1 ] ; then -/sbin/chkconfig --add apcupsd -fi - - -%preun -if [ $1 = 0 ] ; then - # remove startup links - /sbin/chkconfig --del apcupsd -fi - - -%changelog -* Mon May 28 2012 Michal Hlavinka - 3.14.10-1 -- apcupsd updated to 3.14.10 - -* Fri Apr 15 2011 Michal Hlavinka - 3.14.8-1 -- update apcupsd to 3.14.8 (fixes #696722) - -* Wed Feb 09 2011 Michal Hlavinka - 3.14.0-5 -- add readme file to doc explaining needed configuration of halt script - -* Fri Dec 03 2010 Michal Hlavinka - 3.14.0-4 -- do not attempt to invoke directory as a script (#659219) - -* Mon Apr 23 2007 - Orion Poplawski - 3.14.0-3 -- Fix init script for LSB compliance (bug #237532) - -* Fri Apr 19 2007 - Orion Poplawski - 3.14.0-2 -- Rebuild with RHEL5 final - -* Fri Mar 23 2007 - Orion Poplawski - 3.14.0-1 -- Update to 3.14.0 -- No tcp_wrappers-devel in EL - -* Fri Jan 5 2007 - Orion Poplawski - 3.13.9-2 -- Mark everything in /etc/apcupsd noreplace -- Change BR to tcp_wrappers-devel - -* Thu Nov 30 2006 - Orion Poplawski - 3.13.9-1 -- Update to 3.13.9, add gui package - -* Mon Oct 9 2006 - Orion Poplawski - 3.12.4-3 -- Fix /etc/httpd/conf.d/apcupsd.conf so DirectoryIndex works (bug #209952). - Patch from Clive Messer (clive@vacuumtube.org.uk) - -* Tue Aug 29 2006 - Orion Poplawski - 3.12.4-2 -- Rebuild for FC6 - -* Mon Aug 21 2006 - Orion Poplawski - 3.12.4-1 -- Update to 3.12.4 - -* Tue Jan 10 2006 - Orion Poplawski - 3.12.2-1 -- Update to 3.12.2 -- Don't strip binaries - -* Tue Jan 10 2006 - Orion Poplawski - 3.12.1-1 -- Update to 3.12.1 - -* Wed Jan 4 2006 - Orion Poplawski - 3.12.0-1 -- Update to 3.12.0 - -* Tue Jan 3 2006 - Orion Poplawski - 3.10.18-7 -- Rebuild - -* Wed Dec 21 2005 - Orion Poplawski - 3.10.18-6 -- Rebuild - -* Wed Nov 16 2005 - Orion Poplawski - 3.10.18-5 -- Bump for new openssl - -* Fri Nov 4 2005 - Orion Poplawski - 3.10.18-4 -- Add logrotate script for /var/log/apcupsd.events -- Add apache configuration script and change cgi directory to - /var/www/apcupsd -- Compile in snmp, net-snmp, powerflute, nls, add tcp_wrappers support - -* Mon Oct 17 2005 - Orion Poplawski - 3.10.18-3 -- Removed %%{_smp_mflags} from make, broke builds -- Patch init file to not start automatically and add reload -- Mark css file config -- Require /sbin/chkconfig - -* Mon Oct 17 2005 - Orion Poplawski - 3.10.18-2 -- Add %%defattr to -cgi package - -* Wed Aug 17 2005 - Orion Poplawski - 3.10.18-1 -- Initial Fedora Version diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..161cbda --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2016-10-19: Retired orphaned package, because it was orphaned for +more than six weeks. + diff --git a/sources b/sources deleted file mode 100644 index b86e1ab..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -5928822d855c5cf7ac29655e3e0b8c23 apcupsd-3.14.10.tar.gz