- orphaned, outdated

[packages/apmd.git] / apmd.spec

diff --git a/apmd.spec b/apmd.spec
index 3f1e2b9b5eb38a73d932f06c1752c8f59a977467..52eda438b9612f276300cea28ab8564464f4293c 100644 (file)
--- a/apmd.spec
+++ b/apmd.spec
@@ -30,11 +30,12 @@ Source1:    %{name}.init
 URL:           http://www.worldvisions.ca/~apenwarr/apmd/
 BuildRequires: XFree86-devel
 BuildRequires: libtool
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
-PreReq:                rc-scripts
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      procps
+Requires:      rc-scripts
 Obsoletes:     acpid
 Obsoletes:     poweracpid
 ExclusiveArch: %{ix86} ppc
@@ -250,7 +251,7 @@ sed -i -e 's#\.\./libapm\.a#-L../.libs -lapm#' xbattery/Makefile
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir},%{_sbindir}} \
        $RPM_BUILD_ROOT{%{_mandir}/{man{1,8},fr/man1},/etc/{rc.d/init.d,sysconfig}}
-       
+
 cd .libs
 install apm xapm apmsleep ../on_ac_power ../xbattery/xbattery $RPM_BUILD_ROOT%{_bindir}
 install apmd ../apmd_proxy $RPM_BUILD_ROOT%{_sbindir}
@@ -276,17 +277,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add apmd
-if [ -f /var/lock/subsys/apmd ]; then
-       /etc/rc.d/init.d/apmd restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/apmd start\" to start apmd daemon."
-fi
+%service apmd restart "apmd daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/apmd ]; then
-               /etc/rc.d/init.d/apmd stop 1>&2
-       fi
+       %service apmd stop
        /sbin/chkconfig --del apmd
 fi
 
@@ -301,7 +296,7 @@ fi
 %attr(755,root,root) %{_bindir}/on_ac_power
 %attr(755,root,root) %{_sbindir}/*
 %attr(754,root,root) /etc/rc.d/init.d/apmd
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/apmd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/apmd
 %{_mandir}/man1/apm.1*
 %{_mandir}/man1/apmsleep.1*
 %{_mandir}/man1/on_ac_power.1*