mhlavink pushed to nut (f22). "nut updated to 2.7.3"

[notifications at fedoraproject.org]

>From 256649ca408c575a83f8929ff467b966bdbe3607 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink at redhat.com>
Date: Fri, 24 Apr 2015 09:32:45 +0200
Subject: nut updated to 2.7.3


diff --git a/.gitignore b/.gitignore
index e21a10c..ec15165 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ nut-2.4.3.tar.gz
 /nut-2.6.5.tar.gz
 /nut-2.7.1.tar.gz
 /nut-2.7.2.tar.gz
+/nut-2.7.3.tar.gz
diff --git a/nut-2.6.5-quickfix.patch b/nut-2.6.5-quickfix.patch
index c5b8038..aa11fe6 100644
--- a/nut-2.6.5-quickfix.patch
+++ b/nut-2.6.5-quickfix.patch
@@ -1,14 +1,12 @@
-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
+diff -up nut-2.7.3/configure.ac.quickfix nut-2.7.3/configure.ac
+--- nut-2.7.3/configure.ac.quickfix	2015-04-23 12:05:21.219228670 +0200
++++ nut-2.7.3/configure.ac	2015-04-23 12:05:21.230228646 +0200
+@@ -1065,7 +1065,7 @@ 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 d458c52..edab1e6 100644
--- a/nut.spec
+++ b/nut.spec
@@ -1,3 +1,6 @@
+# Does not build with hardened build enabled due to PIC
+%global _hardened_build 0
+
 #TODO: split nut-client so it does not require python
 %global nut_uid 57
 %global nut_gid 57
@@ -12,8 +15,8 @@
 
 Summary: Network UPS Tools
 Name: nut
-Version: 2.7.2
-Release: 3%{?dist}
+Version: 2.7.3
+Release: 1%{?dist}
 Group: Applications/System
 License: GPLv2+ and GPLv3+
 Url: http://www.networkupstools.org/
@@ -144,6 +147,8 @@ find . -mtime -1 -print0 | xargs -0 touch --reference %{SOURCE0}
 
 %build
 autoreconf -i
+# prevent assignment of default value, it would break configure's tests
+export LDFLAGS="-Wl,-z,now"
 %configure \
     --with-all \
     --with-libltdl \
@@ -162,7 +167,7 @@ autoreconf -i
     --with-pkgconfig-dir=%{_libdir}/pkgconfig \
     --disable-static \
     --with-udev-dir=%{_usr}/lib/udev \
-    --libdir=%{_libdir} 
+    --libdir=%{_libdir}
 #    --with-doc # does not work in 2.7.1
 
 sh %{SOURCE4} >>include/config.h
@@ -203,7 +208,7 @@ done
 popd
 
 #fix collision with virtualbox
-mv %{buildroot}/%{_usr}/lib/udev/rules.d/52-nut-usbups.rules %{buildroot}/%{_usr}/lib/udev/rules.d/62-nut-usbups.rules
+#mv %{buildroot}/%{_usr}/lib/udev/rules.d/52-nut-usbups.rules %{buildroot}/%{_usr}/lib/udev/rules.d/62-nut-usbups.rules
 mv %{buildroot}/%{_usr}/lib/udev/rules.d/52-nut-ipmipsu.rules %{buildroot}/%{_usr}/lib/udev/rules.d/62-nut-ipmipsu.rules
 
 # fix encoding
@@ -433,6 +438,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/libnutscan.pc
 
 %changelog
+* Thu Apr 23 2015 Michal Hlavinka <mhlavink at redhat.com> - 2.7.3-1
+- nut updated to 2.7.3
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index e01f451..ee3e16e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3568b42e058cfc385b46d25140dced4  nut-2.7.2.tar.gz
+a1a7f747093663e1f39ab595b63b45e4  nut-2.7.3.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nut.git/commit/?h=f22&id=256649ca408c575a83f8929ff467b966bdbe3607