X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=apcupsd.spec;h=3255ea690d1898153cc46bdde46711b8b41f41aa;hb=8279fda153cfa1c171c92abbd7cb5c6dc55da252;hp=1d93995f3824f6f9b533a35ff80e565b8b75d37c;hpb=79f87cb526a43bf9f208d602fc006fbba105795c;p=packages%2Fapcupsd.git

diff --git a/apcupsd.spec b/apcupsd.spec
index 1d93995..3255ea6 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -5,18 +5,18 @@
 Summary:	Power management software for APC UPS hardware
 Summary(pl):	Oprogramowanie do zarz±dzania energi± dla UPS-ów APC
 Name:		apcupsd
-Version:	3.10.12
-Release:	0.9
+Version:	3.10.15
+Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz
-# Source0-md5:	4c35774d587c54276cf03926768ad551
+# Source0-md5:	21b2b744ebcaa0010367a403a9c5e66c
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
-Source10:	%{name}-rc.d-halt
 Patch0:		%{name}-configure.patch
 URL:		http://www.apcupsd.com/
 BuildRequires:	autoconf
+BuildRequires:	automake
 Requires(post,preun):	/sbin/chkconfig
 Requires(post):	fileutils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -39,21 +39,22 @@ zasilania.
 
 %prep
 %setup -q
-%patch0 -p1	
+%patch0 -p1
 
 %build
 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-log-dir=%{_var}/log \
+	--with-stat-dir=%{_var}/lib/apcupsd \
 %if %{with usb}
-    --enable-usb \
-    --with-serial-dev=/dev/usb/hiddev[0-15] \
-    --with-upstype=usb \
-    --with-upscable=usb
+	--enable-usb \
+	--with-serial-dev=/dev/usb/hiddev[0-15] \
+	--with-upstype=usb \
+	--with-upscable=usb
 %endif
 
 %{__make}
@@ -65,49 +66,43 @@ install -d $RPM_BUILD_ROOT/etc/{apcupsd,logrotate.d,rc.d/init.d} \
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/halt-apcupsd
+
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/apcupsd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/apcupsd
 
 touch $RPM_BUILD_ROOT/var/log/apcupsd.events
 touch $RPM_BUILD_ROOT/var/lib/apcupsd/apcupsd.status
 
+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
-if [ "$1" = "1" ]; then
-    /sbin/chkconfig --add apcupsd
-    if [ -e /etc/rc.d/init.d/halt ]; then
-	mv -f /etc/rc.d/init.d/halt /etc/rc.d/init.d/halt.rpmorig
-    fi
-    ln -s /etc/rc.d/init.d/halt-apcupsd /etc/rc.d/init.d/halt
-fi
-
+/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."
+	echo "Run \"/etc/rc.d/init.d/apcupsd start\" to start apcupsd daemon."
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-    if [ -f /var/lock/subsys/apcupsd ]; then
-	/etc/rc.d/init.d/apcupsd stop >&2
-    fi
-    rm -f /etc/rc.d/init.d/halt
-    if [ -e /etc/rc.d/init.d/halt.rpmorig ]; then
-	mv -f /etc/rc.d/init.d/halt /etc/rc.d/init.d/halt.rpmorig
-    fi
-    /sbin/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 ChangeLog Developers doc/{README.apcaccess,developers_manual,home-page,logo}
+%doc ChangeLog Developers doc/{README.apcaccess,README.solaris}
 %{_mandir}/man8/apcupsd.*
 %attr(755,root,root) %{_sbindir}/*
-%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apcupsd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/apcupsd.conf
 %attr(754,root,root) %{_sysconfdir}/apccontrol
 %attr(754,root,root) %{_sysconfdir}/changeme
 %attr(754,root,root) %{_sysconfdir}/commfailure
@@ -117,8 +112,9 @@ fi
 %attr(754,root,root) %{_sysconfdir}/mastertimeout
 %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-apcupsd
+%attr(754,root,root) /etc/rc.d/init.d/halt
 %attr(640,root,root) /etc/logrotate.d/apcupsd
+%dir /etc/apcupsd
 %dir /var/lib/apcupsd
 %attr(640,root,root) %ghost /var/log/apcupsd.events
 %attr(640,root,root) %ghost /var/lib/apcupsd/apcupsd.status