[nut/f15] nut updated to 2.6.3

[Michal Hlavinka]

commit 61b965e694246938032b1865cb60438019b83398
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Fri Jan 13 11:18:28 2012 +0100

    nut updated to 2.6.3

 .gitignore               |    1 +
 nut-2.6.3-fixbuild.patch |   12 ++++++++++++
 nut.spec                 |   26 ++++++++++++--------------
 sources                  |    2 +-
 4 files changed, 26 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2f16145..d66e3bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,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
+/nut-2.6.3.tar.gz
diff --git a/nut-2.6.3-fixbuild.patch b/nut-2.6.3-fixbuild.patch
new file mode 100644
index 0000000..06fac7e
--- /dev/null
+++ b/nut-2.6.3-fixbuild.patch
@@ -0,0 +1,12 @@
+diff -up nut-2.6.3/tools/nut-scanner/Makefile.am.fixbuild nut-2.6.3/tools/nut-scanner/Makefile.am
+--- nut-2.6.3/tools/nut-scanner/Makefile.am.fixbuild	2012-01-13 09:35:04.604373611 +0100
++++ nut-2.6.3/tools/nut-scanner/Makefile.am	2012-01-13 09:35:07.376318534 +0100
+@@ -17,7 +17,7 @@ libnutscan_la_CFLAGS = -I$(top_srcdir)/c
+ 
+ nut_scanner_SOURCES = nut-scanner.c
+ nut_scanner_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include
+-nut_scanner_LDADD = libnutscan.la
++nut_scanner_LDADD = ../../clients/libupsclient.la libnutscan.la
+ 
+ if WITH_SSL
+   libnutscan_la_CFLAGS += $(LIBSSL_CFLAGS)
diff --git a/nut.spec b/nut.spec
index f2190d6..5a2bca2 100644
--- a/nut.spec
+++ b/nut.spec
@@ -13,7 +13,7 @@
 
 Summary: Network UPS Tools
 Name: nut
-Version: 2.6.2
+Version: 2.6.3
 Release: 1%{?dist}
 Group: Applications/System
 License: GPLv2+
@@ -24,6 +24,8 @@ Source1: ups.init
 Source2: ups.sysconfig
 Source3: nut-client.tmpfiles
 
+Patch1: nut-2.6.3-fixbuild.patch
+
 Requires: nut-client => 2.6.0
 Requires(pre): shadow-utils udev
 Requires(post): fileutils chkconfig initscripts
@@ -31,6 +33,7 @@ Requires(postun): fileutils chkconfig initscripts
 
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: avahi-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: elfutils-devel
 BuildRequires: fontconfig-devel
@@ -40,6 +43,7 @@ BuildRequires: hal-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtool
+BuildRequires: libtool-ltdl-devel
 BuildRequires: libX11-devel
 BuildRequires: libXpm-devel
 BuildRequires: neon-devel
@@ -120,6 +124,7 @@ necessary to develop NUT client applications.
 
 %prep
 %setup -q
+%patch1 -p1 -b .fixbuild
 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
@@ -129,6 +134,7 @@ sed -i 's|LIBSSL_LDFLAGS|LIBSSL_LIBS|' lib/libupsclient.pc.in
 autoreconf -i
 %configure \
     --with-all \
+    --with-libltdl \
     --with-hal \
     --with-hal-callouts-path=%{_libexecdir} \
     --with-cgi \
@@ -389,25 +395,17 @@ 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/nutscan*
 %{_mandir}/man3/upscli*
 %{_libdir}/libupsclient.so
 %{_libdir}/libnutscan.so
+%{_libdir}/pkgconfig/libnutscan.pc
 %{_libdir}/pkgconfig/libupsclient.pc
 
 %changelog
+* Fri Jan 13 2012 Michal Hlavinka <mhlavink at redhat.com> - 2.6.3-1
+- nut updated to 2.6.3
+
 * Fri Sep 16 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.6.2-1
 - nut updated to 2.6.2
 
diff --git a/sources b/sources
index 74cedf7..70e09d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f6d0683e51e0fcab06e6a79724685d26  nut-2.6.2.tar.gz
+8db00c21f8bc03add6e14d15f634ec6a  nut-2.6.3.tar.gz