Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2011-11-02 12:09:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nut (Old) and /work/SRC/openSUSE:Factory/.nut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nut", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/nut/nut.changes 2011-09-23 02:14:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2011-11-02 12:09:21.000000000 +0100 @@ -1,0 +2,27 @@ +Tue Nov 1 20:56:52 CET 2011 - [email protected] + +- Added missing USB devices (bnc#719292). +- Build without IPMI (openSUSE 12.1 does not contain freeipmi). +- Build without powerman for older products. +- Trigger udev to apply newly installed rules (bnc#727396). + +------------------------------------------------------------------- +Wed Sep 21 19:00:42 CEST 2011 - [email protected] + +- Build without IPMI for older products. + +------------------------------------------------------------------- +Mon Sep 19 19:09:52 UTC 2011 - [email protected] + +- Upgrade to version 2.6.2 (requested by [email protected]) + * NUT can now monitor power supply units (PSU) in servers + * NUT now provides 'nut-scanner', to discover supported devices + * NUT now provides a Java interface called 'jNut'. + * support for: Eaton 3S ; Cyber Power Systems CP1000AVRLCD ; + various APC models equiped with APC AP9618 management card, including APC + Smart-UPS RT XL ; Orvaldi 750 / 900SP ; POWEREX VI 1000 LED ; PowerWalker + VI 850 LCD ; SVEN Power Pro+ series (USB ID ffff:0000). + * Avahi support has been added + * many updates and fixes. + +------------------------------------------------------------------- Old: ---- nut-2.6.1.tar.bz2 New: ---- nut-2.6.2.tar.bz2 nut-usb-ups-ids.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.qimF4a/_old 2011-11-02 12:09:22.000000000 +0100 +++ /var/tmp/diff_new_pack.qimF4a/_new 2011-11-02 12:09:22.000000000 +0100 @@ -18,20 +18,27 @@ Name: nut -BuildRequires: apache2-devel dbus-1-glib-devel gd-devel libneon-devel libopenssl-devel libusb-devel net-snmp-devel openssl-devel pkg-config powerman-devel tcpd-devel +BuildRequires: apache2-devel dbus-1-glib-devel gd-devel libneon-devel libopenssl-devel libusb-devel net-snmp-devel openssl-devel pkg-config tcpd-devel # for directory ownership: BuildRequires: pm-utils # To fix end-of-line encoding: BuildRequires: dos2unix +# For FreeIPMI support +%if 0%{?ENABLE_IPMI} +BuildRequires: freeipmi-devel +%endif +%if %suse_version > 1110 +BuildRequires: powerman-devel # For doc build: BuildRequires: asciidoc dblatex +%endif License: GPLv2+ Group: Hardware/UPS Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) -Version: 2.6.1 +Version: 2.6.2 Release: 1 Url: http://www.networkupstools.org/ -Source: %{name}-%{version}.tar.bz2 +Source: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.bz2 Source1: upsd.init Source2: README.SUSE Source3: upsd-early-powerdown.init @@ -43,12 +50,15 @@ Patch3: nut-notifyflag.patch Patch4: nut-powersave.patch Patch6: nut-udev.patch +# PATCH-FIX-UPSTREAM nut-usb-ups-ids.patch bnc719292 [email protected] -- Add missing USB ids. http://lists.alioth.debian.org/pipermail/nut-upsdev/2011-November/005642.html +Patch7: nut-usb-ups-ids.patch Provides: smartups = %version Obsoletes: smartups < %version Conflicts: apcupsd BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils /bin/chown %insserv_prereq pwdutils /bin/chown /bin/chmod %{_bindir}/fgrep %{_bindir}/grep %{_bindir}/sed %{_bindir}/head %{_bindir}/md5sum Requires: powersave %{_bindir}/pgrep %{_bindir}/pkill %{_bindir}/grep %{_bindir}/fgrep usbutils %{_bindir}/readlink +Requires(post): udev # for update from openSUSE <= 11.3, SLE <= 11 Provides: nut-classic <= %{version} Obsoletes: nut-classic <= %{version} @@ -162,6 +172,7 @@ %if %suse_version < 1030 %patch6 -R %endif +%patch7 -p1 sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init conf/upsmon.conf.sample %if %suse_version < 1030 sed -i 's:/usr/lib/pm-utils/functions:/etc/pm/functions:' nut.sleep @@ -179,6 +190,12 @@ --with-all\ --with-dev\ --without-hal\ +%if ! 0%{?ENABLE_IPMI} + --without-ipmi\ +%endif +%if %suse_version <= 1110 + --without-powerman\ +%endif --with-linux-hiddev=%{_includedir}/linux/hiddev.h\ --with-htmlpath=%{HTMLPATH}\ --with-cgipath=%{CGIPATH}\ @@ -272,6 +289,8 @@ # values are copied to not replaced config files. # %{_sysconfdir}/sysconfig/smartups was last present in SuSE Linux 10.0 rm -f %{_sysconfdir}/sysconfig/smartups +# And finally trigger udev to set permissions according to newly installed rules files. +/sbin/udevadm trigger --subsystem-match=usb --property-match=DEVTYPE=usb_device %preun %{stop_on_removal upsd} ++++++ nut-2.6.1.tar.bz2 -> nut-2.6.2.tar.bz2 ++++++ ++++ 25400 lines of diff (skipped) ++++++ nut-usb-ups-ids.patch ++++++ Index: nut-2.6.2/scripts/udev/nut-usbups.rules.in =================================================================== --- nut-2.6.2.orig/scripts/udev/nut-usbups.rules.in +++ nut-2.6.2/scripts/udev/nut-usbups.rules.in @@ -54,6 +54,8 @@ ATTR{idVendor}=="050d", ATTR{idProduct}= ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", MODE="664", GROUP="@RUN_AS_GROUP@" # F6C1100-UNV, F6C1200-UNV - usbhid-ups ATTR{idVendor}=="050d", ATTR{idProduct}=="1100", MODE="664", GROUP="@RUN_AS_GROUP@" +# Belkin F6C1200-UNV +ATTR{idVendor}=="0665", ATTR{idProduct}=="5161", MODE="664", GROUP="@RUN_AS_GROUP@" # APC # various models - usbhid-ups @@ -84,9 +86,9 @@ ATTR{idVendor}=="06da", ATTR{idProduct}= ATTR{idVendor}=="075d", ATTR{idProduct}=="0300", MODE="664", GROUP="@RUN_AS_GROUP@" # Cyber Power Systems -# 900AVR/BC900D, CP1200AVR/BC1200D - usbhid-ups +# 900AVR/BC900D - usbhid-ups ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", MODE="664", GROUP="@RUN_AS_GROUP@" -# Dynex DX-800U? - usbhid-ups +# CP1200AVR/BC1200D, Dynex DX-800U? - usbhid-ups ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", MODE="664", GROUP="@RUN_AS_GROUP@" # OR2200LCDRM2U - usbhid-ups ATTR{idVendor}=="0764", ATTR{idProduct}=="0601", MODE="664", GROUP="@RUN_AS_GROUP@" @@ -177,4 +179,10 @@ ATTR{idVendor}=="10af", ATTR{idProduct}= # GE EP series - blazer_usb ATTR{idVendor}=="14f0", ATTR{idProduct}=="00c9", MODE="664", GROUP="@RUN_AS_GROUP@" +# Krauler UP-M500VA - blazer_usb +ATTR{idVendor}=="0001", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@" + +# Ablerex 625L USB +ATTR{idVendor}=="ffff", ATTR{idProduct}=="0000", MODE="664", GROUP="@RUN_AS_GROUP@" + LABEL="nut-usbups_rules_end" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
