rpms/nut/devel nut-2.2.1-conf.patch, NONE, 1.1 nut-2.2.1-glibcopen.patch, NONE, 1.1 nut-2.2.1-multilib.patch, NONE, 1.1 nut-2.2.1-udevusb.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 nut.spec, 1.55, 1.56 sources, 1.15, 1.16 nut-2.2.0-conf.patch, 1.1, NONE nut-2.2.0-glibcopen.patch, 1.1, NONE nut-2.2.0-multilib.patch, 1.1, NONE nut-2.2.0-udevusb.patch, 1.3, NONE nut-2.2.0-wrongssl.patch, 1.1, NONE
Tomas Smetana (tsmetana)
fedora-extras-commits at redhat.com
Wed Jan 9 14:04:25 UTC 2008
Author: tsmetana
Update of /cvs/pkgs/rpms/nut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26243
Modified Files:
.cvsignore nut.spec sources
Added Files:
nut-2.2.1-conf.patch nut-2.2.1-glibcopen.patch
nut-2.2.1-multilib.patch nut-2.2.1-udevusb.patch
Removed Files:
nut-2.2.0-conf.patch nut-2.2.0-glibcopen.patch
nut-2.2.0-multilib.patch nut-2.2.0-udevusb.patch
nut-2.2.0-wrongssl.patch
Log Message:
new upstream version
nut-2.2.1-conf.patch:
--- NEW FILE nut-2.2.1-conf.patch ---
diff -up nut-2.2.1/conf/upssched.conf.sample.in.conf nut-2.2.1/conf/upssched.conf.sample.in
--- nut-2.2.1/conf/upssched.conf.sample.in.conf 2008-01-09 13:46:29.000000000 +0100
+++ nut-2.2.1/conf/upssched.conf.sample.in 2008-01-09 13:46:43.000000000 +0100
@@ -14,7 +14,7 @@
# A shell script with a big case..esac construct should work nicely for this.
# An example has been provided to help you get started.
-CMDSCRIPT /usr/local/ups/bin/upssched-cmd
+CMDSCRIPT /usr/bin/upssched-cmd
# ============================================================================
#
nut-2.2.1-glibcopen.patch:
--- NEW FILE nut-2.2.1-glibcopen.patch ---
diff -up nut-2.2.1/drivers/megatec_usb.c.open nut-2.2.1/drivers/megatec_usb.c
--- nut-2.2.1/drivers/megatec_usb.c.open 2008-01-09 14:22:27.000000000 +0100
+++ nut-2.2.1/drivers/megatec_usb.c 2008-01-09 14:23:00.000000000 +0100
@@ -207,7 +207,7 @@ int ser_open(const char *port)
/* link the matchers */
regex_matcher->next = &subdriver_matcher;
- ret = usb->open(&udev, &usbdevice, regex_matcher, NULL);
+ ret = (usb->open)(&udev, &usbdevice, regex_matcher, NULL);
if (ret < 0)
usb_open_error(port);
nut-2.2.1-multilib.patch:
--- NEW FILE nut-2.2.1-multilib.patch ---
diff -up nut-2.2.1/lib/libupsclient-config.in.multilib nut-2.2.1/lib/libupsclient-config.in
--- nut-2.2.1/lib/libupsclient-config.in.multilib 2007-07-10 15:44:32.000000000 +0200
+++ nut-2.2.1/lib/libupsclient-config.in 2008-01-09 14:45:06.000000000 +0100
@@ -10,9 +10,18 @@
Version="@PACKAGE_VERSION@"
prefix=@prefix@
exec_prefix=@exec_prefix@
-Libs="-L at libdir@ -lupsclient @LIBSSL_LDFLAGS@"
Cflags="-I at includedir@ @LIBSSL_CFLAGS@"
+arch=$(/bin/arch)
+if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" -o "$arch" = "ia64" ]; then
+ libdir="/usr/lib64"
+else
+ libdir="/usr/lib"
+fi
+Libs="-L$libdir -lupsclient @LIBSSL_LDFLAGS@"
+
+
+
case "$1" in
--cflags)
nut-2.2.1-udevusb.patch:
--- NEW FILE nut-2.2.1-udevusb.patch ---
diff -up nut-2.2.1/scripts/udev/nut-usbups.rules.in.udevusb nut-2.2.1/scripts/udev/nut-usbups.rules.in
--- nut-2.2.1/scripts/udev/nut-usbups.rules.in.udevusb 2008-01-09 13:58:41.000000000 +0100
+++ nut-2.2.1/scripts/udev/nut-usbups.rules.in 2008-01-09 13:59:33.000000000 +0100
@@ -8,64 +8,64 @@ BUS!="usb", GOTO="nut-usbups_rules_end"
LABEL="nut-usbups_rules_real"
# 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="@RUN_AS_GROUP@"
+ATTR{idVendor}=="0463", ATTR{idProduct}=="0001", MODE="664", GROUP="@RUN_AS_GROUP@"
# APC - 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)
-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
-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
-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@"
# Powerware - 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@"
# 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="@RUN_AS_GROUP@"
# 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}=="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@"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="2005", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="2007", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="3012", MODE="664", GROUP="@RUN_AS_GROUP@"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="4002", 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@"
LABEL="nut-usbups_rules_end"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 13 Jul 2007 11:03:22 -0000 1.15
+++ .cvsignore 9 Jan 2008 14:03:48 -0000 1.16
@@ -1 +1 @@
-nut-2.2.0.tar.gz
+nut-2.2.1.tar.gz
Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- nut.spec 5 Dec 2007 11:50:38 -0000 1.55
+++ nut.spec 9 Jan 2008 14:03:48 -0000 1.56
@@ -8,8 +8,8 @@
Summary: Network UPS Tools
Name: nut
-Version: 2.2.0
-Release: 6.2%{?dist}
+Version: 2.2.1
+Release: 1%{?dist}
Group: Applications/System
License: GPLv2+
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,11 +18,10 @@
Source1: ups.init
Source2: ups.sysconfig
-Patch0: nut-2.2.0-conf.patch
-Patch1: nut-2.2.0-multilib.patch
-Patch2: nut-2.2.0-udevusb.patch
-Patch3: nut-2.2.0-glibcopen.patch
-Patch4: nut-2.2.0-wrongssl.patch
+Patch0: nut-2.2.1-conf.patch
+Patch1: nut-2.2.1-multilib.patch
+Patch2: nut-2.2.1-udevusb.patch
+Patch3: nut-2.2.1-glibcopen.patch
Patch5: nut-2.2.0-usbhal.patch
Requires: nut-client => 2.0.0 hal dbus-glib
@@ -92,7 +91,6 @@
%patch1 -p1 -b .multilib
%patch2 -p1 -b .udevusb
%patch3 -p1 -b .open
-%patch4 -p1 -b .wrongssl
%patch5 -p1 -b .usbhal
%build
@@ -301,6 +299,9 @@
%{_libdir}/pkgconfig/libupsclient.pc
%changelog
+* Wed Jan 09 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.1-1
+- new upstream version
+
* Wed Dec 05 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-6.2
- rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 13 Jul 2007 11:03:22 -0000 1.15
+++ sources 9 Jan 2008 14:03:48 -0000 1.16
@@ -1 +1 @@
-a3570515d80804051d4e7631e8a3eb12 nut-2.2.0.tar.gz
+c7ae871961a7dbe12b22d504267dc132 nut-2.2.1.tar.gz
--- nut-2.2.0-conf.patch DELETED ---
--- nut-2.2.0-glibcopen.patch DELETED ---
--- nut-2.2.0-multilib.patch DELETED ---
--- nut-2.2.0-udevusb.patch DELETED ---
--- nut-2.2.0-wrongssl.patch DELETED ---
More information about the fedora-extras-commits
mailing list