Author: gotar Date: Sat Mar 1 17:57:46 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fixed build on AMD64,
- bconds: added gapcmon, fixed CGI, sorted
---- Files affected:
SPECS:
apcupsd.spec (1.82 -> 1.83)
---- Diffs:
================================================================
Index: SPECS/apcupsd.spec
diff -u SPECS/apcupsd.spec:1.82 SPECS/apcupsd.spec:1.83
--- SPECS/apcupsd.spec:1.82 Sat Mar 1 18:38:22 2008
+++ SPECS/apcupsd.spec Sat Mar 1 18:57:41 2008
@@ -1,11 +1,12 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_without test # without TEST support
-%bcond_without usb # without USB support
+%bcond_without cgi # without CGI program support
+%bcond_without gapcmon # without gapcmon GUI
%bcond_without net # without network support
-%bcond_without cgi # with CGI program support
%bcond_with snmp # with SNMP support
+%bcond_without test # without TEST support
+%bcond_without usb # without USB support
#
Summary: Power management software for APC UPS hardware
Summary(pl.UTF-8): Oprogramowanie do zarządzania energią dla UPS-ów APC
@@ -22,9 +23,9 @@
Patch0: %{name}-configure.patch
URL: http://www.apcupsd.com/
BuildRequires: autoconf
-BuildRequires: gconfmm-devel
+%{?with_gapcmon: BuildRequires: gconfmm-devel}
BuildRequires: ncurses-ext-devel
-%{?with_snmp:BuildRequires: net-snmp-devel}
+%{?with_snmp: BuildRequires: net-snmp-devel}
BuildRequires: rpmbuild(macros) >= 1.268
Requires(post): fileutils
Requires(post,preun): /sbin/chkconfig
@@ -81,6 +82,7 @@
%setup -q
%patch0 -p1
for i in configure.in aclocal.m4 config.h.in; do install autoconf/$i .;done
+cp -f %{_datadir}/automake/config.sub autoconf
%build
%{__autoconf}
@@ -97,7 +99,7 @@
%endif
--enable-nls \
--enable-powerflute \
- --enable-gapcmon \
+ %{?with_gapcmon:--enable-gapcmon} \
%{?with_snmp:--enable-snmp} \
%{?with_usb:--enable-usb}
@@ -164,15 +166,19 @@
%attr(640,root,root) %ghost /var/lib/apcupsd/apcupsd.status
%{_mandir}/man8/apcupsd.*
+%if %{with cgi}
%files cgi
%defattr(644,root,root,755)
%attr(755,root,root) %{_cgidir}/*.cgi
+%endif
+%if %{with gapcmon}
%files gapcmon
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/*
%{_desktopdir}/gapcmon.desktop
%{_pixmapsdir}/*
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -180,6 +186,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.83 2008-03-01 17:57:41 gotar
+- fixed build on AMD64,
+- bconds: added gapcmon, fixed CGI, sorted
+
Revision 1.82 2008-03-01 17:38:22 gotar
- upgraded to 3.14.3; master-slave mode has been removed,
- added gapcmon subpackage, enabled powerflute and NLS
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apcupsd.spec?r1=1.82&r2=1.83&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
