Author: sls Date: Wed Jul 25 20:27:12 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added bcond cgi
- remove BR: libpng-devel and xorg-lib-libXpm-devel (both required by gd-devel)
- BR: hal-devel and dbus-glib-devel
- remove TODO entry
---- Files affected:
SPECS:
nut.spec (1.129 -> 1.130)
---- Diffs:
================================================================
Index: SPECS/nut.spec
diff -u SPECS/nut.spec:1.129 SPECS/nut.spec:1.130
--- SPECS/nut.spec:1.129 Wed Jul 25 20:46:40 2007
+++ SPECS/nut.spec Wed Jul 25 22:27:07 2007
@@ -3,14 +3,13 @@
# - unpackaged files:
# /usr/html/{{bottom,header,index}.html,nut-banner.png}
# /etc/udev/rules.d/52_nut-usbups.rules
-# - check hal BR
# - upsdrvctl (used by ups.init) doesn't recognize status and reload
commands
#
-#
# Conditional build:
%bcond_without usb # build without usb drivers
%bcond_without hal # build without hal support
%bcond_without snmp # build without snmp driver
+%bcond_without cgi # build without cgi support
#
Summary: Network UPS Tools
Summary(pl.UTF-8): Sieciowe narzędzie do UPS-ów
@@ -31,12 +30,13 @@
URL: http://www.networkupstools.org/
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: gd-devel >= 2.0.15
-BuildRequires: libpng-devel
-BuildRequires: net-snmp-devel
+%{?with_hal:BuildRequires: dbus-glib-devel}
+%{?with_cgi:BuildRequires: gd-devel >= 2.0.15}
+%{?with_hal:BuildRequires: hal-devel}
+%{?with_usb:BuildRequires: libusb-devel}
+%{?with_snmp:BuildRequires: net-snmp-devel}
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: rpmbuild(macros) >= 1.268
-BuildRequires: xorg-lib-libXpm-devel
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-common = %{version}-%{release}
Requires: rc-scripts
@@ -187,7 +187,8 @@
%{?with_usb:--with-usb} \
%{!?with_usb:--without-usb} \
--with-ssl \
- --with-cgi \
+ %{?with_cgi:--with-cgi} \
+ %{!?with_cgi:--without-cgi} \
--with-linux-hiddev=%{_includedir}/linux/hiddev.h \
--with-statepath=%{_var}/lib/ups \
--with-drvpath=/lib/nut \
@@ -402,6 +403,7 @@
%{_mandir}/man8/upsmon.8*
%{_mandir}/man8/upssched.8*
+%if %{with cgi}
%files cgi
%defattr(644,root,root,755)
%attr(755,root,root) /home/services/httpd/cgi-bin/*.cgi
@@ -414,6 +416,7 @@
%{_mandir}/man8/upsimage.cgi.8*
%{_mandir}/man8/upsset.cgi.8*
%{_mandir}/man8/upsstats.cgi.8*
+%endif
%files devel
%defattr(644,root,root,755)
@@ -427,6 +430,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.130 2007/07/25 20:27:07 sls
+- added bcond cgi
+- remove BR: libpng-devel and xorg-lib-libXpm-devel (both required by gd-devel)
+- BR: hal-devel and dbus-glib-devel
+- remove TODO entry
+
Revision 1.129 2007/07/25 18:46:40 sls
- added bconds: usb, hal, snmp
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/nut.spec?r1=1.129&r2=1.130&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
