Hello community,
here is the log from the commit of package apcupsd
checked in at Mon Jul 14 21:09:59 CEST 2008.
--------
--- apcupsd/apcupsd.changes 2008-02-20 18:29:14.000000000 +0100
+++ apcupsd/apcupsd.changes 2008-07-14 17:20:10.000000000 +0200
@@ -1,0 +2,25 @@
+Mon Jul 14 17:12:50 CEST 2008 - sbrabec@suse.cz
+
+- Updated to version 3.14.3:
+ * Build system rewrite.
+ * Built-in version of libgd for multimon cgi has been removed
+ * Removal of NLS support.
+ * Powerflute has been disabled.
+ * gapcmon: Corrected the use of NOMPOWER and the calc of current
+ usage amount.
+ * Add a heuristic to fix up incorrect NOMINV or NOMOUTV.
+ * Fix hal policy file syntax.
+ * A HAL policy file is automatically installed on Linux systems
+ to disable the hald-addon-hid-ups module which conflicts with
+ apcupsd's control of USB UPSes.
+ * Add support for Nominal Power.
+ * Add units to NOMINV, NOMOUTV, and NOMBATTV stats.
+ * Eliminate warnings emitted from gcc-4.2.1.
+ * Fix killpower and eeprom settings bug on USB models introduced
+ when INPUT reports were prioritized over FEATURE reports.
+ * Fix bugs that could cause NIS-net driver to get stuck waiting
+ for comms to be restored instead of shutting down.
+- Fixed UPS shutdown on systems with /usr on a different file
+ system (bnc#407269).
+
+-------------------------------------------------------------------
Old:
----
apcupsd-3.14.3.tar.bz2
apcupsd-configure.patch
New:
----
apcupsd-3.14.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apcupsd.spec ++++++
--- /var/tmp/diff_new_pack.LK5024/_old 2008-07-14 21:07:24.000000000 +0200
+++ /var/tmp/diff_new_pack.LK5024/_new 2008-07-14 21:07:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package apcupsd (Version 3.14.3)
+# spec file for package apcupsd (Version 3.14.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -21,8 +21,8 @@
Group: Hardware/UPS
License: GPL v2 or later
Summary: APC UPS Daemon (Powerful Daemon for APC UPSs)
-Version: 3.14.3
-Release: 16
+Version: 3.14.4
+Release: 1
Url: http://www.apcupsd.com/
Source: apcupsd-%{version}.tar.bz2
Source1: apcupsd.init
@@ -31,7 +31,6 @@
Patch: apcupsd-suse.patch
Patch1: apcupsd-gpp.patch
Patch3: apcupsd-powersave.patch
-Patch4: apcupsd-configure.patch
Patch5: apcupsd-largebuf-overflow.patch
Patch6: apcupsd-install-apctest-man.patch
Patch7: apcupsd-link-index-html.patch
@@ -58,6 +57,7 @@
Kern Sibbald
%package gui
+License: GPL v2 or later
Group: Hardware/UPS
Summary: APC UPS Monitor GUI (for APC UPSs)
Requires: %{name} = %{version}
@@ -84,24 +84,22 @@
cp -a %{S:2} .
cp -a %{S:3} apcupsd-early-powerdown
chmod +x apcupsd-early-powerdown
-%patch -p1
+%patch
%patch1
%patch3
chmod -x kernstodo
-%patch4
%patch5
%patch6 -p1
%patch7 -p1
-# Estonian in Estonia -> Estonian
-mv src/po/et_EE.po src/po/et.po
%build
-cd autoconf
%{suse_update_config}
+# Incomplete:
+#cd autoconf
#aclocal
#autoconf
#cp configure ..
-cd ..
+#cd ..
%if "%suse_version" == "910"
export CFLAGS="$RPM_OPT_FLAGS -DHID_MAX_USAGES=1024"
%endif
@@ -111,31 +109,25 @@
--enable-usb\
--enable-nls\
--with-cgi-bin=%{apache_serverroot}/cgi-bin
-cd src
-make apcupsd
-cp -a apcupsd apcupsd-lite
+make %{?jobs:-j %jobs}
+cp -a src/apcupsd src/apcupsd-lite
make clean
-cd ..
%configure\
--sysconfdir=%{_sysconfdir}/apcupsd\
--with-libwrap\
--enable-all\
--enable-nls\
--with-cgi-bin=%{apache_serverroot}/cgi-bin
-make
+make %{?jobs:-j %jobs}
cd doc/latex
make web
cd ../..
%install
%makeinstall
-cd src/po
-%makeinstall
-cd ../..
mkdir -p $RPM_BUILD_ROOT/sbin
install src/apcupsd-lite $RPM_BUILD_ROOT/sbin
ln -sf ../../etc/init.d/apcupsd $RPM_BUILD_ROOT/usr/sbin/rcapcupsd
-%find_lang apcupsd
%suse_update_desktop_file gapcmon
chmod 644 $RPM_BUILD_ROOT/usr/share/pixmaps/*.png
mv doc/latex/apcupsd users_guide
@@ -195,7 +187,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f apcupsd.lang
+%files
%defattr(-,root,root)
%doc apcupsd-early-powerdown COPYING ChangeLog* DISCLAIMER Developers INSTALL README.SUSE ReleaseNotes kernstodo users_guide/ examples/
/sbin/apcupsd-lite
@@ -203,7 +195,6 @@
%{_sbindir}/apcupsd
%{_sbindir}/apcaccess
%{_sbindir}/apctest
-%{_sbindir}/powerflute
%{_sbindir}/rcapcupsd
%{_sbindir}/smtp
/etc/init.d/apcupsd
@@ -232,6 +223,28 @@
%{_datadir}/pixmaps/*.png
%changelog
+* Mon Jul 14 2008 sbrabec@suse.cz
+- Updated to version 3.14.3:
+ * Build system rewrite.
+ * Built-in version of libgd for multimon cgi has been removed
+ * Removal of NLS support.
+ * Powerflute has been disabled.
+ * gapcmon: Corrected the use of NOMPOWER and the calc of current
+ usage amount.
+ * Add a heuristic to fix up incorrect NOMINV or NOMOUTV.
+ * Fix hal policy file syntax.
+ * A HAL policy file is automatically installed on Linux systems
+ to disable the hald-addon-hid-ups module which conflicts with
+ apcupsd's control of USB UPSes.
+ * Add support for Nominal Power.
+ * Add units to NOMINV, NOMOUTV, and NOMBATTV stats.
+ * Eliminate warnings emitted from gcc-4.2.1.
+ * Fix killpower and eeprom settings bug on USB models introduced
+ when INPUT reports were prioritized over FEATURE reports.
+ * Fix bugs that could cause NIS-net driver to get stuck waiting
+ for comms to be restored instead of shutting down.
+- Fixed UPS shutdown on systems with /usr on a different file
+ system (bnc#407269).
* Wed Feb 20 2008 jdelvare@suse.de
- Remove duplicate index.html file in documentation, create a
symbolic link instead to save some disk space.
++++++ apcupsd-3.14.3.tar.bz2 -> apcupsd-3.14.4.tar.bz2 ++++++
++++ 59169 lines of diff (skipped)
++++++ apcupsd.init ++++++
--- apcupsd/apcupsd.init 2006-09-20 17:01:49.000000000 +0200
+++ apcupsd/apcupsd.init 2008-07-14 16:15:26.000000000 +0200
@@ -26,7 +26,8 @@
### END INIT INFO
APCUPSD=@sbindir@/apcupsd
-test -x $APCUPSD || exit 5
+APCUPSD_LITE=@sbindir@/apcupsd-lite
+test -x $APCUPSD -o -x $APCUPSD_LITE || exit 5
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
@@ -137,7 +138,7 @@
## Special command: Instruct UPS to shutdown.
sync &
echo -n "Instructing UPS to powerdown "
- /sbin/apcupsd-lite --killpower >/dev/null 2>&1 || rc_failed
+ $APCUPSD_LITE --killpower >/dev/null 2>&1 || rc_failed
rc_status -v
;;
try-powerdown)
++++++ apcupsd-install-apctest-man.patch ++++++
--- /var/tmp/diff_new_pack.LK5024/_old 2008-07-14 21:07:31.000000000 +0200
+++ /var/tmp/diff_new_pack.LK5024/_new 2008-07-14 21:07:31.000000000 +0200
@@ -1,8 +1,19 @@
Index: apcupsd-3.14.3/doc/Makefile.in
-===================================================================
---- apcupsd-3.14.3.orig/doc/Makefile.in
-+++ apcupsd-3.14.3/doc/Makefile.in
-@@ -18,14 +18,16 @@ apcupsd.man: dummy
+================================================================================
+--- apcupsd-3.14.4/doc/Makefile
++++ apcupsd-3.14.4/doc/Makefile
+@@ -9,6 +9,8 @@
+ install-man:
+ $(call MKDIR,$(mandir)/man$(manext))
+ $(call INSTDATA,644,apcupsd.man,$(mandir)/man$(manext)/apcupsd.$(manext))
++ $(call INSTDATA,644,apctest.man,$(mandir)/man$(manext)/apctest.$(manext))
+
+ uninstall-man:
+ $(call UNINST,$(mandir)/man$(manext)/apcupsd.$(manext))
++ $(call UNINST,$(mandir)/man$(manext)/apctest.$(manext))
+--- apcupsd-3.14.4/doc/Makefile.in
++++ apcupsd-3.14.4/doc/Makefile.in
+@@ -18,14 +18,16 @@
install: install-man
++++++ apcupsd-powersave.patch ++++++
--- /var/tmp/diff_new_pack.LK5024/_old 2008-07-14 21:07:31.000000000 +0200
+++ /var/tmp/diff_new_pack.LK5024/_new 2008-07-14 21:07:31.000000000 +0200
@@ -1,6 +1,6 @@
--- examples/safe.apccontrol.in
+++ examples/safe.apccontrol.in
-@@ -15,60 +15,80 @@
+@@ -15,96 +15,128 @@
#
case "$1" in
killpower)
@@ -13,17 +13,17 @@
;;
commfailure)
+ /usr/lib/powersave/powersave-notify \
-+"apccontrol: Warning serial port communications with UPS lost."
++"apccontrol: Communications with UPS lost."
wall <