- release 3

- use own init script insted RH's
- add sysconfig file
- modified post

Changed files:
    acpid.spec -> 1.5

diff --git a/acpid.spec b/acpid.spec
index 24c73a81663d122db305d47d10b7730981e16fde..eb2d335fa8299c998187bec5cdc5f90b38f35278 100644 (file)
--- a/acpid.spec
+++ b/acpid.spec
@@ -2,12 +2,14 @@ Summary:      ACPI Event Daemon
 Summary(pl):   Demon zdarzeñ ACPI
 Name:          acpid
 Version:       1.0.0
-Release:       2
+Release:       3
 License:       GPL
 Group:         Daemons
 Group(de):     Server
 Group(pl):     Serwery
 Source0:       ftp://ftp.sourceforge.net/pub/sourceforge/acpid/%{name}-%{version}.tar.gz
+Source1:       %{name}.init
+Source2:       %{name}.sysconfig
 URL:           http://acpid.sourceforge.net/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -31,10 +33,11 @@ install -d $RPM_BUILD_ROOT/{%{_sbindir},%{_mandir}/man8}
 install acpid $RPM_BUILD_ROOT/%{_sbindir}
 install acpid.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/acpi/{events,actions},/var/log,/etc/rc.d/init.d}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/acpi/{events,actions},/var/log,/etc/{rc.d/init.d,sysconfig}}
 
 install samples/sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events
-install redhat/acpid.init $RPM_BUILD_ROOT/etc/rc.d/init.d/acpid
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/acpid
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/acpid
 
 touch $RPM_BUILD_ROOT/var/log/acpid
 
@@ -43,9 +46,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add acpid
+if [ -f /var/lock/subsys/acpid ]; then
+       /etc/rc.d/init.d/acpid restart >&2
+else
+       echo "Run \"/etc/rc.d/init.d/acpid  start\" to start ACPI daemon."
+fi
 
 %preun
 if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/acpid ]; then
+               /etc/rc.d/init.d/acpid stop>&2
+       fi
        /sbin/chkconfig --del acpid
 fi
 
@@ -55,6 +66,7 @@ fi
 %dir %{_sysconfdir}/acpi/events
 %dir %{_sysconfdir}/acpi/actions
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/acpi/events/sample.conf
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sysconfig/acpid
 %attr(640,root,root) %ghost /var/log/acpid
 %attr(755,root,root) %{_sbindir}/acpid
 %attr(754,root,root) /etc/rc.d/init.d/acpid