X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=acpid.spec;h=9d1e5df9598b04041ffbf46e7a4dc786a39583ef;hb=d26689d01c3cd93bd6baa36bd858224e3cd41bd3;hp=9345da24ca6777243a9f52460a0400ffd1f02cca;hpb=7fab09a04304c222241501e5b2d89920065a8c6f;p=packages%2Facpid.git

diff --git a/acpid.spec b/acpid.spec
index 9345da2..9d1e5df 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -1,19 +1,28 @@
+# TODO:
+# - better event handling in power.sh
+# - better default configuration of events in /etc/acpi
+# - processor and fan module support (?)
 Summary:	ACPI Event Daemon
 Summary(pl):	Demon zdarzeñ ACPI
 Name:		acpid
-Version:	1.0.2
-Release:	1
-License:	GPL
+Version:	1.0.4
+Release:	2.1
+License:	GPL v2
 Group:		Daemons
-# Source0-md5:	15884aaf0b82717954f9366b5c00808b
 Source0:	http://dl.sourceforge.net/acpid/%{name}-%{version}.tar.gz
+# Source0-md5:	3aff94e92186e99ed5fd6dcee2db7c74
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.logrotate
+Source4:	%{name}.halt_on_power_button.conf
+Patch0:		%{name}-powersh_fix.patch
+Patch1:		%{name}-gcc4.patch
 URL:		http://acpid.sourceforge.net/
-PreReq:		rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 Obsoletes:	apmd
+Obsoletes:	poweracpid
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -24,6 +33,8 @@ acpid to demon przekazuj
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__make}
@@ -33,13 +44,15 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{logrotate.d,rc.d/init.d,sysconfig},/var/log} \
 	$RPM_BUILD_ROOT{%{_sysconfdir}/acpi/{events,actions},%{_sbindir},%{_mandir}/man8}
 
-install acpid $RPM_BUILD_ROOT/%{_sbindir}
-install acpid.8 $RPM_BUILD_ROOT/%{_mandir}/man8
+install acpid $RPM_BUILD_ROOT%{_sbindir}
+install acpid.8 $RPM_BUILD_ROOT%{_mandir}/man8
 install samples/sample.conf $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/acpid
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/acpid
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/acpid
 install samples/acpi_handler.sh $RPM_BUILD_ROOT%{_sbindir}/power.sh
+# Or create halt_on_power_button subpackage
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events
 
 > $RPM_BUILD_ROOT/var/log/acpid
 
@@ -48,30 +61,30 @@ 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
+%service acpid restart "ACPI daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/acpid ]; then
-		/etc/rc.d/init.d/acpid stop>&2
-	fi
+	%service acpid stop
 	/sbin/chkconfig --del acpid
 fi
 
+# %%post halt_on_power_button
+# %%service -q acpid reload
+
+# %%postun halt_on_power_button
+# %%service -q acpid reload
+
 %files
 %defattr(644,root,root,755)
-%doc Changelog README
+%doc Changelog README TODO
 %dir %{_sysconfdir}/acpi
 %dir %{_sysconfdir}/acpi/events
 %dir %{_sysconfdir}/acpi/actions
-%attr(640,root,root) /etc/logrotate.d/acpid
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/acpid
 %attr(754,root,root) /etc/rc.d/init.d/acpid
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/acpid
-%config(noreplace,missingok) %verify(not size mtime md5) %{_sysconfdir}/acpi/events/sample.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/acpid
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/acpi/events/*.conf
 %attr(755,root,root) %{_sbindir}/acpid
 %attr(755,root,root) %{_sbindir}/power.sh
 %attr(640,root,root) %ghost /var/log/acpid