[nut/f15] nut updated to 2.6.1
Michal Hlavinka
mhlavink at fedoraproject.org
Tue Jun 7 09:50:21 UTC 2011
commit cd6a96886e0ccb692edb47db7e4ada8276a6ce97
Author: Michal Hlavinka <mhlavink at redhat.com>
Date: Tue Jun 7 11:50:08 2011 +0200
nut updated to 2.6.1
.gitignore | 1 +
nut.spec | 14 +++++---------
sources | 2 +-
3 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bd5a3a0..8fccae2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
nut-2.4.3.tar.gz
/nut-2.6.0.tar.gz
+/nut-2.6.1.tar.gz
diff --git a/nut.spec b/nut.spec
index 7d04811..291857d 100644
--- a/nut.spec
+++ b/nut.spec
@@ -13,8 +13,8 @@
Summary: Network UPS Tools
Name: nut
-Version: 2.6.0
-Release: 8%{?dist}
+Version: 2.6.1
+Release: 1%{?dist}
Group: Applications/System
License: GPLv2+
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,11 +24,6 @@ Source1: ups.init
Source2: ups.sysconfig
Source3: nut-client.tmpfiles
-Patch0: nut-2.2.1-conf.patch
-
-#for nut < 2.6.1
-Patch1: nut-2.6.0-usbget.patch
-
Patch2: nut-2.6.0-systemdshutdown.patch
Requires: nut-client => 2.6.0
@@ -126,8 +121,6 @@ necessary to develop NUT client applications.
%prep
%setup -q
-%patch0 -p1 -b .conf
-%patch1 -p1 -b .usbget
%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
@@ -391,6 +384,9 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/libupsclient.pc
%changelog
+* Tue Jun 07 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.6.1-1
+- nut updated to 2.6.1
+
* Mon May 30 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.6.0-8
- remove hal requirement from -cgi and -client
diff --git a/sources b/sources
index 259d746..3f392fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21caf82b34ecd46b7881c2b1823f5e41 nut-2.6.0.tar.gz
+89e6405272cc82c53d7b84160945761b nut-2.6.1.tar.gz
More information about the scm-commits
mailing list