[nut/el6] update to 2.6.3

[Michal Hlavinka]

commit b0c66fa319c8c083fa501982e2648b9978d67ab2
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Wed Feb 8 15:17:18 2012 +0100

    update to 2.6.3
    
    - users of the megatec and megatec_usb drivers must switch to
      blazer_ser or blazer_usb respectively
    - users of the liebertgxt2 driver are advised that the driver
      name has changed to liebert-esp2

 .gitignore |    1 +
 nut.spec   |   46 +++++++++++++++++++++++++---------------------
 sources    |    2 +-
 3 files changed, 27 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e1c635f..e65c0f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 nut-2.4.3.tar.gz
+/nut-2.6.3.tar.gz
diff --git a/nut.spec b/nut.spec
index 84c0cef..8a99402 100644
--- a/nut.spec
+++ b/nut.spec
@@ -12,8 +12,8 @@
 
 Summary: Network UPS Tools
 Name: nut
-Version: 2.4.3
-Release: 5%{?dist}
+Version: 2.6.3
+Release: 1%{?dist}
 Group: Applications/System
 License: GPLv2+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,10 +25,10 @@ Source2: ups.sysconfig
 Patch0: nut-2.2.1-conf.patch
 
 #rejected upstream
-Patch1: nut-2.2.2-halpath.patch
+#Patch1: nut-2.2.2-halpath.patch
 
 #from upstream, required for nut <= 2.4.3, bz#575334
-Patch2: nut-2.4.3-bz575334.patch
+#Patch2: nut-2.4.3-bz575334.patch
 
 #sent upstream, rhbz#573806
 Patch3: nut-2.4.3-udev.patch
@@ -59,6 +59,7 @@ BuildRequires: pkgconfig
 BuildRequires: python-devel
 BuildRequires: desktop-file-utils
 #BuildRequires: powerman-devel
+#BuildRequires: freeipmi-devel
 
 %ifnarch s390 s390x
 BuildRequires: libusb-devel
@@ -127,9 +128,9 @@ necessary to develop NUT client applications.
 %prep
 %setup -q
 %patch0 -p1 -b .conf
-%patch1 -p1 -b .halpath
-%patch2 -p1 -b .bz575334
-%patch3 -p1 -b .udevpatch
+#%patch1 -p1 -b .halpath
+#%patch2 -p1 -b .bz575334
+#%patch3 -p1 -b .udevpatch
 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
@@ -147,6 +148,11 @@ autoreconf -i
     --with-cgipath=%{cgidir} \
     --with-drvpath=%{modeldir} \
     --with-all \
+    --with-hal \
+    --with-hal-callouts-path=%{_libexecdir} \
+    --without-avahi \
+    --without-freeipmi \
+    --without-ipmi \
     --with-ipv6 \
     --with-linux-hiddev=%{_includedir}/linux/hiddev.h \
     --with-pkgconfig-dir=%{_libdir}/pkgconfig \
@@ -160,15 +166,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
 
-# fix old enconding manpages
-mv man/upscode2.8 man/upscode2.8.iso
-iconv -f ISO8859-1 -t UTF-8 -o man/upscode2.8 man/upscode2.8.iso 
-mv man/bcmxcp.8 man/bcmxcp.8.iso
-iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp.8 man/bcmxcp.8.iso 
-mv man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso
-iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso 
-rm -f man/*.iso
-
 %install
 rm -rf %{buildroot}
 
@@ -186,8 +183,6 @@ make install DESTDIR=%{buildroot}
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ups
 install -m 755 %{SOURCE1} %{buildroot}%{initdir}/ups
 
-install -m 644 man/gamatronic.*  %{buildroot}%{_mandir}/man8/
-
 install -m 644 scripts/hal/ups-nut-device.fdi \
         %{buildroot}%{_datadir}/hal/fdi/information/20thirdparty/20-ups-nut-device.fdi
 
@@ -283,6 +278,7 @@ rm -rf %{buildroot}
 %{_mandir}/man5/upsd.conf.5.gz
 %{_mandir}/man5/upsd.users.5.gz
 %{_mandir}/man8/apcsmart.8.gz
+%{_mandir}/man8/apcsmart-old.8.gz
 %{_mandir}/man8/bcmxcp.8*
 %{_mandir}/man8/bcmxcp_usb.8.gz
 %{_mandir}/man8/belkin.8.gz
@@ -301,15 +297,14 @@ rm -rf %{buildroot}
 %{_mandir}/man8/isbmex.8.gz
 %{_mandir}/man8/ivtscd.8.gz
 %{_mandir}/man8/liebert.8.gz
-%{_mandir}/man8/liebertgxt2.8.gz
+%{_mandir}/man8/liebert-esp2.8.gz
 %{_mandir}/man8/masterguard.8.gz
-%{_mandir}/man8/megatec.8.gz
-%{_mandir}/man8/megatec_usb.8.gz
 %{_mandir}/man8/metasys.8.gz
 %{_mandir}/man8/microdowell.8.gz
 %{_mandir}/man8/mge-utalk.8.gz
 %{_mandir}/man8/mge-shut.8.gz
 %{_mandir}/man8/nutupsdrv.8.gz
+%{_mandir}/man8/nut-scanner.8.gz
 %{_mandir}/man8/oneac.8.gz
 %{_mandir}/man8/optiups.8.gz
 %{_mandir}/man8/powercom.8.gz
@@ -387,10 +382,19 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_includedir}/*
 %{_mandir}/man3/upscli*
+%{_mandir}/man3/nutscan*
 %{_libdir}/libupsclient.so
 %{_libdir}/pkgconfig/libupsclient.pc
+%{_libdir}/pkgconfig/libnutscan.pc
 
 %changelog
+* Wed Feb 08 2012 Michal Hlavinka <mhlavink at redhat.com> - 2.6.3-1
+- update to 2.6.3
+- users of the megatec and megatec_usb drivers must switch to
+  blazer_ser or blazer_usb respectively
+- users of the liebertgxt2 driver are advised that the driver 
+  name has changed to liebert-esp2
+
 * Wed Aug 31 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.4.3-5
 - fix content of libupsclient.pc (#732902)
 
diff --git a/sources b/sources
index ecb75c8..70e09d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f893b61b07915e7a139324fa3f79121  nut-2.4.3.tar.gz
+8db00c21f8bc03add6e14d15f634ec6a  nut-2.6.3.tar.gz