X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapcupsd.git;a=blobdiff_plain;f=apcupsd.spec;h=4497f149a0e8f39c49c00d302cc388c5a9eb8094;hp=d888495998ad65e4e8c120028b074425d32f44fb;hb=3e8f890a3850bce97cdddb87f50b4f0f6205e39c;hpb=f38586032ea1afac7c978a7ad364c4351652a000

diff --git a/apcupsd.spec b/apcupsd.spec
index d888495..4497f14 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -1,18 +1,19 @@
 #
 # Conditional build:
-%bcond_without  test	# without TEST support
-%bcond_with	usb	# with USB support
+%bcond_without	test	# without TEST support
+%bcond_without	usb	# without USB support
+%bcond_without	net	# without network 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.15
-Release:	2
+Version:	3.10.18
+Release:	3
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz
-# Source0-md5:	21b2b744ebcaa0010367a403a9c5e66c
-# Source0-size:	3858266
+# Source0-md5:	64104a1fface0253e77318ca84948bac
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -20,8 +21,10 @@ Patch0:		%{name}-configure.patch
 URL:		http://www.apcupsd.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
-Requires(post,preun):	/sbin/chkconfig
+%{?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
@@ -48,20 +51,18 @@ 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 test}
-	--enable-test \
-%endif
-%if %{with usb}
-	--enable-usb \
-	--with-serial-dev=/dev/usb/hiddev[0-15] \
-	--with-upstype=usb \
-	--with-upscable=usb
+	%{?with_test:--enable-test} \
+%if %{with net}
+	--enable-net \
+	--enable-master-slave \
 %endif
+	%{?with_snmp:--enable-snmp} \
+	%{?with_usb:--enable-usb}
 
 %{__make}
 
@@ -91,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/chkconfig --add apcupsd
 if [ -f /var/lock/subsys/apcupsd ]; then
-        /etc/rc.d/init.d/apcupsd restart >&2
+	/etc/rc.d/init.d/apcupsd restart >&2
 else
 	echo "Run \"/etc/rc.d/init.d/apcupsd start\" to start apcupsd daemon."
 fi
@@ -101,16 +102,15 @@ 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.*
 %attr(755,root,root) %{_sbindir}/*
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/apcupsd.conf
-%attr(640,root,root) %config(noreplace) /etc/sysconfig/apcupsd
+%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
 %attr(754,root,root) %{_sysconfdir}/apccontrol
 %attr(754,root,root) %{_sysconfdir}/changeme
 %attr(754,root,root) %{_sysconfdir}/commfailure
@@ -121,8 +121,9 @@ fi
 %attr(754,root,root) %{_sysconfdir}/onbattery
 %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 size mtime) /etc/logrotate.d/apcupsd
-%dir /etc/apcupsd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/apcupsd
+%dir %{_sysconfdir}
 %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.*