packages: nut/nut-hal-paths.patch, nut/nut-matrix.patch, nut/nut.spec - 2.4.1
baggins
baggins at pld-linux.org
Wed Jan 27 15:28:07 CET 2010
Author: baggins Date: Wed Jan 27 14:28:07 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- 2.4.1
---- Files affected:
packages/nut:
nut-hal-paths.patch (1.1 -> 1.2) , nut-matrix.patch (1.2 -> 1.3) , nut.spec (1.150 -> 1.151)
---- Diffs:
================================================================
Index: packages/nut/nut-hal-paths.patch
diff -u packages/nut/nut-hal-paths.patch:1.1 packages/nut/nut-hal-paths.patch:1.2
--- packages/nut/nut-hal-paths.patch:1.1 Wed Jun 4 13:46:31 2008
+++ packages/nut/nut-hal-paths.patch Wed Jan 27 15:28:01 2010
@@ -1,6 +1,6 @@
--- nut-2.2.2/m4/nut_check_libhal.m4~ 2008-05-07 11:25:45.000000000 +0200
+++ nut-2.2.2/m4/nut_check_libhal.m4 2008-06-04 13:41:31.000000000 +0200
-@@ -62,36 +62,59 @@
+@@ -74,7 +74,20 @@
dnl Determine installation paths for callout and .fdi
dnl As per HAL spec, §5 Callouts and §2 Device Information Files
dnl - addon install path: $libdir/hal
@@ -18,26 +18,15 @@
+
+ if (test -z "${HAL_CALLOUTS_PATH}")
+ then
- if (test -d "/usr/lib/hal" || test -d "/usr/lib64/hal")
+ HAL_CALLOUTS_PATH=`pkg-config --silence-errors --variable=libexecdir hal`
+ if (test -z "$HAL_CALLOUTS_PATH")
then
- # For Debian
- HAL_CALLOUTS_PATH="${libdir}/hal"
-- AC_MSG_RESULT(${HAL_CALLOUTS_PATH})
-+ AC_MSG_RESULT(${HAL_CALLOUTS_PATH})
- else # For RedHat
- if (test -d "/usr/libexec")
- then
- HAL_CALLOUTS_PATH="${libexecdir}"
- AC_MSG_RESULT(${HAL_CALLOUTS_PATH})
- else
-- # FIXME
-- HAL_CALLOUTS_PATH=""
-- AC_MSG_RESULT(not found)
-+ AC_MSG_RESULT(not found)
- fi
+@@ -98,9 +98,22 @@
+ else
+ AC_MSG_RESULT(${HAL_CALLOUTS_PATH})
fi
+ fi
-
+
dnl - fdi install path: $datarootdir/hal/fdi/information/20thirdparty
+ HAL_FDI_PATH=""
AC_MSG_CHECKING(for libhal Device Information path)
@@ -52,15 +41,12 @@
+ esac],)
+ if (test -z "${HAL_FDI_PATH}")
+ then
- if (test -d "/usr/share/hal/fdi/information/20thirdparty")
+ HAL_FDI_PATH=`pkg-config --silence-errors --variable=hal_fdidir hal`
+ if (test -z "$HAL_FDI_PATH")
then
- # seems supported everywhere
- HAL_FDI_PATH="${datarootdir}/hal/fdi/information/20thirdparty"
- AC_MSG_RESULT(${HAL_FDI_PATH})
- else
-- # FIXME
-- HAL_FDI_PATH=""
- AC_MSG_RESULT(not found)
+@@ -120,6 +120,7 @@
+ HAL_FDI_PATH="${HAL_FDI_PATH}/information/20thirdparty"
+ AC_MSG_RESULT(${HAL_FDI_PATH})
fi
+ fi
================================================================
Index: packages/nut/nut-matrix.patch
diff -u packages/nut/nut-matrix.patch:1.2 packages/nut/nut-matrix.patch:1.3
--- packages/nut/nut-matrix.patch:1.2 Thu Jun 12 17:39:12 2008
+++ packages/nut/nut-matrix.patch Wed Jan 27 15:28:02 2010
@@ -1,10 +1,9 @@
--- nut-2.2.2/drivers/apcsmart.h~ 2008-06-10 16:43:03.000000000 +0200
+++ nut-2.2.2/drivers/apcsmart.h 2008-06-12 17:14:18.000000000 +0200
-@@ -265,6 +265,8 @@
- { "D4", "789ABCEFGKLMNOPQRSUVWXYZ", 0 },
- /* SmartUPS 1250. */
- { "8QD", "79ABCDEFGKLMNOPQRSUVWXYZcefgjklmnopqrsuxz", 0 },
-+ /* Matrix-UPS */
+@@ -265,6 +265,7 @@
+ /* APC Matrix */
+ { "0ZI", "79ABCDEFGKLMNOPQRSUVWXYZcefgjklmnopqrsuxz/<>", 0 },
+ { "5UI", "79ABCDEFGKLMNOPQRSUVWXYZcefgjklmnopqrsuxz/<>", 0 },
+ { "5YI", "789ABCDEFGLMNOPQTUVWXYcefgjklmnopqrsuwxyz\\<>/", 0 },
{ NULL, NULL, 0 },
================================================================
Index: packages/nut/nut.spec
diff -u packages/nut/nut.spec:1.150 packages/nut/nut.spec:1.151
--- packages/nut/nut.spec:1.150 Wed Feb 4 14:18:13 2009
+++ packages/nut/nut.spec Wed Jan 27 15:28:02 2010
@@ -13,12 +13,12 @@
Summary: Network UPS Tools
Summary(pl.UTF-8): Sieciowe narzędzie do UPS-ów
Name: nut
-Version: 2.2.2
-Release: 6
+Version: 2.4.1
+Release: 0.1
License: GPL
Group: Applications/System
-Source0: http://eu1.networkupstools.org/source/2.2/%{name}-%{version}.tar.gz
-# Source0-md5: 677a84a83e9be7bc93610413ee696375
+Source0: http://www.networkupstools.org/source/2.4/%{name}-%{version}.tar.gz
+# Source0-md5: 609ebaf2123fc7171d25a6c742dd7d66
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}-upsmon.init
@@ -27,7 +27,6 @@
Patch1: %{name}-config.patch
Patch2: %{name}-smartdp-load.patch
Patch3: %{name}-upssched-cmd-sysconf.patch
-Patch4: %{name}-as-needed.patch
Patch5: %{name}-hal-paths.patch
Patch6: %{name}-matrix.patch
URL: http://www.networkupstools.org/
@@ -38,6 +37,7 @@
%{?with_hal:BuildRequires: hal-devel >= 0.5.8}
BuildRequires: libtool
%{?with_usb:BuildRequires: libusb-compat-devel}
+BuildRequires: libwrap-devel
%{?with_neon:BuildRequires: neon-devel}
%{?with_snmp:BuildRequires: net-snmp-devel}
BuildRequires: openssl-devel >= 0.9.7d
@@ -190,7 +190,6 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -240,11 +239,7 @@
mv -f $i ${i%.sample}
done
-%if %{with usb}
-mv -f $RPM_BUILD_ROOT%{_udevrulesdir}/52{_,-}nut-usbups.rules
-%else
-rm -f $RPM_BUILD_ROOT%{_udevrulesdir}/52_nut-usbups.rules
-%endif
+%{!?with_usb:rm -f $RPM_BUILD_ROOT%{_udevrulesdir}/52-nut-usbups.rules}
cat > $RPM_BUILD_ROOT/sbin/poweroff-ups << EOF
#!/bin/sh
@@ -302,6 +297,7 @@
%attr(755,root,root) /sbin/poweroff-ups
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ups
%attr(754,root,root) /etc/rc.d/init.d/ups
+%attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/nut.conf
%attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upsd.conf
%attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ups.conf
%attr(640,root,ups) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/upsd.users
@@ -316,7 +312,6 @@
%{_mandir}/man8/upsrw.8*
%dir %attr(770,root,ups) /var/lib/ups
%dir /lib/nut
-%attr(755,root,root) /lib/nut/al175
%attr(755,root,root) /lib/nut/apcsmart
%attr(755,root,root) /lib/nut/bcmxcp
%{?with_usb:%attr(755,root,root) /lib/nut/bcmxcp_usb}
@@ -325,10 +320,10 @@
%attr(755,root,root) /lib/nut/bestfcom
%attr(755,root,root) /lib/nut/bestuferrups
%attr(755,root,root) /lib/nut/bestups
-%attr(755,root,root) /lib/nut/cpsups
+%attr(755,root,root) /lib/nut/blazer_ser
+%{?with_usb:%attr(755,root,root) /lib/nut/blazer_usb}
%attr(755,root,root) /lib/nut/cyberpower
%attr(755,root,root) /lib/nut/dummy-ups
-%{?with_usb:%attr(755,root,root) /lib/nut/energizerups}
%attr(755,root,root) /lib/nut/etapro
%attr(755,root,root) /lib/nut/everups
%attr(755,root,root) /lib/nut/gamatronic
@@ -341,14 +336,15 @@
%attr(755,root,root) /lib/nut/metasys
%attr(755,root,root) /lib/nut/mge-shut
%attr(755,root,root) /lib/nut/mge-utalk
+%attr(755,root,root) /lib/nut/microdowell
%{?with_neon:%attr(755,root,root) /lib/nut/netxml-ups}
%attr(755,root,root) /lib/nut/newmge-shut
-%attr(755,root,root) /lib/nut/nitram
%attr(755,root,root) /lib/nut/oneac
%attr(755,root,root) /lib/nut/optiups
%attr(755,root,root) /lib/nut/powercom
%attr(755,root,root) /lib/nut/powerpanel
%attr(755,root,root) /lib/nut/rhino
+%{?with_usb:%attr(755,root,root) /lib/nut/richcomm_usb}
%attr(755,root,root) /lib/nut/safenet
%attr(755,root,root) /lib/nut/skel
%{?with_snmp:%attr(755,root,root) /lib/nut/snmp-ups}
@@ -361,7 +357,6 @@
%{?with_usb:%attr(755,root,root) /lib/nut/usbhid-ups}
%attr(755,root,root) /lib/nut/victronups
%{_datadir}/nut
-%{_mandir}/man8/al175.8*
%{_mandir}/man8/apcsmart.8*
%{_mandir}/man8/bcmxcp.8*
%{?with_usb:%{_mandir}/man8/bcmxcp_usb.8*}
@@ -370,10 +365,9 @@
%{_mandir}/man8/bestfcom.8*
%{_mandir}/man8/bestuferrups.8*
%{_mandir}/man8/bestups.8*
-%{_mandir}/man8/cpsups.8*
+%{_mandir}/man8/blazer.8*
%{_mandir}/man8/cyberpower.8*
%{_mandir}/man8/dummy-ups.8*
-%{?with_usb:%{_mandir}/man8/energizerups.8*}
%{_mandir}/man8/etapro.8*
%{_mandir}/man8/everups.8*
%{_mandir}/man8/gamatronic.8*
@@ -386,14 +380,15 @@
%{_mandir}/man8/metasys.8*
%{_mandir}/man8/mge-shut.8*
%{_mandir}/man8/mge-utalk.8*
+%{_mandir}/man8/microdowell.8*
%{?with_neon:%{_mandir}/man8/netxml-ups.8*}
-%{_mandir}/man8/nitram.8*
%{_mandir}/man8/nutupsdrv.8*
%{_mandir}/man8/oneac.8*
%{_mandir}/man8/optiups.8*
%{_mandir}/man8/powercom.8*
%{_mandir}/man8/powerpanel.8*
%{_mandir}/man8/rhino.8*
+%{?with_usb:%{_mandir}/man8/richcomm_usb.8*}
%{_mandir}/man8/safenet.8*
%{?with_snmp:%{_mandir}/man8/snmp-ups.8*}
%{_mandir}/man8/solis.8*
@@ -467,6 +462,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.151 2010/01/27 14:28:02 baggins
+- 2.4.1
+
Revision 1.150 2009/02/04 13:18:13 hawk
- BR libusb-compat to make it work with libusb 1.0.0
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nut/nut-hal-paths.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nut/nut-matrix.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nut/nut.spec?r1=1.150&r2=1.151&f=u
More information about the pld-cvs-commit
mailing list