rpms/nut/devel nut-2.2.2-halpath.patch, NONE, 1.1 nut-2.2.2-udevusb.patch, NONE, 1.1 nut-2.2.2-usbhal.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 nut.spec, 1.58, 1.59 sources, 1.16, 1.17 nut-2.2.0-usbhal.patch, 1.1, NONE nut-2.2.1-compile.patch, 1.1, NONE nut-2.2.1-udevusb.patch, 1.1, NONE
Tomas Smetana (tsmetana)
fedora-extras-commits at redhat.com
Mon May 12 08:52:02 UTC 2008
Author: tsmetana
Update of /cvs/pkgs/rpms/nut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21484
Modified Files:
.cvsignore nut.spec sources
Added Files:
nut-2.2.2-halpath.patch nut-2.2.2-udevusb.patch
nut-2.2.2-usbhal.patch
Removed Files:
nut-2.2.0-usbhal.patch nut-2.2.1-compile.patch
nut-2.2.1-udevusb.patch
Log Message:
* Mon May 12 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.2-1
- new upstream version
nut-2.2.2-halpath.patch:
--- NEW FILE nut-2.2.2-halpath.patch ---
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
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")
- then
- # 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=""
- AC_MSG_RESULT(not found)
- fi
- 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:
--- NEW FILE nut-2.2.2-udevusb.patch ---
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"
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 - 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@"
# 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"
nut-2.2.2-usbhal.patch:
--- NEW FILE nut-2.2.2-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/ups-nut-device.fdi.usbhal 2007-07-02 16:19:48.000000000 +0200
+++ nut-2.2.0/scripts/hal/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">
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 9 Jan 2008 14:03:48 -0000 1.16
+++ .cvsignore 12 May 2008 08:51:23 -0000 1.17
@@ -1 +1 @@
-nut-2.2.1.tar.gz
+nut-2.2.2.tar.gz
Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- nut.spec 12 Feb 2008 12:22:05 -0000 1.58
+++ nut.spec 12 May 2008 08:51:23 -0000 1.59
@@ -8,8 +8,8 @@
Summary: Network UPS Tools
Name: nut
-Version: 2.2.1
-Release: 3%{?dist}
+Version: 2.2.2
+Release: 1%{?dist}
Group: Applications/System
License: GPLv2+
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -20,12 +20,12 @@
Patch0: nut-2.2.1-conf.patch
Patch1: nut-2.2.1-multilib.patch
-Patch2: nut-2.2.1-udevusb.patch
+Patch2: nut-2.2.2-udevusb.patch
Patch3: nut-2.2.1-glibcopen.patch
-Patch4: nut-2.2.0-usbhal.patch
-Patch5: nut-2.2.1-compile.patch
+Patch4: nut-2.2.2-usbhal.patch
+Patch5: nut-2.2.2-halpath.patch
-Requires: nut-client => 2.0.0 hal dbus-glib
+Requires: nut-client => 2.0.0 hal dbus-glib nss_compat_ossl
Requires(post): fileutils /sbin/chkconfig /sbin/service
Requires(postun): fileutils /sbin/chkconfig /sbin/service
@@ -43,6 +43,10 @@
BuildRequires: hal-devel
BuildRequires: dbus-glib-devel
BuildRequires: openssl-devel
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: neon-devel
%ifnarch s390 s390x
BuildRequires: libusb-devel
@@ -77,10 +81,19 @@
This package includes CGI programs for accessing UPS status via a web
browser.
+%package xml
+Group: Applications/System
+Summary: XML UPS driver for the Network UPS Tools
+Requires: %{name}-client = %{version}-%{release}
+
+%description xml
+This package adds the netxml-ups driver, that allows NUT to monitor a XML
+capable UPS.
+
%package devel
Group: Development/Libraries
Summary: Development files for NUT Client
-Requires: %{name}-client = %{version}-%{release} webserver openssl-devel
+Requires: %{name}-client = %{version}-%{release} webserver nss_compat_ossl-devel
%description devel
This package contains the development header files and libraries
@@ -93,9 +106,10 @@
%patch2 -p1 -b .udevusb
%patch3 -p1 -b .open
%patch4 -p1 -b .usbhal
-%patch5 -p1 -b .netdb
+%patch5 -p1 -b .halpath
%build
+autoreconf
%configure \
--with-user=%{name} \
--with-group=uucp \
@@ -144,10 +158,10 @@
install -m 644 man/gamatronic.* %{buildroot}%{_mandir}/man8/
-install -m 644 scripts/hal/20-ups-nut-device.fdi \
- %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty
+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}
+#mv %{buildroot}%{modeldir}/hald-addon* %{buildroot}%{_libexecdir}
rm -rf %{buildroot}%{_prefix}/html
rm -f %{buildroot}%{_libdir}/*.la
@@ -201,6 +215,7 @@
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups
%config %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
%{modeldir}/*
+%exclude %{modeldir}/netxml-ups
%{_sbindir}/upsd
%{_bindir}/upslog
%{_datadir}/cmdvartab
@@ -277,6 +292,7 @@
%{_mandir}/man8/upslog.8.gz
%{_mandir}/man8/upsmon.8.gz
%{_mandir}/man8/upssched.8.gz
+%{_mandir}/man8/netxml-ups.8.gz
%files cgi
%defattr(-,root,root,-)
@@ -292,15 +308,22 @@
%{_mandir}/man8/upsstats.cgi.8.gz
%{_mandir}/man8/upsset.cgi.8.gz
+%files xml
+%defattr(-,root,root)
+%{modeldir}/netxml-ups
+%doc %{_mandir}/man8/netxml-ups.8.gz
+
%files devel
%defattr(-,root,root,-)
-%{_bindir}/libupsclient-config
%{_includedir}/*
%{_mandir}/man3/upscli*
%{_libdir}/libupsclient.so
%{_libdir}/pkgconfig/libupsclient.pc
%changelog
+* Mon May 12 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.2-1
+- new upstream version
+
* Tue Feb 12 2008 Tomas Smetana <tsmetana at redhat.com> 2.2.1-3
- fix compilation error with new glibc headers
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 9 Jan 2008 14:03:48 -0000 1.16
+++ sources 12 May 2008 08:51:23 -0000 1.17
@@ -1 +1 @@
-c7ae871961a7dbe12b22d504267dc132 nut-2.2.1.tar.gz
+677a84a83e9be7bc93610413ee696375 nut-2.2.2.tar.gz
--- nut-2.2.0-usbhal.patch DELETED ---
--- nut-2.2.1-compile.patch DELETED ---
--- nut-2.2.1-udevusb.patch DELETED ---
More information about the fedora-extras-commits
mailing list