- added net support

[packages/apcupsd.git] / apcupsd.spec

diff --git a/apcupsd.spec b/apcupsd.spec
index 47c63688e0a0645e7562caf0d1922385a2cdb92c..2e0d0f4b7eadec7691e5810136ce1d7e1b60ffc1 100644 (file)
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -2,17 +2,17 @@
 # Conditional build:
 %bcond_without test    # without TEST support
 %bcond_with    usb     # with USB support
+%bcond_with    net     # with network 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.16
-Release:       1
+Version:       3.10.18
+Release:       2
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz
-# Source0-md5: 07de8f7d7488b6ef91f128f51713f4ea
-# Source0-size:        3858266
+# Source0-md5: 64104a1fface0253e77318ca84948bac
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -20,8 +20,8 @@ Patch0:               %{name}-configure.patch
 URL:           http://www.apcupsd.com/
 BuildRequires: autoconf
 BuildRequires: automake
-Requires(post,preun):  /sbin/chkconfig
 Requires(post):        fileutils
+Requires(post,preun):  /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/apcupsd
@@ -53,9 +53,8 @@ cd ..
 %configure \
        --with-log-dir=%{_var}/log \
        --with-stat-dir=%{_var}/lib/apcupsd \
-%if %{with test}
-       --enable-test \
-%endif
+       %{?with_test:--enable-test} \
+       %{?with_net:--enable-net} \
 %if %{with usb}
        --enable-usb \
        --with-serial-dev=/dev/usb/hiddev[0-15] \
@@ -109,8 +108,8 @@ fi
 %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 +120,8 @@ 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