From 153ff17ed8ecddc1edc34d999e78a384eb366fb3 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@redhat.com>
Date: Apr 22 2014 13:50:06 +0000
Subject: nut updated to 2.7.2


---

diff --git a/.gitignore b/.gitignore
index 67b2231..e21a10c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ nut-2.4.3.tar.gz
 /nut-2.6.4.tar.gz
 /nut-2.6.5.tar.gz
 /nut-2.7.1.tar.gz
+/nut-2.7.2.tar.gz
diff --git a/nut-2.6.5-quickfix.patch b/nut-2.6.5-quickfix.patch
index d815df6..c5b8038 100644
--- a/nut-2.6.5-quickfix.patch
+++ b/nut-2.6.5-quickfix.patch
@@ -1,6 +1,6 @@
-diff -up nut-2.7.1/configure.in.quickfix nut-2.7.1/configure.in
---- nut-2.7.1/configure.in.quickfix	2013-11-20 20:53:31.000000000 +0100
-+++ nut-2.7.1/configure.in	2014-02-27 11:25:57.608869497 +0100
+diff -up nut-2.7.1/configure.ac.quickfix nut-2.7.1/configure.ac
+--- nut-2.7.1/configure.ac.quickfix	2013-11-20 20:53:31.000000000 +0100
++++ nut-2.7.1/configure.ac	2014-02-27 11:25:57.608869497 +0100
 @@ -1027,9 +1027,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
diff --git a/nut-2.7.1-fixupslog.patch b/nut-2.7.1-fixupslog.patch
deleted file mode 100644
index 5c778f6..0000000
--- a/nut-2.7.1-fixupslog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up nut-2.7.1/clients/Makefile.am.fixupslog nut-2.7.1/clients/Makefile.am
---- nut-2.7.1/clients/Makefile.am.fixupslog	2013-07-26 21:41:10.000000000 +0200
-+++ nut-2.7.1/clients/Makefile.am	2014-03-06 14:52:09.625634472 +0100
-@@ -45,7 +45,7 @@ upsstats_cgi_SOURCES = upsstats.c upscli
-  upsimagearg.h cgilib.c cgilib.h
- 
- # not LDADD.
--libupsclient_la_SOURCES = upsclient.c upsclient.h
-+libupsclient_la_SOURCES = upsclient.c ../common/common.c upsclient.h
- libupsclient_la_LIBADD = ../common/libparseconf.la
- if WITH_SSL
-   libupsclient_la_LIBADD += $(LIBSSL_LIBS)
diff --git a/nut-2.7.1-systemdfix.patch b/nut-2.7.1-systemdfix.patch
deleted file mode 100644
index 42dcd7c..0000000
--- a/nut-2.7.1-systemdfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up nut-2.7.1/scripts/systemd/nut-driver.service.in.systemdfix nut-2.7.1/scripts/systemd/nut-driver.service.in
---- nut-2.7.1/scripts/systemd/nut-driver.service.in.systemdfix	2013-07-26 21:41:11.000000000 +0200
-+++ nut-2.7.1/scripts/systemd/nut-driver.service.in	2012-07-31 19:38:56.000000000 +0200
-@@ -4,7 +4,7 @@ After=local-fs.target network.target
- StopWhenUnneeded=yes
- 
- [Service]
--ExecStart=@DRVPATH@/upsdrvctl start
--ExecStop=@DRVPATH@/upsdrvctl stop
-+ExecStart=@driverexecdir@/upsdrvctl start
-+ExecStop=@driverexecdir@/upsdrvctl stop
- Type=forking
- 
diff --git a/nut.spec b/nut.spec
index 04783b5..293bbcb 100644
--- a/nut.spec
+++ b/nut.spec
@@ -4,7 +4,7 @@
 
 %global cgidir  /var/www/nut-cgi-bin
 %global piddir  /var/run/nut
-%global modeldir /sbin
+%global modeldir /usr/sbin
 
 %if ! (0%{?fedora} > 12 || 0%{?rhel} > 6)
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
@@ -12,8 +12,8 @@
 
 Summary: Network UPS Tools
 Name: nut
-Version: 2.7.1
-Release: 4%{?dist}
+Version: 2.7.2
+Release: 1%{?dist}
 Group: Applications/System
 License: GPLv2+ and GPLv3+
 Url: http://www.networkupstools.org/
@@ -30,10 +30,6 @@ Patch6: nut-2.6.5-pthreadfix.patch
 Patch7: nut-2.6.5-foreground.patch
 Patch8: nut-2.6.5-unreachable.patch
 Patch9: nut-2.6.5-rmpidf.patch
-# libupsclient.so contains undefined reference to upslogx,upslog_with_errno,upsdebugx
-# link it with common.c containing above functions, rhbz#1071919
-Patch10: nut-2.7.1-fixupslog.patch
-Patch11: nut-2.7.1-systemdfix.patch
 
 Requires(pre): shadow-utils udev
 Requires(post): fileutils chkconfig systemd-units
@@ -132,8 +128,8 @@ necessary to develop NUT client applications.
 %patch7 -p1 -b .foreground
 %patch8 -p1 -b .unreachable
 %patch9 -p1 -b .rmpidf
-%patch10 -p1 -b .fixupslog
-%patch11 -p1 -b .systemdfix
+#%patch10 -p1 -b .fixupslog
+#%patch11 -p1 -b .systemdfix
 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
@@ -142,7 +138,7 @@ sed -i 's|LIBSSL_LDFLAGS|LIBSSL_LIBS|' lib/libupsclient.pc.in
 #fix crlf end of lines
 for f in docs/nut-qa.txt docs/website/css/ie-overrides.css docs/website/scripts/filter_png.js
 do
-  sed -i 's/\r\n*$//' $f
+  sed -i 's/\r\n*$//' $f ||:
 done
 
 # workaround for multilib conflicts - caused by patch changing modification time of scripts
@@ -343,6 +339,7 @@ rm -rf %{buildroot}
 %{_mandir}/man8/mge-utalk.8.gz
 %{_mandir}/man8/mge-shut.8.gz
 %{_mandir}/man8/nutupsdrv.8.gz
+%{_mandir}/man8/nutdrv_atcl_usb.8.gz
 %{_mandir}/man8/nut-ipmipsu.8.gz
 %{_mandir}/man8/nut-recorder.8.gz
 %{_mandir}/man8/nut-scanner.8.gz
@@ -437,6 +434,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libnutscan.pc
 
 %changelog
+* Tue Apr 22 2014 Michal Hlavinka <mhlavink@redhat.com> - 2.7.2-1
+- nut updated to 2.7.2
+
 * Thu Apr 17 2014 Michal Hlavinka <mhlavink@redhat.com> - 2.7.1-4
 - fix multilib issue (#831429)
 
diff --git a/sources b/sources
index c554961..e01f451 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e64cf832063ecd6645683fc2ac2bd564  nut-2.7.1.tar.gz
+c3568b42e058cfc385b46d25140dced4  nut-2.7.2.tar.gz