SPECS: nut.spec - rel 2 - finished and enabled neon bcond

[baggins]

Author: baggins                      Date: Wed Jun  4 11:59:30 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2
- finished and enabled neon bcond

---- Files affected:
SPECS:
   nut.spec (1.144 -> 1.145) 

---- Diffs:

================================================================
Index: SPECS/nut.spec
diff -u SPECS/nut.spec:1.144 SPECS/nut.spec:1.145
--- SPECS/nut.spec:1.144	Wed Jun  4 13:47:07 2008
+++ SPECS/nut.spec	Wed Jun  4 13:59:24 2008
@@ -8,13 +8,13 @@
 %bcond_without	hal			# build without hal support
 %bcond_without	snmp			# build without snmp driver
 %bcond_without	cgi			# build without cgi support
-%bcond_with	neonxml			# build with neon based XML/HTTP driver
+%bcond_without	neon			# build with neon based XML/HTTP driver
 #
 Summary:	Network UPS Tools
 Summary(pl.UTF-8):	Sieciowe narzędzie do UPS-ów
 Name:		nut
 Version:	2.2.2
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/System
 Source0:	http://eu1.networkupstools.org/source/2.2/%{name}-%{version}.tar.gz
@@ -37,6 +37,7 @@
 %{?with_hal:BuildRequires:	hal-devel >= 0.5.8}
 BuildRequires:	libtool
 %{?with_usb:BuildRequires:	libusb-devel}
+%{?with_neon:BuildRequires:	neon-devel}
 %{?with_snmp:BuildRequires:	net-snmp-devel}
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -206,7 +207,7 @@
 	--with%{!?with_hal:out}-hal \
 	--with%{!?with_cgi:out}-cgi \
 	--with-dev \
-	--with%{!?with_neonxml:out}-neonxml \
+	--with%{!?with_neon:out}-neonxml \
 	--with-linux-hiddev=%{_includedir}/linux/hiddev.h \
 	--with-ssl \
 	--with-ipv6 \
@@ -335,6 +336,7 @@
 %attr(755,root,root) /lib/nut/metasys
 %attr(755,root,root) /lib/nut/mge-shut
 %attr(755,root,root) /lib/nut/mge-utalk
+%{?with_neon:%attr(755,root,root) /lib/nut/netxml-ups}
 %attr(755,root,root) /lib/nut/newmge-shut
 %attr(755,root,root) /lib/nut/nitram
 %attr(755,root,root) /lib/nut/oneac
@@ -379,6 +381,7 @@
 %{_mandir}/man8/metasys.8*
 %{_mandir}/man8/mge-shut.8*
 %{_mandir}/man8/mge-utalk.8*
+%{?with_neon:%{_mandir}/man8/netxml-ups.8*}
 %{_mandir}/man8/nitram.8*
 %{_mandir}/man8/nutupsdrv.8*
 %{_mandir}/man8/oneac.8*
@@ -459,6 +462,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.145  2008-06-04 11:59:24  baggins
+- rel 2
+- finished and enabled neon bcond
+
 Revision 1.144  2008-06-04 11:47:07  baggins
 - fix building without installed hal (realy require only hal-devel)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nut.spec?r1=1.144&r2=1.145&f=u