From a057fd229be2a0ca3df59800a666f117a7e0f5e325b8cb90b82b8710e02d2657 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 17 Nov 2008 15:37:06 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/acpid?expand=0&rev=18

---
 acpid.changes |  6 ++++++
 acpid.spec    | 13 ++++++++-----
 power_button  |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/acpid.changes b/acpid.changes
index ecd64f4..1231e67 100644
--- a/acpid.changes
+++ b/acpid.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov 16 13:31:51 CET 2008 - hmacht@suse.de
+
+- Don't shutdown if a kde4 session is running and the power button
+  is pressed, powerdevil will care (bnc#443210)
+
 -------------------------------------------------------------------
 Thu Oct 16 14:44:39 CEST 2008 - thoenig@suse.de
 
diff --git a/acpid.spec b/acpid.spec
index f77d595..78b41a4 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -21,7 +21,7 @@
 Name:           acpid
 Url:            http://acpid.sourceforge.net/
 Version:        1.0.6
-Release:        88
+Release:        89
 %define       acpi_version 0.09
 License:        GPL v2 or later
 Group:          System/Daemons
@@ -129,6 +129,9 @@ rm -rf %{buildroot}
 %ghost %config(noreplace,missingok) %_var/log/acpid
 
 %changelog
+* Sun Nov 16 2008 hmacht@suse.de
+- Don't shutdown if a kde4 session is running and the power button
+  is pressed, powerdevil will care (bnc#443210)
 * Thu Oct 16 2008 thoenig@suse.de
 - Fix documentation reference and vendor names in thinkpad_acpi
   (bnc#410684)
@@ -137,7 +140,7 @@ rm -rf %{buildroot}
 * 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
+* Thu Aug 07 2008 hmacht@suse.de
 - add power_button script to care about button presses if there
   is no active X session
 * Sun Jun 08 2008 hmacht@suse.de
@@ -191,7 +194,7 @@ rm -rf %{buildroot}
 - ignore editor backup files for the event configuration.
 - package the provided action script samples under documentation.
 - cleanup the specfile %%prep section.
-* Wed Oct 18 2006 hmacht@suse.de
+* Tue Oct 17 2006 hmacht@suse.de
 - load CPUFreq modules before acpi modules, otherwise we would
   exit without acpi support
 * Tue Sep 12 2006 hmacht@suse.de
@@ -208,7 +211,7 @@ rm -rf %{buildroot}
 * Wed Feb 15 2006 thoenig@suse.de
 - revert hotkey mask for IBM ACPI back to 0xffff (bug #150357)
 - add documentation hints for IBM ACPI driver
-* Fri Feb 10 2006 seife@suse.de
+* Thu Feb 09 2006 seife@suse.de
 - do not try the hotkey modules on ia64 (bug #146291)
 * Mon Feb 06 2006 seife@suse.de
 - do not load ac and battery modules on ia64 (bug #140249)
@@ -255,7 +258,7 @@ rm -rf %{buildroot}
   * toshiba_acpi
 - added $SYSCONFDIR/modprobe.d/ibm_acpi for ibm_acpi to load the
   module with "experimental=1"
-* Sat Aug 06 2005 seife@suse.de
+* Fri Aug 05 2005 seife@suse.de
 - load ACPI modules in /etc/init.d/acpid.
 * Fri Aug 05 2005 trenn@suse.de
 - Activate acpid by default again (use -Y to force, was disabled
diff --git a/power_button b/power_button
index 7f9444c..1bcd56d 100644
--- a/power_button
+++ b/power_button
@@ -47,7 +47,7 @@ while read A; do
 
     if [ "$IS_ACTIVE" = "true" -a -n "$DISP" ]; then
 	# additional check, if none of these two apps are running, go on
-	if [ -n "`pidof kpowersave`" -o -n "`pidof gnome-power-manager`" ]; then
+	if [ -n "`pidof kpowersave`" -o -n "`pidof gnome-power-manager`" -o -n "`pidof kded4`" ]; then
 	    echo doing nothing...
 	    exit 0
 	fi