Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at 2012-06-01 07:21:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-11-21 15:48:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nut.new/nut.changes 2012-06-01 07:22:02.000000000 +0200 @@ -1,0 +2,18 @@ +Wed May 30 20:19:10 CEST 2012 - [email protected] + +- Upgrade to version 2.6.3: + * nut-scanner is now improved and more portable. + * pkg-config support + * Cupport for new devices: Cyber Power Systems with SNMP RMCARD + (100, 201, 202 and 301); Dynamix 650VA USB; LDLC UPS-1200D; + Tecnoware UPS ERA LCD 0.65; Powercom BNT-xxxAP (USB ID + 0d9f:0004); Various USB devices using UPSilon 2000 software. + * bcmxcp_usb now handles disconnection and reconnection. + * blazer_usb enables again inclusion of buggy IDs. + * upsd doesn't anymore fail where either IPv4 or IPv6 is + disabled, and no explicit LISTEN directive has been specified. + * Avahi support is now automatically enabled, upon detection. + * jNut (NUT Java interface) adds device discovery support. + * Many bugfixes, cleanup and improvements. + +------------------------------------------------------------------- Old: ---- nut-2.6.2.tar.bz2 nut-usb-ups-ids.patch New: ---- nut-2.6.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.qM7AXp/_old 2012-06-01 07:22:04.000000000 +0200 +++ /var/tmp/diff_new_pack.qM7AXp/_new 2012-06-01 07:22:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package nut # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,19 @@ # - Name: nut -BuildRequires: apache2-devel dbus-1-glib-devel gd-devel libneon-devel libopenssl-devel libtool libusb-devel net-snmp-devel openssl-devel pkg-config tcpd-devel +BuildRequires: apache2-devel +BuildRequires: avahi-devel +BuildRequires: dbus-1-glib-devel +BuildRequires: gd-devel +BuildRequires: libneon-devel +BuildRequires: libopenssl-devel +BuildRequires: libtool +BuildRequires: libusb-devel +BuildRequires: net-snmp-devel +BuildRequires: openssl-devel +BuildRequires: pkg-config +BuildRequires: tcpd-devel # for directory ownership: BuildRequires: pm-utils # To fix end-of-line encoding: @@ -30,15 +40,16 @@ %if %suse_version > 1110 BuildRequires: powerman-devel # For doc build: -BuildRequires: asciidoc dblatex +BuildRequires: asciidoc +BuildRequires: dblatex %endif +Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) License: GPL-2.0+ Group: Hardware/UPS -Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) -Version: 2.6.2 -Release: 1 +Version: 2.6.3 +Release: 0 Url: http://www.networkupstools.org/ -Source: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.bz2 +Source: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.gz Source1: upsd.init Source2: README.SUSE Source3: upsd-early-powerdown.init @@ -50,14 +61,18 @@ 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: %{_bindir}/fgrep +Requires: %{_bindir}/grep +Requires: %{_bindir}/pgrep +Requires: %{_bindir}/pkill +Requires: %{_bindir}/readlink +Requires: powersave +Requires: usbutils Requires(post): udev # for update from openSUSE <= 11.3, SLE <= 11 Provides: nut-classic <= %{version} @@ -76,8 +91,8 @@ %define QUOTE " %define BACKSLASH \\ # Collect all devices listed in ups-nut-device.fdi: -%define USBHIDDRIVERS %(bunzip2 <%{S:0} | tr a-z A-Z | fgrep -a -A1 USBHID-UPS | sed -n 's/.*ATTR{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, ATTR{IDPRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, MODE=.*/modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ') -%define USBNONHIDDRIVERS %(bunzip2 <%{S:0} | tr a-z A-Z | fgrep -a -A1 _USB | sed -n 's/.*ATTR{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, ATTR{IDPRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, MODE=.*/modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ') +%define USBHIDDRIVERS %(zcat %{S:0} | tr a-z A-Z | fgrep -a -A1 USBHID-UPS | sed -n 's/.*ATTR{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, ATTR{IDPRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, MODE=.*/modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ') +%define USBNONHIDDRIVERS %(zcat %{S:0} | tr a-z A-Z | fgrep -a -A1 _USB | sed -n 's/.*ATTR{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, ATTR{IDPRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, MODE=.*/modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ') # Package provides driver for USB HID UPSes, but people can live with hal addon: Enhances: %USBHIDDRIVERS # Package provides the only avalailable driver for other USB UPSes: @@ -93,7 +108,6 @@ /usr/share/doc/packages/nut. %package drivers-net -License: GPL-2.0+ Summary: Network UPS Tools - Extra Networking Drivers (for Network Monitoring) Group: Hardware/UPS Requires: %{name} = %{version} @@ -112,7 +126,6 @@ /usr/share/doc/packages/nut. %package -n libupsclient1 -License: GPL-2.0+ Summary: Network UPS Tools Library (Unbreakable Power Supply Monitoring) Group: System/Libraries @@ -126,7 +139,6 @@ /usr/share/doc/packages/nut. %package cgi -License: GPL-2.0+ Summary: Network UPS Tools Web Server Support (UPS Status Pages) Group: Hardware/UPS Requires: %{name} = %{version} @@ -147,10 +159,10 @@ /usr/share/doc/packages/nut. %package devel -License: GPL-2.0+ Summary: Network UPS Tools (Unbreakable Power Supply Monitoring) Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} openssl-devel +Requires: %{name} = %{version} +Requires: openssl-devel %description devel Network UPS Tools is a collection of programs which provide a common @@ -172,7 +184,6 @@ %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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
