rpms/nut/devel nut-2.2.0-usbhal.patch, NONE, 1.1 nut-2.2.0-udevusb.patch, 1.1, 1.2 nut.spec, 1.48, 1.49 ups.init, 1.8, 1.9

Tomas Smetana (tsmetana) fedora-extras-commits at redhat.com
Tue Nov 27 12:21:13 UTC 2007


Author: tsmetana

Update of /cvs/pkgs/rpms/nut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16361

Modified Files:
	nut-2.2.0-udevusb.patch nut.spec ups.init 
Added Files:
	nut-2.2.0-usbhal.patch 
Log Message:
* Tue Nov 27 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-5
- fix udev rules and hal information files
- fix init script


nut-2.2.0-usbhal.patch:

--- NEW FILE nut-2.2.0-usbhal.patch ---
diff -up nut-2.2.0/scripts/hal/20-ups-nut-device.fdi.usbhal nut-2.2.0/scripts/hal/20-ups-nut-device.fdi
--- nut-2.2.0/scripts/hal/20-ups-nut-device.fdi.usbhal	2007-07-02 16:19:48.000000000 +0200
+++ nut-2.2.0/scripts/hal/20-ups-nut-device.fdi	2007-11-27 09:43:35.000000000 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
 <deviceinfo version="0.2">
   <device>
-    <match key="info.bus" string="usb_device">
+    <match key="info.bus" string="usb">
 
       <!-- MGE UPS SYSTEMS -->
       <match key="usb_device.vendor_id" int="0x0463">

nut-2.2.0-udevusb.patch:

Index: nut-2.2.0-udevusb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut-2.2.0-udevusb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nut-2.2.0-udevusb.patch	16 Aug 2007 10:31:13 -0000	1.1
+++ nut-2.2.0-udevusb.patch	27 Nov 2007 12:21:10 -0000	1.2
@@ -1,6 +1,7 @@
---- nut-2.2.0/scripts/udev/nut-usbups.rules.in.udevusb	2007-08-15 13:25:38.000000000 +0200
-+++ nut-2.2.0/scripts/udev/nut-usbups.rules.in	2007-08-15 13:25:50.000000000 +0200
-@@ -1,6 +1,6 @@
+diff -up nut-2.2.0/scripts/udev/nut-usbups.rules.in.udevusb nut-2.2.0/scripts/udev/nut-usbups.rules.in
+--- nut-2.2.0/scripts/udev/nut-usbups.rules.in.udevusb	2007-05-14 18:16:22.000000000 +0200
++++ nut-2.2.0/scripts/udev/nut-usbups.rules.in	2007-11-27 09:31:16.000000000 +0100
+@@ -1,61 +1,61 @@
  # udev rules for the NUT USB drivers
  
 -SUBSYSTEM!="usb_device", GOTO="nut-usbups_rules_end"
@@ -8,3 +9,84 @@
  ACTION!="add", GOTO="nut-usbups_rules_end"
  
  # MGE UPS SYSTEMS - usbhid-ups
