commit nut for openSUSE:Factory
Hello community, here is the log from the commit of package nut for openSUSE:Factory checked in at Fri Feb 11 02:31:15 CET 2011. -------- --- nut/nut.changes 2009-08-07 15:24:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/nut/nut.changes 2011-02-08 11:17:24.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Feb 8 10:16:54 UTC 2011 - coolo@novell.com + +- do not hardcode location of lsusb + +------------------------------------------------------------------- +Sat Jan 29 11:46:57 UTC 2011 - poletti.marco@gmail.com + +- Upgrade to 2.6.0. + * WARNING: Users of the megatec and megatec_usb drivers must respectively + switch to blazer_ser and blazer_usb. + * WARNING: Users of the liebertgxt2 driver are advised that the driver name + has changed to liebert-esp2. + * Greatly improve documentation. + * Add Augeas support. + * Added support for new devices. + * Many other fixes and improvements. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nut-2.4.1.tar.bz2 nut-hal.patch New: ---- nut-2.6.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nut.spec ++++++ --- /var/tmp/diff_new_pack.4SqUbN/_old 2011-02-11 02:30:42.000000000 +0100 +++ /var/tmp/diff_new_pack.4SqUbN/_new 2011-02-11 02:30:42.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package nut (Version 2.4.1) +# spec file for package nut # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -21,13 +21,12 @@ BuildRequires: apache2-devel dbus-1-devel gd-devel hal-devel libneon-devel libopenssl-devel libusb-devel net-snmp-devel openssl-devel pkg-config powerman-devel tcpd-devel # for directory ownership: BuildRequires: pm-utils -License: GPL v2 or later +# To fix end-of-line encoding: +BuildRequires: dos2unix +License: GPLv2+ Group: Hardware/UPS -Provides: smartups -Obsoletes: smartups -Conflicts: apcupsd Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) -Version: 2.4.1 +Version: 2.6.0 Release: 1 Url: http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 @@ -41,7 +40,9 @@ Patch3: nut-notifyflag.patch Patch4: nut-powersave.patch Patch6: nut-udev.patch -Patch12: nut-hal.patch +Provides: smartups = %version +Obsoletes: smartups < %version +Conflicts: apcupsd BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils /bin/chown Requires: nut-package = %{version} @@ -58,8 +59,8 @@ %define QUOTE " %define BACKSLASH \\ # Collect all devices listed in ups-nut-device.fdi: -%define USBHIDDRIVERS %(set -x ; bunzip2 <%{S:0} | tr a-z A-Z | fgrep -a -A1 USBHID-UPS | sed -n 's/.*SYSFS{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, SYSFS{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 %(set -x ; bunzip2 <%{S:0} | tr a-z A-Z | fgrep -a -A1 _USB | sed -n 's/.*SYSFS{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, SYSFS{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 %(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' ' ') # 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: @@ -75,7 +76,7 @@ /usr/share/doc/packages/nut. %package drivers-net -License: GPL v2 or later +License: GPLv2+ Summary: Network UPS Tools - Extra Networking Drivers (for Network Monitoring) Group: Hardware/UPS Requires: %{name}-classic = %{version} @@ -94,7 +95,7 @@ /usr/share/doc/packages/nut. %package -n libupsclient1 -License: GPL v2 or later +License: GPLv2+ Summary: Network UPS Tools Library (Unbreakable Power Supply Monitoring) Group: System/Libraries @@ -108,13 +109,13 @@ /usr/share/doc/packages/nut. %package classic -License: GPL v2 or later +License: GPLv2+ Summary: Network UPS Tools Classic Package (Monitoring Server) Group: Hardware/UPS Requires: %{name} = %{version} Provides: nut-package = %{version} Conflicts: %{name}-hal -Requires: %{_bindir}/pgrep %{_bindir}/pkill %{_bindir}/grep %{_bindir}/fgrep %{_sbindir}/lsusb %{_bindir}/readlink +Requires: %{_bindir}/pgrep %{_bindir}/pkill %{_bindir}/grep %{_bindir}/fgrep usbutils %{_bindir}/readlink PreReq: %insserv_prereq pwdutils /bin/chown /bin/chmod %{_bindir}/fgrep %{_bindir}/grep %{_bindir}/sed %{_bindir}/head %{_bindir}/md5sum Requires: powersave # for update from openSUSE <= 10.3, SLE <= 10 @@ -152,7 +153,7 @@ /usr/share/doc/packages/nut. %package hal -License: GPL v2 or later +License: GPLv2+ Summary: Network UPS Tools Support for HAL (HAL/D-BUS Integration) Group: Hardware/UPS Requires: %{name} = %{version} @@ -180,7 +181,7 @@ /usr/share/doc/packages/nut. %package cgi -License: GPL v2 or later +License: GPLv2+ Summary: Network UPS Tools Web Server Support (UPS Status Pages) Group: Hardware/UPS Requires: %{name}-classic = %{version} @@ -201,7 +202,7 @@ /usr/share/doc/packages/nut. %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Network UPS Tools (Unbreakable Power Supply Monitoring) Group: Development/Libraries/C and C++ Requires: %{name} = %{version} openssl-devel @@ -227,14 +228,14 @@ %patch6 -R %endif sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init conf/upsmon.conf.sample -%if %suse_version > 1030 -%patch12 -%endif %if %suse_version < 1030 sed -i 's:/usr/lib/pm-utils/functions:/etc/pm/functions:' nut.sleep %endif sed -i s:/usr/local/ups/bin:/bin: conf/upssched.conf.sample.in +[ -f docs/nut-qa.txt ] +dos2unix docs/nut-qa.txt + %build autoreconf -f -i %configure --disable-static --with-pic --libexecdir=%_prefix/lib\ @@ -294,6 +295,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d install -m0644 scripts/misc/nut.bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/ +mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/hal +mv $RPM_BUILD_ROOT/%{_prefix}/lib64/hal/hald-addon-* $RPM_BUILD_ROOT/%{_prefix}/lib/hal || true + %pre usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false \ -c "UPS daemon" -d /sbin %{USER} 2>/dev/null || : @@ -373,7 +377,7 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README README.SUSE UPGRADING upsd-early-powerdown docs/FAQ docs/*.txt docs/cables +%doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README README.SUSE UPGRADING upsd-early-powerdown docs/*.txt docs/cables %dir %{_prefix}/lib/ups %{_datadir}/nut %{_datadir}/hal/fdi/policy/20thirdparty/20-nut-disable-hal-hid-ups.fdi @@ -423,12 +427,12 @@ %{_sysconfdir}/dbus-1/system.d/upsd.conf %endif %if %suse_version >= 1030 -%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nut +%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/nut %endif %{_sysconfdir}/init.d/upsd %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d -%{_sysconfdir}/udev/rules.d/*.rules +%config(noreplace) %{_sysconfdir}/udev/rules.d/*.rules /etc/bash_completion.d/ %files cgi ++++++ nut-2.4.1.tar.bz2 -> nut-2.6.0.tar.bz2 ++++++ ++++ 126182 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de