rpms/acpid/devel .cvsignore, 1.6, 1.7 acpid.power.conf, 1.1, 1.2 acpid.spec, 1.27, 1.28 sources, 1.6, 1.7

[Zdenek Prikryl (zprikryl)]

Author: zprikryl

Update of /cvs/extras/rpms/acpid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13276

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/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Aug 2007 06:47:27 -0000	1.6
+++ .cvsignore	23 Jan 2008 14:04:21 -0000	1.7
@@ -1 +1,2 @@
 acpid-1.0.6.tar.gz
+acpid.power.sh


Index: acpid.power.conf
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/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:04:21 -0000	1.2
@@ -2,4 +2,4 @@
 # no gnome-power-manager is running
 
 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/devel/acpid.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- acpid.spec	23 Nov 2007 13:56:05 -0000	1.27
+++ acpid.spec	23 Jan 2008 14:04:21 -0000	1.28
@@ -1,13 +1,14 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 1.0.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
 Source1: acpid.init
 Source2: acpid.video.conf
 Source3: acpid.power.conf
+Source4: acpid.power.sh
 Patch1: acpid-1.0.6-makefile.patch
 Patch2: acpid-1.0.6-return.patch
 Patch3: acpid-1.0.6-fd.patch
@@ -45,6 +46,7 @@
 chmod 755 $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/video.conf
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/power.conf
+install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/power.sh
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/acpid
@@ -62,6 +64,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
 %{_bindir}/acpi_listen
 %{_sbindir}/acpid
 %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/acpid
@@ -84,6 +87,10 @@
 fi
 
 %changelog
+* Wed Jan 23 2008 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.6-5.fc9
+- Fixed managing of power button (#361501)
+- Fixed power script to check for KDE power manager (#419331)
+
 * Fri Nov 23 2007 Zdenek Prikryl <zprikryl at redhat.com> - 1.0.6-4.fc9
 - Removed old logrotate file
 - Fixed socket leak (#394431)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/acpid/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Aug 2007 06:47:27 -0000	1.6
+++ sources	23 Jan 2008 14:04:21 -0000	1.7
@@ -1 +1,2 @@
 5c9b705700df51d232be223b6ab6414d  acpid-1.0.6.tar.gz
+581b7998a78b140ca58c428338c734ed  acpid.power.sh