+-SYSFS{idVendor}=="0463", SYSFS{idProduct}=="ffff", MODE="664", GROUP="@RUN_AS_GROUP@"
+-SYSFS{idVendor}=="0463", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0463", ATTR{idProduct}=="ffff", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="0463", ATTR{idProduct}=="0001", MODE="664", GROUP="uucp"
+ 
+ # APC - usbhid-ups
+-SYSFS{idVendor}=="051d", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="051d", ATTR{idProduct}=="0002", MODE="664", GROUP="uucp"
+ 
+ # 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="uucp"
++ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="uucp"
+ 
+ # Mustek Powermust 600USB (OMRON/87XXUPS)
+-SYSFS{idVendor}=="06da", SYSFS{idProduct}=="0003", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="06da", ATTR{idProduct}=="0003", MODE="664", GROUP="uucp"
+ 
+ # Cypress Semiconductor USB to Serial
+-SYSFS{idVendor}=="0665", SYSFS{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="uucp"
+ 
+ # 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="uucp"
++ATTR{idVendor}=="0d9f", ATTR{idProduct}=="0002", MODE="664", GROUP="uucp"
+ 
+ # Agiler - megatec_usb
+-SYSFS{idVendor}=="05b8", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="05b8", ATTR{idProduct}=="0000", MODE="664", GROUP="uucp"
+ 
+ # Krauler - megatec_usb
+-SYSFS{idVendor}=="0001", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0001", ATTR{idProduct}=="0000", MODE="664", GROUP="uucp"
+ 
+ # Ablerex - megatec_usb
+-SYSFS{idVendor}=="ffff", SYSFS{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="ffff", ATTR{idProduct}=="0000", MODE="664", GROUP="uucp"
+ 
+ # Powerware - bcmxcp_usb
+-SYSFS{idVendor}=="0592", SYSFS{idProduct}=="0002", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0592", ATTR{idProduct}=="0002", MODE="664", GROUP="uucp"
+ 
+ # Tripp Lite - tripplite_usb
+-SYSFS{idVendor}=="09ae", SYSFS{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="0001", MODE="664", GROUP="uucp"
+ 
+ # Tripp Lite - 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}=="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="uucp"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="2005", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="3012", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="4002", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="09ae", ATTR{idProduct}=="4003", MODE="664", GROUP="uucp"
+ 
+ # 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@"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0900", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0910", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0912", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0551", MODE="664", GROUP="uucp"
++ATTR{idVendor}=="050d", ATTR{idProduct}=="0751", MODE="664", GROUP="uucp"
+ 
+ # Kebo - unsupported
+-SYSFS{idVendor}=="0925", SYSFS{idProduct}=="1234", MODE="664", GROUP="@RUN_AS_GROUP@"
++ATTR{idVendor}=="0925", ATTR{idProduct}=="1234", MODE="664", GROUP="uucp"
+ 
+ LABEL="nut-usbups_rules_end"
+ 


Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- nut.spec	19 Sep 2007 06:47:58 -0000	1.48
+++ nut.spec	27 Nov 2007 12:21:10 -0000	1.49
@@ -9,7 +9,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.2.0
-Release: 3%{?dist}
+Release: 5%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,6 +23,7 @@
 Patch2: nut-2.2.0-udevusb.patch
 Patch3: nut-2.2.0-glibcopen.patch
 Patch4: nut-2.2.0-wrongssl.patch
+Patch5: nut-2.2.0-usbhal.patch
 
 Requires: nut-client => 2.0.0 hal dbus-glib
 Requires(post): fileutils /sbin/chkconfig /sbin/service
@@ -84,7 +85,7 @@
 %description devel
 This package contains the development header files and libraries
 necessary to develop NUT client applications.
- 
+
 %prep
 %setup -q
 %patch0 -p1 -b .conf
@@ -92,6 +93,7 @@
 %patch2 -p1 -b .udevusb
 %patch3 -p1 -b .open
 %patch4 -p1 -b .wrongssl
+%patch5 -p1 -b .usbhal
 
 %build
 %configure \
@@ -112,6 +114,15 @@
 
 make %{?_smp_mflags}
 
+# fix old enconding manpages
+mv man/upscode2.8 man/upscode2.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/upscode2.8 man/upscode2.8.iso 
+mv man/bcmxcp.8 man/bcmxcp.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp.8 man/bcmxcp.8.iso 
+mv man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso 
+rm -f man/*.iso
+
 %install
 rm -rf %{buildroot}
 
@@ -120,7 +131,9 @@
          %{buildroot}%{_sysconfdir}/udev/rules.d \
          %{buildroot}%{piddir} \
          %{buildroot}%{_localstatedir}/lib/ups \
-         %{buildroot}%{initdir}
+         %{buildroot}%{initdir} \
+         %{buildroot}%{_libexecdir} \
+         %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty
 
 make install DESTDIR=%{buildroot}
 
@@ -131,6 +144,11 @@
 
 install -m 644 man/gamatronic.*  %{buildroot}%{_mandir}/man8/
 
+install -m 644 scripts/hal/20-ups-nut-device.fdi \
+        %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty
+
+mv %{buildroot}%{modeldir}/hald-addon* %{buildroot}%{_libexecdir}
+
 rm -rf %{buildroot}%{_prefix}/html
 rm -f %{buildroot}%{_libdir}/*.la
 
@@ -154,6 +172,7 @@
 
 %post client
 /sbin/chkconfig --add ups
+/sbin/ldconfig
 exit 0
 
 %preun client
@@ -161,6 +180,7 @@
     /sbin/service ups stop > /dev/null 2>&1
     /sbin/chkconfig --del ups
 fi
+/sbin/ldconfig
 exit 0
 
 %postun client
@@ -179,12 +199,14 @@
 %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(noreplace) %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
+%config %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
 %{modeldir}/*
 %{_sbindir}/upsd
 %{_bindir}/upslog
 %{_datadir}/cmdvartab
 %{_datadir}/driver.list
+%{_libexecdir}/hald-addon*
+%{_datadir}/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi
 %{_mandir}/man5/ups.conf.5.gz
 %{_mandir}/man5/upsd.conf.5.gz
 %{_mandir}/man5/upsd.users.5.gz
@@ -279,6 +301,15 @@
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Tue Nov 27 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-5
+- fix udev rules and hal information files
+- fix init script
+
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-4
+- fix manpages encodings
+- run ldconfig after client (un)install
+- fix HAL support
+
 * Thu Sep 06 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3
 - fix wrong libssl flags in devel, fix devel package dependencies
 


Index: ups.init
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/ups.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ups.init	16 Aug 2007 10:31:13 -0000	1.8
+++ ups.init	27 Nov 2007 12:21:10 -0000	1.9
@@ -26,27 +26,27 @@
 start() {
 	if [ "$SERVER" = "yes" ]; then
 		echo -n $"Starting UPS driver controller: "
-		daemon /sbin/upsdrvctl start
+		daemon /sbin/upsdrvctl start > /dev/null 2>&1 && success || failure
 		RETVAL=$?
 		echo
 
 		prog="upsd"
 		echo -n $"Starting $prog: "
-		daemon /usr/sbin/upsd $UPSD_OPTIONS
+		daemon /usr/sbin/upsd $UPSD_OPTIONS > /dev/null 2>&1 && success || failure
 		if [ "$RETVAL" = 0 ]; then
 			RETVAL=$?
 		fi
 		echo
 
 		echo -n $"Starting UPS monitor (master): "
-		daemon /usr/sbin/upsmon
+		daemon /usr/sbin/upsmon > dev/null 2>&1 && success || failure
 		if [ "$RETVAL" = 0 ]; then
 			RETVAL=$?
 		fi
 		echo
 	else
 		echo -n $"Starting UPS monitor (slave): "
-		daemon /usr/sbin/upsmon
+		daemon /usr/sbin/upsmon > /dev/null 2>&1 && success || failure
 		echo
 	fi
 
@@ -61,15 +61,14 @@
 	if [ "$SERVER" = "yes" ]; then
 		prog="upsd"
 		echo -n $"Stopping $prog: "
-		killproc upsd
+		killproc upsd > /dev/null 2>&1 && success || failure
 		RETVAL=$?
 		echo
 
-		echo -n $"Shutting down $MODEL: "
-		if [ "$MODEL" = "upsdrvctl" ]; then
-			/sbin/upsdrvctl stop
-		else
-			killproc $MODEL
+		echo -n $"Shutting down upsdrvctl: "
+		/sbin/upsdrvctl stop > /dev/null 2>&1 && success || failure
+		if [ "$RETVAL" = 0 ]; then
+			RETVAL=$?
 		fi
 		echo
 	fi




More information about the fedora-extras-commits mailing list