diff --git a/.gitignore b/.gitignore index 0ffbf49..c5fe2d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ acpid-2.0.5.tar.gz /acpid-2.0.7.tar.gz +/acpid-2.0.9.tar.gz +/acpid-2.0.13.tar.gz +/acpid-2.0.14.tar.gz diff --git a/acpid.power.sh b/acpid.power.sh index ebf0770..dfd2a6d 100644 --- a/acpid.power.sh +++ b/acpid.power.sh @@ -22,6 +22,7 @@ ps axo uid,cmd | \ awk ' $1 == '$uid_session' && ($2 ~ /gnome-power-manager/ || $2 ~ /kpowersave/ || + $2 ~ /xfce4-power-manager/ || $2 ~ /\/usr\/libexec\/gnome-settings-daemon/ || $2 ~ /kded4/ || $3 ~ /guidance-power-manager/) \ { found = 1; exit } END { exit !found } diff --git a/acpid.spec b/acpid.spec index 7a1f606..421d51f 100644 --- a/acpid.spec +++ b/acpid.spec @@ -1,7 +1,7 @@ Summary: ACPI Event Daemon Name: acpid -Version: 2.0.7 -Release: 2%{?dist} +Version: 2.0.14 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons Source: http://tedfelix.com/linux/acpid-%{version}.tar.gz @@ -102,8 +102,8 @@ if [ "$1" = "0" ]; then /sbin/service acpid stop >/dev/null 2>&1 /sbin/chkconfig --del acpid - /bin/systemctl disable %{name}.service %{name}.socket > /dev/null 2>&1 || : - /bin/systemctl stop %{name}.service %{name}.socket > /dev/null 2>&1 || : + /bin/systemctl disable %{name}.service > /dev/null 2>&1 || : + /bin/systemctl stop %{name}.service > /dev/null 2>&1 || : fi @@ -115,7 +115,29 @@ if [ "$1" -ge "1" ]; then /bin/systemctl try-restart %{name}.service > /dev/null 2>&1 || : fi +%triggerun -- acpid < 2.0.9 +if /sbin/chkconfig --level 3 acpid ; then + /bin/systemctl enable acpid.service >/dev/null 2>&1 || : +fi + %changelog +* Mon Jan 02 2012 Jiri Skala - 2.0.14-1 +- updated to latest upstream 2.0.14 +- fixes #722325 - xfce4-power-manager does not seem to be supported + +* Wed Nov 16 2011 Jiri Skala - 2.0.13-1 +- update to latest upstream 2.0.13 + +* Fri May 06 2011 Bill Nottingham - 2.0.9-4 +- fix systemd scriptlets to properly handle upgrade + +* Tue May 03 2011 Jiri Skala - 2.0.9-1 +- fixes #701340 - CVE-2011-1159 acpid: blocked writes can lead to acpid daemon hang +- update to latest upstream 2.0.9 + +* Wed Feb 09 2011 Jiri Skala - 2.0.7-3 +- fixes unused varable and coparison of different var types + * Mon Feb 07 2011 Fedora Release Engineering - 2.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index e9810f3..d2da350 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -84832448304e0b19c8cf566fe5b64be0 acpid-2.0.7.tar.gz +14fc1eabc3489f3ded9347fcd55f158a acpid-2.0.14.tar.gz