diff --git a/acpid.power.sh b/acpid.power.sh index 5e0da13..d6b4c75 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -7,7 +7,7 @@ session_ids=$(loginctl list-sessions 2>/dev/null | awk '{print $1}') for session in ${session_ids} ; do session_status=$(loginctl session-status ${session}) echo "${session_status}" | grep -e '\(Active: yes\|State: active\)' &> /dev/null && - echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded4\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 + echo "${session_status}" | grep -e '\(gnome-settings-daemon\|cinnamon-settings-daemon\|kded[4-5]\|xfce4-power-manager\|mate-power-manager\)' &> /dev/null && exit 0 done # Get the ID of the first active X11 session: using ConsoleKit @@ -33,7 +33,7 @@ awk ' $2 ~ /mate-power-manager/ || $2 ~ /xfce4-power-manager/ || $2 ~ /\/usr\/libexec\/gnome-settings-daemon/ || $2 ~ /\/usr\/libexec\/cinnamon-settings-daemon/ || - $2 ~ /kded4/ || $3 ~ /guidance-power-manager/) \ + $2 ~ /kded[4-5]/ || $3 ~ /guidance-power-manager/) \ { found = 1; exit } END { exit !found } ' || diff --git a/acpid.spec b/acpid.spec index 2b946a7..bae67f5 100644 --- a/acpid.spec +++ b/acpid.spec @@ -8,7 +8,7 @@ Summary: ACPI Event Daemon Name: acpid Version: 2.0.27 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://downloads.sourceforge.net/acpid2/%{name}-%{version}.tar.xz @@ -135,6 +135,10 @@ fi %changelog +* Wed Jul 20 2016 Jaroslav Škarvada - 2.0.27-2 +- Added exception for kded5 to power.sh + Resolves: rhbz#1319885 + * Wed Mar 16 2016 Jaroslav Škarvada - 2.0.27-1 - New version Resolves: rhbz#1299109