rpms/nut/devel .cvsignore, 1.17, 1.18 nut-2.2.2-halpath.patch, 1.1, 1.2 nut-2.2.2-udevusb.patch, 1.1, 1.2 nut.spec, 1.67, 1.68 sources, 1.17, 1.18
Michal Hlavinka
mhlavink at fedoraproject.org
Mon Feb 16 12:15:05 UTC 2009
- Previous message (by thread): [pkgdb] purple-microblog had acl change status
- Next message (by thread): rpms/icecream/devel icecream-0.9.3-fix-gcc44-ftbfs.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 icecream.spec, 1.14, 1.15 sources, 1.4, 1.5 icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch, 1.2, NONE icecream-0.9.2-create-env-improve-check-for-specs.patch, 1.2, NONE icecream-0.9.2-fix-gcc44-ftbfs.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mhlavink
Update of /cvs/extras/rpms/nut/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10281
Modified Files:
.cvsignore nut-2.2.2-halpath.patch nut-2.2.2-udevusb.patch
nut.spec sources
Log Message:
update to new stable branch 2.4
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nut/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 12 May 2008 08:51:23 -0000 1.17
+++ .cvsignore 16 Feb 2009 12:14:35 -0000 1.18
@@ -1 +1 @@
-nut-2.2.2.tar.gz
+nut-2.4.0.tar.gz
nut-2.2.2-halpath.patch:
Index: nut-2.2.2-halpath.patch
===================================================================
RCS file: /cvs/extras/rpms/nut/devel/nut-2.2.2-halpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nut-2.2.2-halpath.patch 12 May 2008 08:51:23 -0000 1.1
+++ nut-2.2.2-halpath.patch 16 Feb 2009 12:14:35 -0000 1.2
@@ -1,28 +1,35 @@
-diff -up nut-2.2.2/m4/nut_check_libhal.m4.halpath nut-2.2.2/m4/nut_check_libhal.m4
---- nut-2.2.2/m4/nut_check_libhal.m4.halpath 2008-05-12 08:22:14.000000000 +0200
-+++ nut-2.2.2/m4/nut_check_libhal.m4 2008-05-12 08:22:51.000000000 +0200
-@@ -63,22 +63,8 @@ if test -z "${nut_have_libhal_seen}"; th
+diff -up nut-2.4.0/m4/nut_check_libhal.m4.halpath nut-2.4.0/m4/nut_check_libhal.m4
+--- nut-2.4.0/m4/nut_check_libhal.m4.halpath 2009-02-09 12:18:36.578732609 +0100
++++ nut-2.4.0/m4/nut_check_libhal.m4 2009-02-09 12:18:36.579732703 +0100
+@@ -75,29 +75,8 @@ if test -z "${nut_have_libhal_seen}"; th
dnl As per HAL spec, §5 Callouts and §2 Device Information Files
dnl - addon install path: $libdir/hal
AC_MSG_CHECKING(for libhal Callouts path)
-- 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})
-- else # For RedHat
-- if (test -d "/usr/libexec")
+- # fallback to detecting the right path
+- if (test -d "${libdir}/hal")
- then
-- HAL_CALLOUTS_PATH="${libexecdir}"
-- AC_MSG_RESULT(${HAL_CALLOUTS_PATH})
-- else
-- # FIXME
-- HAL_CALLOUTS_PATH=""
-- AC_MSG_RESULT(not found)
+- # For Debian
+- HAL_CALLOUTS_PATH="${libdir}/hal"
+- 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="${libdir}/hal"
+- AC_MSG_RESULT(using default (${HAL_CALLOUTS_PATH}))
+- fi
- fi
+- else
+- AC_MSG_RESULT(${HAL_CALLOUTS_PATH})
- fi
+ HAL_CALLOUTS_PATH="${libexecdir}"
+ AC_MSG_RESULT(${HAL_CALLOUTS_PATH})
-
+
dnl - fdi install path: $datarootdir/hal/fdi/information/20thirdparty
AC_MSG_CHECKING(for libhal Device Information path)
nut-2.2.2-udevusb.patch:
Index: nut-2.2.2-udevusb.patch
===================================================================
RCS file: /cvs/extras/rpms/nut/devel/nut-2.2.2-udevusb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nut-2.2.2-udevusb.patch 12 May 2008 08:51:23 -0000 1.1
+++ nut-2.2.2-udevusb.patch 16 Feb 2009 12:14:35 -0000 1.2
@@ -1,104 +1,124 @@
-diff -up nut-2.2.2/scripts/udev/nut-usbups.rules.in.udevusb nut-2.2.2/scripts/udev/nut-usbups.rules.in
---- nut-2.2.2/scripts/udev/nut-usbups.rules.in.udevusb 2008-05-09 14:47:18.000000000 +0200
-+++ nut-2.2.2/scripts/udev/nut-usbups.rules.in 2008-05-09 14:47:40.000000000 +0200
-@@ -8,68 +8,68 @@ BUS!="usb", GOTO="nut-usbups_rules_end"
+diff -up nut-2.4.0/scripts/udev/nut-usbups.rules.in.udevusb nut-2.4.0/scripts/udev/nut-usbups.rules.in
+--- nut-2.4.0/scripts/udev/nut-usbups.rules.in.udevusb 2009-02-09 13:29:01.452732427 +0100
++++ nut-2.4.0/scripts/udev/nut-usbups.rules.in 2009-02-09 13:29:01.454107542 +0100
+@@ -7,86 +7,86 @@ BUS!="usb", GOTO="nut-usbups_rules_end"
+
LABEL="nut-usbups_rules_real"
+ # Krauler UP-M500VA - blazer_usb
+-SYSFS{idVendor}=="0001", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0001", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
- # MGE UPS SYSTEMS - usbhid-ups
--SYSFS{idVendor}=="0463", SYSFS{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # Hewlett Packard
+ # HP R/T 2200 INTL (like SMART2200RMXL2U) - usbhid-ups
+-SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="1f0a", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="03f0", ATTR{idProduct}=="1f0a", MODE="664", GROUP="@RUN_AS_GROUP@"
+
+ # MGE Office Protection Systems, prev. MGE UPS Systems
+ # various models - usbhid-ups
-SYSFS{idVendor}=="0463", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0463", ATTR{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="0463", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # various models - usbhid-ups
+-SYSFS{idVendor}=="0463", SYSFS{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0463", ATTR{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
+
+ # Belkin
+ # F6H375-USB - usbhid-ups
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0375", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0375", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # F6C550-AVR - usbhid-ups
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0551", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0551", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # F6C1500-TW-RK - usbhid-ups
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0751", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0751", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # F6C900-UNV - usbhid-ups
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0900", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0900", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # F6C100-UNV - usbhid-ups
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0910", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0910", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # F6C120-UNV - usbhid-ups
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0912", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0912", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # F6C800-UNV - usbhid-ups
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # F6C1100-UNV, F6C1200-UNV - usbhid-ups
+-SYSFS{idVendor}=="050d", SYSFS{idProduct}=="1100", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="1100", MODE="664", GROUP="@RUN_AS_GROUP@"
- # APC - usbhid-ups
+ # APC
+ # various models - usbhid-ups
-SYSFS{idVendor}=="051d", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="051d", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
- # CyberPower - usbhid-ups
--SYSFS{idVendor}=="0764", SYSFS{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="0764", SYSFS{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@"
-
- # Mustek Powermust 600USB (OMRON/87XXUPS)
+ # Powerware
+ # various models - bcmxcp_usb
+-SYSFS{idVendor}=="0592", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0592", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # Agiler UPS - blazer_usb
+-SYSFS{idVendor}=="05b8", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="05b8", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # Belkin F6C1200-UNV - blazer_usb
+-SYSFS{idVendor}=="0665", SYSFS{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # various models - bcmxcp_usb
+-SYSFS{idVendor}=="06da", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="06da", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # Mustek Powermust - blazer_usb
-SYSFS{idVendor}=="06da", SYSFS{idProduct}=="0003", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="06da", ATTR{idProduct}=="0003", MODE="664", GROUP="@RUN_AS_GROUP@"
-
- # LIEBERT/PowerSure Personal XT
+ # various models - usbhid-ups
-SYSFS{idVendor}=="06da", SYSFS{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="06da", ATTR{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
- # Cypress Semiconductor USB to Serial - megatec_usb
--SYSFS{idVendor}=="0665", SYSFS{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@"
-
- # Powercom - unknown driver
--SYSFS{idVendor}=="0d9f", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="0d9f", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0d9f", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0d9f", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
-
- # Agiler - megatec_usb
--SYSFS{idVendor}=="05b8", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="05b8", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
-
- # Krauler - megatec_usb
--SYSFS{idVendor}=="0001", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0001", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
-
- # Ablerex - megatec_usb
--SYSFS{idVendor}=="ffff", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="ffff", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
-
- # Unitek - megatec_usb
--SYSFS{idVendor}=="0f03", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0f03", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
-
- # Powerware - bcmxcp_usb
--SYSFS{idVendor}=="0592", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="06da", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0592", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="06da", ATTR{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # Cyber Power Systems
+ # 900AVR/BC900D, CP1200AVR/BC1200D - usbhid-ups
+-SYSFS{idVendor}=="0764", SYSFS{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # Dynex DX-800U? - usbhid-ups
+-SYSFS{idVendor}=="0764", SYSFS{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # Sweex 1000VA - richcomm_usb
+-SYSFS{idVendor}=="0925", SYSFS{idProduct}=="1234", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0925", ATTR{idProduct}=="1234", MODE="664", GROUP="@RUN_AS_GROUP@"
- # Tripp Lite - tripplite_usb
+ # TrippLite
+ # e.g. OMNIVS1000, SMART550USB, ... - tripplite_usb
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
-
- # Tripp Lite - usbhid-ups
+ # e.g. TrippLite AVR550U - usbhid-ups
-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="1003", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="2005", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="2007", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="3012", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4002", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4003", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="1003", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # e.g. TrippLite AVR750U - usbhid-ups
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="1007", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="1007", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # e.g. TrippLite OMNI1000LCD - usbhid-ups
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="2005", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="2005", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # e.g. TrippLite OMNI900LCD - usbhid-ups
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="2007", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="2007", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # e.g. TrippLite smart2200RMXL2U - usbhid-ups
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="3012", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="3012", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # e.g. ? - usbhid-ups
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="3014", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="3014", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # e.g. TrippLite SmartOnline SU1500RTXL2UA (older unit?) - usbhid-ups
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4001", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="4001", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # e.g. TrippLite SmartOnline SU6000RT4U? - usbhid-ups
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4002", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="4002", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # e.g. TrippLite SmartOnline SU1500RTXL2ua - usbhid-ups
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="4003", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="4003", MODE="664", GROUP="@RUN_AS_GROUP@"
-
- # Belkin - usbhid-ups
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0900", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0910", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0912", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0551", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0751", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="0375", MODE="664", GROUP="@RUN_AS_GROUP@"
--SYSFS{idVendor}=="050d", SYSFS{idProduct}=="1100", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0900", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0910", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0912", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0551", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0751", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="0375", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="050d", ATTR{idProduct}=="1100", MODE="664", GROUP="@RUN_AS_GROUP@"
-
- # Kebo - unsupported
--SYSFS{idVendor}=="0925", SYSFS{idProduct}=="1234", MODE="664", GROUP="@RUN_AS_GROUP@"
-+ATTR{idVendor}=="0925", ATTR{idProduct}=="1234", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # Unitek Alpha 1200Sx - blazer_usb
+-SYSFS{idVendor}=="0f03", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0f03", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
+ # Ablerex 625L USB - blazer_usb
+-SYSFS{idVendor}=="ffff", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="ffff", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
LABEL="nut-usbups_rules_end"
-
Index: nut.spec
===================================================================
RCS file: /cvs/extras/rpms/nut/devel/nut.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- nut.spec 17 Jan 2009 15:49:28 -0000 1.67
+++ nut.spec 16 Feb 2009 12:14:35 -0000 1.68
@@ -8,8 +8,8 @@
Summary: Network UPS Tools
Name: nut
-Version: 2.2.2
-Release: 6%{?dist}
+Version: 2.4.0
+Release: 1%{?dist}
Group: Applications/System
License: GPLv2+
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,10 +21,7 @@
Patch0: nut-2.2.1-conf.patch
Patch1: nut-2.2.1-multilib.patch
Patch2: nut-2.2.2-udevusb.patch
-Patch3: nut-2.2.1-glibcopen.patch
-Patch4: nut-2.2.2-usbhal.patch
-Patch5: nut-2.2.2-halpath.patch
-Patch6: nut-2.2.2-trippliteusb_476850.patch
+Patch3: nut-2.2.2-halpath.patch
Requires: nut-client => 2.0.0 hal dbus-glib
Requires(post): fileutils /sbin/chkconfig /sbin/service
@@ -48,6 +45,7 @@
BuildRequires: automake
BuildRequires: libtool
BuildRequires: neon-devel
+BuildRequires: powerman-devel
%ifnarch s390 s390x
BuildRequires: libusb-devel
@@ -94,10 +92,10 @@
capable UPS.
%package hal
-Summary: UPS Monitoring Software
-Group: Applications/System
-Requires: hal
-Conflicts: apcupsd, %{name}
+Summary: UPS Monitoring Software
+Group: Applications/System
+Requires: hal
+Conflicts: apcupsd, %{name}
%description hal
This package contains the HAL enabled version of the drivers. You can use
@@ -118,10 +116,7 @@
%patch0 -p1 -b .conf
%patch1 -p1 -b .multilib
%patch2 -p1 -b .udevusb
-#%patch3 -p1 -b .open
-%patch4 -p1 -b .usbhal
-%patch5 -p1 -b .halpath
-%patch6 -p1 -b .trippliteusb_476850
+%patch3 -p1 -b .halpath
%build
autoreconf -i
@@ -135,12 +130,13 @@
--with-cgipath=%{cgidir} \
--with-drvpath=%{modeldir} \
--with-all \
- --with-ipv6 \
+ --with-ipv6 \
--with-gd-libs \
--with-linux-hiddev=%{_includedir}/linux/hiddev.h \
- --with-pkgconfig-dir=%{_libdir}/pkgconfig \
- --disable-static
+ --with-pkgconfig-dir=%{_libdir}/pkgconfig \
+ --disable-static
+#remove rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -169,8 +165,6 @@
make install DESTDIR=%{buildroot}
-install -m 755 drivers/energizerups %{buildroot}%{modeldir}/
-
install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ups
install -m 755 %{SOURCE1} %{buildroot}%{initdir}/ups
@@ -179,8 +173,6 @@
install -m 644 scripts/hal/ups-nut-device.fdi \
%{buildroot}%{_datadir}/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi
-#mv %{buildroot}%{modeldir}/hald-addon* %{buildroot}%{_libexecdir}
-
rm -rf %{buildroot}%{_prefix}/html
rm -f %{buildroot}%{_libdir}/*.la
@@ -228,11 +220,12 @@
%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog AUTHORS MAINTAINERS README docs UPGRADING INSTALL NEWS
+%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/nut.conf
%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/ups.conf
%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.conf
%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups
-%config %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
+%config %attr(644,root,root) /lib/udev/rules.d/52-nut-usbups.rules
%{modeldir}/*
%exclude %{modeldir}/netxml-ups
%{_sbindir}/upsd
@@ -243,47 +236,46 @@
%{_mandir}/man5/upsd.conf.5.gz
%{_mandir}/man5/upsd.users.5.gz
%{_mandir}/man8/apcsmart.8.gz
+%{_mandir}/man8/bcmxcp.8*
+%{_mandir}/man8/bcmxcp_usb.8.gz
%{_mandir}/man8/belkin.8.gz
+%{_mandir}/man8/bestfcom.8.gz
+%{_mandir}/man8/belkinunv.8.gz
%{_mandir}/man8/bestups.8.gz
%{_mandir}/man8/bestuferrups.8.gz
+%{_mandir}/man8/blazer.8.gz
%{_mandir}/man8/cyberpower.8.gz
+%{_mandir}/man8/dummy-ups.8.gz
%{_mandir}/man8/everups.8.gz
%{_mandir}/man8/etapro.8.gz
+%{_mandir}/man8/gamatronic.8.gz
%{_mandir}/man8/genericups.8.gz
%{_mandir}/man8/isbmex.8.gz
%{_mandir}/man8/liebert.8.gz
%{_mandir}/man8/masterguard.8.gz
+%{_mandir}/man8/megatec.8.gz
+%{_mandir}/man8/megatec_usb.8.gz
+%{_mandir}/man8/metasys.8.gz
%{_mandir}/man8/mge-utalk.8.gz
+%{_mandir}/man8/mge-shut.8.gz
%{_mandir}/man8/nutupsdrv.8.gz
%{_mandir}/man8/oneac.8.gz
+%{_mandir}/man8/optiups.8.gz
%{_mandir}/man8/powercom.8.gz
+%{_mandir}/man8/powerman-pdu.8.gz
+%{_mandir}/man8/powerpanel.8.gz
+%{_mandir}/man8/rhino.8.gz
+%{_mandir}/man8/richcomm_usb.8.gz
+%{_mandir}/man8/safenet.8.gz
+%{_mandir}/man8/snmp-ups.8.gz
+%{_mandir}/man8/solis.8*
%{_mandir}/man8/tripplite.8.gz
+%{_mandir}/man8/tripplite_usb.8.gz
%{_mandir}/man8/tripplitesu.8.gz
%{_mandir}/man8/victronups.8.gz
+%{_mandir}/man8/upscode2.8*
%{_mandir}/man8/upsd.8.gz
%{_mandir}/man8/upsdrvctl.8.gz
-%{_mandir}/man8/mge-shut.8.gz
-%{_mandir}/man8/energizerups.8.gz
-%{_mandir}/man8/safenet.8.gz
-%{_mandir}/man8/belkinunv.8.gz
-%{_mandir}/man8/snmp-ups.8.gz
-%{_mandir}/man8/bestfcom.8.gz
-%{_mandir}/man8/cpsups.8.gz
-%{_mandir}/man8/metasys.8.gz
-%{_mandir}/man8/bcmxcp.8*
-%{_mandir}/man8/solis.8*
-%{_mandir}/man8/upscode2.8*
-%{_mandir}/man8/bcmxcp_usb.8.gz
-%{_mandir}/man8/gamatronic.8.gz
-%{_mandir}/man8/tripplite_usb.8.gz
-%{_mandir}/man8/dummy-ups.8.gz
-%{_mandir}/man8/al175.8.gz
-%{_mandir}/man8/megatec.8.gz
-%{_mandir}/man8/nitram.8.gz
-%{_mandir}/man8/optiups.8.gz
-%{_mandir}/man8/powerpanel.8.gz
-%{_mandir}/man8/megatec_usb.8.gz
-%{_mandir}/man8/rhino.8.gz
%{_mandir}/man8/usbhid-ups.8.gz
%files client
@@ -333,7 +325,6 @@
%files hal
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README UPGRADING docs/nut-hal.txt
-%config %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
%{_datadir}/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi
%{_libexecdir}/hald-addon*
@@ -345,6 +336,9 @@
%{_libdir}/pkgconfig/libupsclient.pc
%changelog
+* Mon Feb 16 2009 Michal Hlavinka <mhlavink at redhat.com> 2.4.0-1
+- update to new stable branch 2.4
+
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 2.2.2-6
- rebuild with new openssl
@@ -637,7 +631,7 @@
* Wed Jul 12 2000 Than Ngo <than at redhat.de>
- fix initscript and specfile, it should work with 6.x and 7.x
-- add --with-statepath and --sysconfdir to %configure (thanks Michael)
+- add --with-statepath and --sysconfdir to %%configure (thanks Michael)
* Sat Jul 08 2000 Than Ngo <than at redhat.de>
- add Prereq: /etc/init.d
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nut/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 12 May 2008 08:51:23 -0000 1.17
+++ sources 16 Feb 2009 12:14:35 -0000 1.18
@@ -1 +1 @@
-677a84a83e9be7bc93610413ee696375 nut-2.2.2.tar.gz
+f21a32382886214f1688fae6b426618b nut-2.4.0.tar.gz
- Previous message (by thread): [pkgdb] purple-microblog had acl change status
- Next message (by thread): rpms/icecream/devel icecream-0.9.3-fix-gcc44-ftbfs.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 icecream.spec, 1.14, 1.15 sources, 1.4, 1.5 icecream-0.9.2-create-env-handle-relative-paths-in-ld.so.conf.patch, 1.2, NONE icecream-0.9.2-create-env-improve-check-for-specs.patch, 1.2, NONE icecream-0.9.2-fix-gcc44-ftbfs.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list