[nut/f15] nut updated to 2.6.2
Michal Hlavinka
mhlavink at fedoraproject.org
Fri Sep 16 11:02:08 UTC 2011
commit 22eeeb25ce48f58e7edad25be913a72d6d99f61a
Author: Michal Hlavinka <mhlavink at redhat.com>
Date: Fri Sep 16 13:01:54 2011 +0200
nut updated to 2.6.2
.gitignore | 1 +
nut.spec | 41 ++++++++++++++++++++++++++++++++++-------
sources | 2 +-
3 files changed, 36 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8fccae2..2f16145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
nut-2.4.3.tar.gz
/nut-2.6.0.tar.gz
/nut-2.6.1.tar.gz
+/nut-2.6.2.tar.gz
diff --git a/nut.spec b/nut.spec
index d288843..f2190d6 100644
--- a/nut.spec
+++ b/nut.spec
@@ -13,8 +13,8 @@
Summary: Network UPS Tools
Name: nut
-Version: 2.6.1
-Release: 4%{?dist}
+Version: 2.6.2
+Release: 1%{?dist}
Group: Applications/System
License: GPLv2+
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,8 +24,6 @@ Source1: ups.init
Source2: ups.sysconfig
Source3: nut-client.tmpfiles
-Patch2: nut-2.6.0-systemdshutdown.patch
-
Requires: nut-client => 2.6.0
Requires(pre): shadow-utils udev
Requires(post): fileutils chkconfig initscripts
@@ -52,6 +50,7 @@ BuildRequires: pkgconfig
BuildRequires: powerman-devel
BuildRequires: python-devel
BuildRequires: desktop-file-utils
+BuildRequires: freeipmi-devel
%ifnarch s390 s390x
BuildRequires: libusb-devel
@@ -121,7 +120,6 @@ necessary to develop NUT client applications.
%prep
%setup -q
-%patch2 -p1 -b .systemdshutdown
sed -i 's|=NUT-Monitor|=nut-monitor|' scripts/python/app/nut-monitor.desktop
sed -i "s|sys.argv\[0\]|'%{_datadir}/%{name}/nut-monitor/nut-monitor'|" scripts/python/app/NUT-Monitor
sed -i 's|LIBSSL_LDFLAGS|LIBSSL_LIBS|' lib/libupsclient-config.in
@@ -145,7 +143,8 @@ autoreconf -i
--with-drvpath=%{modeldir} \
--with-pkgconfig-dir=%{_libdir}/pkgconfig \
--disable-static \
- --libdir=%{_libdir}
+ --libdir=%{_libdir} \
+ --with-systemdsystemunitdir=no
# --with-doc \ asciidoc >= 8.6.3 is required
#remove rpath
@@ -173,6 +172,9 @@ install -m 755 %{SOURCE1} %{buildroot}%{initdir}/ups
%if %{?fedora}0 > 140 || %{?rhel}0 > 60
install -p -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tmpfiles.d/nut-client.conf
+ mkdir -p %{buildroot}/lib/systemd/system-shutdown/
+ printf '#!/bin/sh\nupsmon -K >/dev/null 2>&1 && upsdrvctl shutdown' >%{buildroot}/lib/systemd/system-shutdown/nutshutdown
+ chmod 755 %{buildroot}/lib/systemd/system-shutdown/nutshutdown
%endif
#install -m 644 man/gamatronic.* %{buildroot}%{_mandir}/man8/
@@ -191,7 +193,9 @@ do
done
popd
+#fix collision with virtualbox
mv %{buildroot}/lib/udev/rules.d/52-nut-usbups.rules %{buildroot}/lib/udev/rules.d/62-nut-usbups.rules
+mv %{buildroot}/lib/udev/rules.d/52-nut-ipmipsu.rules %{buildroot}/lib/udev/rules.d/62-nut-ipmipsu.rules
#pushd %{buildroot}
# fix encoding
@@ -262,10 +266,13 @@ rm -rf %{buildroot}
%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups
%attr(644,root,root) /lib/udev/rules.d/62-nut-usbups.rules
+%attr(644,root,root) /lib/udev/rules.d/62-nut-ipmipsu.rules
%{modeldir}/*
%exclude %{modeldir}/netxml-ups
%{_sbindir}/upsd
+%{_bindir}/nut-scanner
%{_bindir}/upslog
+%{_libdir}/libnutscan.so.*
%{_datadir}/%{name}/cmdvartab
%{_datadir}/%{name}/driver.list
%{_mandir}/man5/nut.conf.5.gz
@@ -273,6 +280,7 @@ rm -rf %{buildroot}
%{_mandir}/man5/upsd.conf.5.gz
%{_mandir}/man5/upsd.users.5.gz
%{_mandir}/man8/apcsmart.8.gz
+%{_mandir}/man8/apcsmart-old.8.gz
%{_mandir}/man8/bcmxcp.8*
%{_mandir}/man8/bcmxcp_usb.8.gz
%{_mandir}/man8/belkin.8.gz
@@ -298,6 +306,8 @@ rm -rf %{buildroot}
%{_mandir}/man8/mge-utalk.8.gz
%{_mandir}/man8/mge-shut.8.gz
%{_mandir}/man8/nutupsdrv.8.gz
+%{_mandir}/man8/nut-ipmipsu.8.gz
+%{_mandir}/man8/nut-scanner.8.gz
%{_mandir}/man8/oneac.8.gz
%{_mandir}/man8/optiups.8.gz
%{_mandir}/man8/powercom.8.gz
@@ -335,7 +345,7 @@ rm -rf %{buildroot}
%{_sbindir}/upsmon
%{_sbindir}/upssched
%{_bindir}/upssched-cmd
-/lib/systemd/system-shutdown/upsshutdown
+/lib/systemd/system-shutdown/nutshutdown
%{_libdir}/libupsclient.so.*
%{_mandir}/man5/upsmon.conf.5.gz
%{_mandir}/man5/upssched.conf.5.gz
@@ -379,11 +389,28 @@ rm -rf %{buildroot}
%files devel
%defattr(-,root,root,-)
%{_includedir}/*
+%{_mandir}/man3/nutscan_add_device_to_device.3.gz
+%{_mandir}/man3/nutscan_add_option_to_device.3.gz
+%{_mandir}/man3/nutscan_cidr_to_ip.3.gz
+%{_mandir}/man3/nutscan_display_parsable.3.gz
+%{_mandir}/man3/nutscan_display_ups_conf.3.gz
+%{_mandir}/man3/nutscan_free_device.3.gz
+%{_mandir}/man3/nutscan_new_device.3.gz
+%{_mandir}/man3/nutscan_scan_avahi.3.gz
+%{_mandir}/man3/nutscan_scan_ipmi.3.gz
+%{_mandir}/man3/nutscan_scan_nut.3.gz
+%{_mandir}/man3/nutscan_scan_snmp.3.gz
+%{_mandir}/man3/nutscan_scan_usb.3.gz
+%{_mandir}/man3/nutscan_scan_xml_http.3.gz
%{_mandir}/man3/upscli*
%{_libdir}/libupsclient.so
+%{_libdir}/libnutscan.so
%{_libdir}/pkgconfig/libupsclient.pc
%changelog
+* Fri Sep 16 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.6.2-1
+- nut updated to 2.6.2
+
* Mon Aug 22 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.6.1-4
- service startup not reported correctly in netclient mode (#732151)
diff --git a/sources b/sources
index 3f392fc..74cedf7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-89e6405272cc82c53d7b84160945761b nut-2.6.1.tar.gz
+f6d0683e51e0fcab06e6a79724685d26 nut-2.6.2.tar.gz
More information about the scm-commits
mailing list