SPECS: acpid.spec - new configuration files - rel 4 - banner added...

[havner]

Author: havner                       Date: Sat Jul 22 17:34:46 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- new configuration files
- rel 4
- banner added for notifying configuration change (wouldn't risk with
  conversion of current configuration)

---- Files affected:
SPECS:
   acpid.spec (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: SPECS/acpid.spec
diff -u SPECS/acpid.spec:1.44 SPECS/acpid.spec:1.45
--- SPECS/acpid.spec:1.44	Mon Mar 20 21:39:41 2006
+++ SPECS/acpid.spec	Sat Jul 22 19:34:41 2006
@@ -7,7 +7,7 @@
 Summary(pl):	Demon zdarzeń ACPI
 Name:		acpid
 Version:	1.0.4
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Daemons
 Source0:	http://dl.sourceforge.net/acpid/%{name}-%{version}.tar.gz
@@ -15,9 +15,11 @@
 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
+Source4:	%{name}.button.conf
+Source5:	%{name}.battery.conf
+Source6:	%{name}.button.sh
+Source7:	%{name}.battery.sh
+Patch0:		%{name}-gcc4.patch
 URL:		http://acpid.sourceforge.net/
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
@@ -35,7 +37,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__make}
@@ -47,13 +48,13 @@
 
 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
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/button.conf
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/battery.conf
+install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/button.sh
+install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/battery.sh
 
 > $RPM_BUILD_ROOT/var/log/acpid
 
@@ -70,11 +71,11 @@
 	/sbin/chkconfig --del acpid
 fi
 
-# %%post halt_on_power_button
-# %%service -q acpid reload
-
-# %%postun halt_on_power_button
-# %%service -q acpid reload
+%triggerpostun -- %{name} <= 1.0.4-3
+%banner -e %{name} << EOF
+Default configuration files have changed.
+You might want to review your configuration in /etc/acpid
+EOF
 
 %files
 %defattr(644,root,root,755)
@@ -86,8 +87,8 @@
 %attr(754,root,root) /etc/rc.d/init.d/acpid
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/acpid
 %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/acpi/events/*.conf
+%attr(754,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/acpi/actions/*.sh
 %attr(755,root,root) %{_sbindir}/acpid
-%attr(755,root,root) %{_sbindir}/power.sh
 %attr(640,root,root) %ghost /var/log/acpid
 %{_mandir}/man8/acpid.8*
 
@@ -97,6 +98,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2006/07/22 17:34:41  havner
+- new configuration files
+- rel 4
+- banner added for notifying configuration change (wouldn't risk with
+  conversion of current configuration)
+
 Revision 1.44  2006/03/20 20:39:41  freetz
 - rel.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/acpid.spec?r1=1.44&r2=1.45&f=u