diff --git a/nut-2.4.1.tar.bz2 b/nut-2.4.1.tar.bz2 deleted file mode 100644 index 39de4a4..0000000 --- a/nut-2.4.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cee0802b21d2fe5222115182fcaa94acbd87e96863e9ae60203f4ae168a3ea9c -size 878389 diff --git a/nut-2.6.0.tar.bz2 b/nut-2.6.0.tar.bz2 new file mode 100644 index 0000000..237fb35 --- /dev/null +++ b/nut-2.6.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5961a1def1276afc797fcff72621120a90840b41e303cb910bcdfedaf13a5bdf +size 1427969 diff --git a/nut-hal.patch b/nut-hal.patch deleted file mode 100644 index 6487656..0000000 --- a/nut-hal.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- m4/nut_check_libhal.m4 -+++ m4/nut_check_libhal.m4 -@@ -79,6 +79,11 @@ - if (test -z "$HAL_CALLOUTS_PATH") - then - # fallback to detecting the right path -+ if (test -d "${prefix}/lib/hal") -+ then -+ HAL_CALLOUTS_PATH="${prefix}/lib/hal" -+ AC_MSG_RESULT(${HAL_CALLOUTS_PATH}) -+ else - if (test -d "${libdir}/hal") - then - # For Debian -@@ -95,6 +100,7 @@ - AC_MSG_RESULT(using default (${HAL_CALLOUTS_PATH})) - fi - fi -+ fi - else - AC_MSG_RESULT(${HAL_CALLOUTS_PATH}) - fi diff --git a/nut.changes b/nut.changes index b5bc8a8..7e54cf5 100644 --- a/nut.changes +++ b/nut.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Fri Aug 7 15:13:55 CEST 2009 - sbrabec@suse.cz diff --git a/nut.spec b/nut.spec index 356c6fb..aabfa72 100644 --- a/nut.spec +++ b/nut.spec @@ -1,5 +1,5 @@ # -# spec file for package nut (Version 2.4.1) +# spec file for package nut (Version 2.6.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,13 +21,12 @@ Name: nut 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 +# To fix end-of-line encoding: +BuildRequires: dos2unix License: GPL v2 or later 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 @@ Patch: nut-preconfig.patch 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 @@ Requires: nut-package = %{version} %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: @@ -114,7 +115,7 @@ 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 @@ -227,14 +228,14 @@ mv upsd-early-powerdown.init upsd-early-powerdown %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 @@ mv $RPM_BUILD_ROOT%{CGIPATH}/*.cgi $RPM_BUILD_ROOT%{CGIPATH}/nut 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 @@ rm -rf $RPM_BUILD_ROOT %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 @@ rm -rf $RPM_BUILD_ROOT %{_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