X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapcupsd.git;a=blobdiff_plain;f=apcupsd.spec;h=d8fa78c24a950b3cb8936e6200768936b310ac00;hp=18fb343b26206d628e2347a48dc26adad4307c9a;hb=5d58544c6eaaca605930eda9408d90a8bfa58cc8;hpb=443196525070511cd5916c6177e3ffa01fc13fa5

diff --git a/apcupsd.spec b/apcupsd.spec
index 18fb343..d8fa78c 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -3,17 +3,18 @@
 %bcond_without	test	# without TEST support
 %bcond_without	usb	# without USB support
 %bcond_without	net	# without network support
+%bcond_without	cgi	# with CGI program support
 %bcond_with	snmp	# with SNMP support
 #
 Summary:	Power management software for APC UPS hardware
 Summary(pl):	Oprogramowanie do zarz±dzania energi± dla UPS-ów APC
 Name:		apcupsd
-Version:	3.10.18
-Release:	3
+Version:	3.12.1
+Release:	0.1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz
-# Source0-md5:	64104a1fface0253e77318ca84948bac
+# Source0-md5:	d2e710176430a28d624500e145d9ffe3
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -21,12 +22,14 @@ Patch0:		%{name}-configure.patch
 URL:		http://www.apcupsd.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{?with_snmp:BuildRequires: net-snmp-devel}	
+%{?with_snmp:BuildRequires:	net-snmp-devel}
 Requires(post):	fileutils
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/apcupsd
+%define         _cgidir        /home/services/httpd/cgi-bin
 
 %description
 UPS power management under Linux for APCC Products. It allows your
@@ -42,6 +45,20 @@ komputerowi dzia
 odpowiednio uruchamia kontrolowany shutdown przy d³u¿szej awarii
 zasilania.
 
+%package cgi 
+Summary:        upsstats - Web-based UPS status viewer
+Summary(pl):	upsstats - oparta na WWW przegl±darka stanu UPS-a
+Group:          Applications/Networking
+Requires:       webserver
+
+%description cgi
+upsstats.cgi builds a lightweight web page containing basic UPS status
+information.
+
+%description cgi -l pl
+upsstats.cgi tworzy lekk± stronê WWW zawieraj±c± podstawowe informacje
+o stanie UPS-a.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -50,16 +67,21 @@ zasilania.
 cd autoconf
 cp -f /usr/share/automake/config.sub .
 %{__autoconf}
-cp -f ./configure ..
+cp -f configure ..
 cd ..
+
 %configure \
 	--with-log-dir=%{_var}/log \
 	--with-stat-dir=%{_var}/lib/apcupsd \
+%if %{with cgi}
+	--enable-cgi \
+	--with-cgi-bin=/home/services/httpd/cgi-bin \
+%endif
 	%{?with_test:--enable-test} \
-%if %{?with_net}
+%if %{with net}
 	--enable-net \
 	--enable-master-slave \
-%endif	
+%endif
 	%{?with_snmp:--enable-snmp} \
 	%{?with_usb:--enable-usb}
 
@@ -101,13 +123,12 @@ if [ "$1" = "0" ]; then
 	if [ -f /var/lock/subsys/apcupsd ]; then
 		/etc/rc.d/init.d/apcupsd stop >&2
 	fi
-/sbin/chkconfig --del apcupsd
+	/sbin/chkconfig --del apcupsd
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog Developers doc/{README.apcaccess,README.solaris}
-%{_mandir}/man8/apcupsd.*
+%doc ChangeLog Developers
 %attr(755,root,root) %{_sbindir}/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apcupsd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/apcupsd
@@ -115,10 +136,16 @@ fi
 %attr(754,root,root) %{_sysconfdir}/changeme
 %attr(754,root,root) %{_sysconfdir}/commfailure
 %attr(754,root,root) %{_sysconfdir}/commok
-%attr(754,root,root) %{_sysconfdir}/mainsback
+#%attr(754,root,root) %{_sysconfdir}/mainsback
 %attr(754,root,root) %{_sysconfdir}/masterconnect
 %attr(754,root,root) %{_sysconfdir}/mastertimeout
 %attr(754,root,root) %{_sysconfdir}/onbattery
+%attr(754,root,root) %{_sysconfdir}/offbattery
+%if %{with cgi}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hosts.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/multimon.conf
+%{_sysconfdir}/apcupsd.css
+%endif
 %attr(754,root,root) /etc/rc.d/init.d/apcupsd
 %attr(754,root,root) /etc/rc.d/init.d/halt
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/apcupsd
@@ -126,3 +153,8 @@ fi
 %dir /var/lib/apcupsd
 %attr(640,root,root) %ghost /var/log/apcupsd.events
 %attr(640,root,root) %ghost /var/lib/apcupsd/apcupsd.status
+%{_mandir}/man8/apcupsd.*
+
+%files cgi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_cgidir}/*.cgi