rpms/acpid/F-7 .cvsignore, 1.5, 1.6 acpid.power.conf, 1.1, 1.2 acpid.spec, 1.20, 1.21 sources, 1.5, 1.6
Zdenek Prikryl (zprikryl)
fedora-extras-commits at redhat.com
Wed Jan 23 14:32:47 UTC 2008
Author: zprikryl
Update of /cvs/extras/rpms/acpid/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14976
Modified Files:
.cvsignore acpid.power.conf acpid.spec sources
Log Message:
Fixed managing of power button (#361501)
Fixed power script to check for KDE power manager (#419331)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/acpid/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 16 Mar 2005 22:38:33 -0000 1.5
+++ .cvsignore 23 Jan 2008 14:32:13 -0000 1.6
@@ -1 +1,2 @@
acpid-1.0.4.tar.gz
+acpid.power.sh
Index: acpid.power.conf
===================================================================
RCS file: /cvs/extras/rpms/acpid/F-7/acpid.power.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- acpid.power.conf 24 Aug 2006 14:16:09 -0000 1.1
+++ acpid.power.conf 23 Jan 2008 14:32:13 -0000 1.2
@@ -1,5 +1,4 @@
-# ACPID config to power down machine if powerbutton is pressed, but only if
-# no gnome-power-manager is running
+# ACPID config to manage power button
event=button/power.*
-action=/bin/ps awwux | /bin/grep gnome-power-manager | /bin/grep -qv grep || /sbin/shutdown -h now
+action=/etc/acpi/actions/power.sh
Index: acpid.spec
===================================================================
RCS file: /cvs/extras/rpms/acpid/F-7/acpid.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- acpid.spec 26 Sep 2007 14:13:22 -0000 1.20
+++ acpid.spec 23 Jan 2008 14:32:13 -0000 1.21
@@ -1,7 +1,7 @@
Summary: ACPI Event Daemon
Name: acpid
Version: 1.0.4
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPL
Group: System Environment/Daemons
Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
@@ -9,6 +9,7 @@
Source2: acpid.init
Source3: acpid.video.conf
Source4: acpid.power.conf
+Source5: acpid.power.sh
Patch1: acpid-1.0.3-makefile.patch
Patch2: acpid-1.0.4-warning.patch
Patch3: acpid-1.0.4-pie.patch
@@ -46,6 +47,7 @@
chmod 755 $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/video.conf
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/power.conf
+install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/power.sh
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/acpid
@@ -66,6 +68,7 @@
%dir %{_sysconfdir}/acpi/actions
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/video.conf
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/power.conf
+%config(noreplace) %attr(0755,root,root) %{_sysconfdir}/acpi/actions/power.sh
%config(noreplace) %{_sysconfdir}/logrotate.d/acpid
%{_bindir}/acpi_listen
%{_sbindir}/acpid
@@ -89,6 +92,10 @@
fi
%changelog
+* Wed Jan 23 2008 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.4-9.fc7
+- Fixed managing of power button (#361501)
+- Fixed power script to check for KDE power manager (#419331)
+
* Wed Sep 26 2007 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.4-8.fc7
- Fixed leak of a file descriptor (#304761)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/acpid/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 16 Mar 2005 22:38:33 -0000 1.5
+++ sources 23 Jan 2008 14:32:13 -0000 1.6
@@ -1 +1,2 @@
3aff94e92186e99ed5fd6dcee2db7c74 acpid-1.0.4.tar.gz
+581b7998a78b140ca58c428338c734ed acpid.power.sh
More information about the fedora-extras-commits
mailing list