SPECS: nut.spec - removed hidups bcond

sls sls at pld-linux.org
Wed Jul 25 18:03:59 CEST 2007


Author: sls                          Date: Wed Jul 25 16:03:59 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed hidups bcond

---- Files affected:
SPECS:
   nut.spec (1.120 -> 1.121) 

---- Diffs:

================================================================
Index: SPECS/nut.spec
diff -u SPECS/nut.spec:1.120 SPECS/nut.spec:1.121
--- SPECS/nut.spec:1.120	Wed Jul 25 17:59:17 2007
+++ SPECS/nut.spec	Wed Jul 25 18:03:54 2007
@@ -4,9 +4,6 @@
 #	- unpackaged files: /usr/html/{{bottom,header,index}.html,nut-banner.png}
 #	- check hal BR
 #
-# Conditional build:
-%bcond_without	hidups			# experimental hidups driver
-#
 Summary:	Network UPS Tools
 Summary(pl.UTF-8):	Sieciowe narzędzie do UPS-ów
 Name:		nut
@@ -193,7 +190,7 @@
 install -d $RPM_BUILD_ROOT{/sbin,/etc/{sysconfig,rc.d/init.d},/var/lib/ups} \
 	$RPM_BUILD_ROOT{/lib/nut,%{_libdir},%{_includedir}/nut}
 
-%{__make} -j1 install install-snmp install-cgi %{?with_hidups: install-usb} \
+%{__make} -j1 install install-snmp install-cgi \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ups
@@ -353,7 +350,6 @@
 %attr(755,root,root) /lib/nut/upsdrvctl
 %attr(755,root,root) /lib/nut/victronups
 %{_datadir}/nut
-%if %{with hidups}
 %{_mandir}/man8/bcmxcp_usb.8*
 %{_mandir}/man8/energizerups.8*
 %{_mandir}/man8/hidups.8*
@@ -364,7 +360,6 @@
 %attr(755,root,root) /lib/nut/hidups
 %attr(755,root,root) /lib/nut/newhidups
 %attr(755,root,root) /lib/nut/tripplite_usb
-%endif
 
 %files common
 %defattr(644,root,root,755)
@@ -412,6 +407,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121  2007/07/25 16:03:54  sls
+- removed hidups bcond
+
 Revision 1.120  2007/07/25 15:59:17  sls
 - ./configure --with hal --with snmp --with usb --with serial
 - removed obsolete __make build-usb
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nut.spec?r1=1.120&r2=1.121&f=u



More information about the pld-cvs-commit mailing list