OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/acpid?expand=0&rev=16

acpid.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep  1 18:37:13 CEST 2008 - hmacht@suse.de
+
+- different config files for different rules:
+    events.thinkpad and events.power_button
+
 -------------------------------------------------------------------
 Thu Aug  7 23:03:40 CEST 2008 - hmacht@suse.de
 

acpid.spec

@@ -21,7 +21,7 @@
 Name:           acpid
 Url:            http://acpid.sourceforge.net/
 Version:        1.0.6
-Release:        76
+Release:        81
 %define       acpi_version 0.09
 License:        GPL v2 or later
 Group:          System/Daemons
@@ -34,7 +34,8 @@ Source1:        acpi-%{acpi_version}.tar.bz2
 Source2:        rcacpid
 Source3:        README.SuSE
 Source4:        thinkpad_acpi.modprobe
-Source5:        events.default
+Source5:        events.power_button
+Source9:        events.thinkpad
 Source6:        thinkpad_handler
 Source7:        power_button
 Patch1:         acpi_%{acpi_version}.dif
@@ -63,7 +64,7 @@ Authors:
 %patch1
 pushd acpi-%{acpi_version}
 popd
-cp %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} .
+cp %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} %{S:7} %{S:9} .
 
 %build
 make EXTRA_CFLAGS="$RPM_OPT_FLAGS -DUSE_SYSLOG"
@@ -81,7 +82,8 @@ install -Dm 744 thinkpad_handler %{buildroot}/usr/lib/acpid/thinkpad_handler
 install -Dm 744 power_button %{buildroot}/usr/lib/acpid/power_button
 mkdir -p %{buildroot}/usr/sbin
 ln -sf ../../etc/init.d/acpid %{buildroot}/usr/sbin/rcacpid
-install -Dm 644 events.default %{buildroot}/etc/acpi/events/default
+install -Dm 644 events.power_button %{buildroot}/etc/acpi/events/power_button
+install -Dm 644 events.thinkpad %{buildroot}/etc/acpi/events/thinkpad
 pushd acpi-%{acpi_version}
 ln -sf /usr/share/automake*/mkinstalldirs mkinstalldirs
 make prefix=%{buildroot}/usr install
@@ -111,7 +113,8 @@ rm -rf %{buildroot}
 %dir /etc/modprobe.d
 %dir /etc/acpi
 %dir /etc/acpi/events
-/etc/acpi/events/default
+/etc/acpi/events/thinkpad
+/etc/acpi/events/power_button
 /usr/lib/acpid
 /etc/init.d/acpid
 /etc/modprobe.d/thinkpad_acpi
@@ -126,6 +129,9 @@ rm -rf %{buildroot}
 %ghost %config(noreplace,missingok) %_var/log/acpid
 
 %changelog
+* Mon Sep 01 2008 hmacht@suse.de
+- different config files for different rules:
+  events.thinkpad and events.power_button
 * Fri Aug 08 2008 hmacht@suse.de
 - add power_button script to care about button presses if there
   is no active X session

events.default

@@ -1,7 +0,0 @@
-# forward acpi events to the appropriate scripts
-
-event=ibm/.*
-action=/usr/lib/acpid/thinkpad_handler "%e"
-
-event=button/power.*
-action=/usr/lib/acpid/power_button

events.power_button

@@ -0,0 +1,4 @@
+# care about the power button
+
+event=button/power.*
+action=/usr/lib/acpid/power_button

events.thinkpad

@@ -0,0 +1,5 @@
+# forward acpi events to the thinkpad handler (bluetooth etc.)
+
+event=ibm/.*
+action=/usr/lib/acpid/thinkpad_handler "%e"
+