[nut/f18] nut updated to 2.6.5

[Michal Hlavinka]

commit 96d0410b9dd8e264807fe9c6f434eac067b12b9f
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Fri Aug 10 16:02:47 2012 +0200

    nut updated to 2.6.5

 .gitignore               |    1 +
 nut-2.6.5-quickfix.patch |   14 ++++++++++++++
 nut.spec                 |   13 +++++++++----
 sources                  |    2 +-
 4 files changed, 25 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6103088..8d08d5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ nut-2.4.3.tar.gz
 /nut-2.6.2.tar.gz
 /nut-2.6.3.tar.gz
 /nut-2.6.4.tar.gz
+/nut-2.6.5.tar.gz
diff --git a/nut-2.6.5-quickfix.patch b/nut-2.6.5-quickfix.patch
new file mode 100644
index 0000000..8330518
--- /dev/null
+++ b/nut-2.6.5-quickfix.patch
@@ -0,0 +1,14 @@
+diff -up nut-2.6.5/configure.in.quickfix nut-2.6.5/configure.in
+--- nut-2.6.5/configure.in.quickfix	2012-08-10 14:19:55.924431026 +0200
++++ nut-2.6.5/configure.in	2012-08-10 14:20:13.332566508 +0200
+@@ -986,9 +986,8 @@ dnl Override installation directory, wit
+ dnl prefix. This is needed for 'distcheck*' targets, otherwise
+ dnl files will try to get intalled to the actual system directories
+ if test -n "${systemdsystemunitdir}"; then
+-	systemdsystemshutdowndir="${libdir}/systemd/system-shutdown"
++	systemdsystemshutdowndir="/lib/systemd/system-shutdown"
+ 	AC_MSG_RESULT(using ${systemdsystemunitdir})
+-	systemdsystemunitdir="`echo ${systemdsystemunitdir} | sed 's/\/lib/\${libdir}/'`"
+ else
+ 	AC_MSG_RESULT(no)
+ fi
diff --git a/nut.spec b/nut.spec
index a7ef88a..1799389 100644
--- a/nut.spec
+++ b/nut.spec
@@ -12,8 +12,8 @@
 
 Summary: Network UPS Tools
 Name: nut
-Version: 2.6.4
-Release: 2%{?dist}
+Version: 2.6.5
+Release: 1%{?dist}
 Group: Applications/System
 License: GPLv2+ and GPLv3+
 Url: http://www.networkupstools.org/
@@ -21,6 +21,9 @@ Source: http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.gz
 Source3: nut-client.tmpfiles
 Patch1: nut-2.6.3-tmpfiles.patch
 
+#quick fix. TODO: fix it properly
+Patch3: nut-2.6.5-quickfix.patch
+
 Requires(pre): shadow-utils udev
 Requires(post): fileutils chkconfig 
 Requires(postun): fileutils chkconfig 
@@ -108,6 +111,7 @@ necessary to develop NUT client applications.
 %prep
 %setup -q
 %patch1 -p1 -b .tmpfiles
+%patch3 -p1 -b .quickfix
 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
@@ -492,6 +496,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libnutscan.pc
 
 %changelog
+* Fri Aug 10 2012 Michal Hlavinka <mhlavink at redhat.com> - 2.6.5-1
+- nut updated to 2.6.5
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -949,8 +956,6 @@ rm -rf %{buildroot}
 
 * Sat Dec 11 1999 <bo-rpm at vircio.com> (0.42.1-1)
 - fixed string length in bestups.c line 279.
-
-* Sat Dec 11 1999 <bo-rpm at vircio.com> (0.42.1-1)
 - upgraded package to 0.42.1 from 0.42.0
 
 * Mon Dec 6 1999 <bo-rpm at vircio.com> (0.42.0-8)
diff --git a/sources b/sources
index 08c16c3..a333d82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78d672fbbcd90683e49c667665a95f87  nut-2.6.4.tar.gz
+e6eac4fa04baff0d0a827d64efe81a7e  nut-2.6.5.tar.gz