X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapcupsd.git;a=blobdiff_plain;f=apcupsd.spec;h=2e0d0f4b7eadec7691e5810136ce1d7e1b60ffc1;hp=b8535cde323fc4cbc76c0a4808c547452ef7cab9;hb=e72d247d181845bbbde7fd1c0e5a9ec91a6f386d;hpb=1eccb2a32d3fefc6ce266130314f988e1adc70fd

diff --git a/apcupsd.spec b/apcupsd.spec
index b8535cd..2e0d0f4 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -1,19 +1,28 @@
+#
+# 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.8.1
-Release:	3
+Version:	3.10.18
+Release:	2
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://www.sibbald.com/apcupsd/download/%{name}-%{version}.tar.gz
-Patch0:		%{name}-paths.patch
-Patch1:		%{name}-pld.patch
-#Patch1:	apcups-makefile.patch
-#Patch2:	%{name}-Makefile-fix.patch
-URL:		http://www.sibbald.com/apcupsd/
-Prereq:		chkconfig
+Source0:	http://dl.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz
+# Source0-md5:	64104a1fface0253e77318ca84948bac
+Source1:	%{name}.init
+Source2:	%{name}.logrotate
+Source3:	%{name}.sysconfig
+Patch0:		%{name}-configure.patch
+URL:		http://www.apcupsd.com/
+BuildRequires:	autoconf
+BuildRequires:	automake
+Requires(post):	fileutils
+Requires(post,preun):	/sbin/chkconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-#Icon:		apcupsd-logo.xpm
 
 %define		_sysconfdir	/etc/apcupsd
 
@@ -34,70 +43,85 @@ zasilania.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-#%patch2 -p0
 
 %build
-%configure2_13
+cd autoconf
+cp -f /usr/share/automake/config.sub .
+%{__autoconf}
+cp -f ./configure ..
+cd ..
+%configure \
+	--with-log-dir=%{_var}/log \
+	--with-stat-dir=%{_var}/lib/apcupsd \
+	%{?with_test:--enable-test} \
+	%{?with_net:--enable-net} \
+%if %{with usb}
+	--enable-usb \
+	--with-serial-dev=/dev/usb/hiddev[0-15] \
+	--with-upstype=usb \
+	--with-upscable=usb
+%endif
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_bindir},%{_mandir}/man8,%{_sysconfdir},/etc/rc.d/init.d,/var/log,/var/lib/apcupsd}
+install -d $RPM_BUILD_ROOT/etc/{apcupsd,logrotate.d,rc.d/init.d,sysconfig} \
+	$RPM_BUILD_ROOT/var/{log,lib/apcupsd}
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/apcupsd
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apcupsd
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/apcupsd
 
-install apcupsd apcnetd $RPM_BUILD_ROOT%{_sbindir}
-install apcaccess $RPM_BUILD_ROOT%{_bindir}
-install etc/* $RPM_BUILD_ROOT%{_sysconfdir}
-install distributions/pld/apccontrol.sh $RPM_BUILD_ROOT%{_sysconfdir}/apccontrol
-install distributions/pld/apcupsd  $RPM_BUILD_ROOT/etc/rc.d/init.d/apcupsd
-install doc/apcupsd.man $RPM_BUILD_ROOT%{_mandir}/man8
-tar czf doc.tar.gz doc
+touch $RPM_BUILD_ROOT/var/log/apcupsd.events
+touch $RPM_BUILD_ROOT/var/lib/apcupsd/apcupsd.status
 
-touch ${RPM_BUILD_ROOT}/var/log/apcupsd.log
-touch ${RPM_BUILD_ROOT}/var/lib/apcupsd/apcupsd.status
-touch ${RPM_BUILD_ROOT}/var/lib/apcupsd/apcupsd.events
+cat > $RPM_BUILD_ROOT/etc/rc.d/init.d/halt << EOF
+#!/bin/sh
+/etc/rc.d/init.d/apcupsd powerdown
+EOF
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add apcupsd
-
-#if !(grep /sbin/powersc /etc/rc.d/init.d/halt > /dev/null); then
-cp -f /etc/rc.d/init.d/halt /etc/rc.d/init.d/halt.rpmorig
-#sed -e '/# Now halt or reboot./i\' \
-#     -e '\
-# See if this is a powerfail situation.\
-
-echo ' 
-if [ -f /etc/apcupsd/powerfail ]; then\
-  echo "APCUPSD to the Rescue!"\
-  echo\
-  /etc/apcupsd/apccontrol killpower \
-  echo\
-  sleep 120\
-  exit 1\
-fi\
-' >  /etc/rc.d/init.d/halt
-#' /etc/rc.d/init.d/halt.rpmorig > /etc/rc.d/init.d/halt
-#fi
+if [ -f /var/lock/subsys/apcupsd ]; then
+	/etc/rc.d/init.d/apcupsd restart >&2
+else
+	echo "Run \"/etc/rc.d/init.d/apcupsd start\" to start apcupsd daemon."
+fi
 
 %preun
 if [ "$1" = "0" ]; then
-	chkconfig --del apcupsd
+	if [ -f /var/lock/subsys/apcupsd ]; then
+		/etc/rc.d/init.d/apcupsd stop >&2
+	fi
+/sbin/chkconfig --del apcupsd
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc.tar.gz 
-%doc ChangeLog 
+%doc ChangeLog Developers doc/{README.apcaccess,README.solaris}
 %{_mandir}/man8/apcupsd.*
 %attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_bindir}/*
-#%attr(755,root,root) %config /sbin/powersc
-%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apcupsd.conf
+%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
+%attr(754,root,root) %{_sysconfdir}/commok
+%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) /etc/rc.d/init.d/apcupsd
-%ghost /var/log/apcupsd.log
-%ghost /var/lib/apcupsd/apcupsd.status
-%ghost /var/lib/apcupsd/apcupsd.events
+%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
+%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