- new configuration files

- rel 4
- banner added for notifying configuration change (wouldn't risk with
  conversion of current configuration)

Changed files:
    acpid.spec -> 1.45

diff --git a/acpid.spec b/acpid.spec
index 727731b43ae9786886c08804624f26ab8b413ddd..02297bd622c32719f6925a258cea2d3842a2c40b 100644 (file)
--- a/acpid.spec
+++ b/acpid.spec
@@ -6,7 +6,7 @@ Summary:        ACPI Event Daemon
 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
@@ -14,9 +14,11 @@ Source0:     http://dl.sourceforge.net/acpid/%{name}-%{version}.tar.gz
 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
@@ -34,7 +36,6 @@ acpid to demon przekazuj
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__make}
@@ -46,13 +47,13 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{logrotate.d,rc.d/init.d,sysconfig},/v
 
 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
 
@@ -69,11 +70,11 @@ if [ "$1" = "0" ]; then
        /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)
@@ -85,7 +86,7 @@ fi
 %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*