rpms/pm-utils/devel pm-utils-0.99.4-hibernate_mode.patch, NONE, 1.1 pm-utils.spec, 1.87, 1.88

Tue Jan 8 22:10:01 UTC 2008

Author: till

Update of /cvs/pkgs/rpms/pm-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25095

Modified Files:
	pm-utils.spec 
Added Files:
	pm-utils-0.99.4-hibernate_mode.patch 
Log Message:
* Tue Jan 08 2008 Till Maas <opensource till name> - 0.99.4-12
- remove ExclusiveArch, because it contains all supported archs
  (in case an arch schould be excluded, please use ExcludeArch)
- improve readability of usermode setup
- remove pm-restart pm-shutdown from usermode setup, because
  there are no such binaries
- list more files in %files explicit to make it obvious when
  there are changes in the distributed package
- add .conf suffix to oldconfig files


pm-utils-0.99.4-hibernate_mode.patch:

--- NEW FILE pm-utils-0.99.4-hibernate_mode.patch ---
This patch makes it possible to use a different hibernate mode, valid modes are
according to Documentation/power/interface.txt
platform shutdown reboot testproc test
Author: Till Maas <opensource till name>
License: same as pm-utils
Red Hat Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=375701

diff -up pm-utils-0.99.4/pm/functions.hibernate_mode pm-utils-0.99.4/pm/functions
--- pm-utils-0.99.4/pm/functions.hibernate_mode	2008-01-08 19:07:17.000000000 +0100
+++ pm-utils-0.99.4/pm/functions	2008-01-08 19:11:33.000000000 +0100
@@ -10,6 +10,7 @@ export PATH=/sbin:/usr/sbin:/bin:/usr/bi
 # RESUME_MODULES
 #
 set -a
+HIBERNATE_MODE="platform"
 HIBERNATE_RESUME_POST_VIDEO=no
 INHIBIT=/var/run/pm-utils.inhibit
 PM_LOGFILE=${PM_LOGFILE:=/var/log/pm-suspend.log}
@@ -132,7 +133,7 @@ do_suspend()
 do_hibernate()
 {
 	[ ${DISABLE_HIBERNATE} == "yes" ] && return 0
-	echo -n "platform" > /sys/power/disk
+	echo -n "${HIBERNATE_MODE}" > /sys/power/disk
 	echo -n "disk" > /sys/power/state
 }
 


Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- pm-utils.spec	2 Jan 2008 16:56:36 -0000	1.87
+++ pm-utils.spec	8 Jan 2008 22:09:22 -0000	1.88
@@ -2,10 +2,9 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 0.99.4
-Release: 10%{?dist}
+Release: 12%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
-ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm} sparc sparcv9 sparc64
 Requires: usermode kbd pciutils >= 2.2.1
 Requires: radeontool
 Requires: hdparm
@@ -40,6 +39,7 @@
 Patch4: pm-utils-correct-filename-in-help.patch
 Patch5: pm-utils-missing-uniq.patch
 Patch6: pm-utils-nullglob.patch
+Patch7: pm-utils-0.99.4-hibernate_mode.patch
 
 
 %description
@@ -56,6 +56,7 @@
 %patch4 -p0 -b .correct-filename-in-help
 %patch5 -p0 -b .missing-uniq
 %patch6 -p0 -b .nullglob
+%patch7 -p1 -b .hibernate_mode
 
 
 %build
@@ -67,22 +68,25 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
-for x in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} ; do
-	y=$(basename ${x%%.pam})
-	install -T -m 644 $x $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/$y
+install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
+for pamsource in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} ; do
+	filename=$(basename ${pamsource} .pam)
+	install -T -p -m 0644 ${pamsource} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/${filename}
 done
-install -m 755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/
-for x in %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} ; do
-	y=$(basename ${x%%.app})
-	install -T -m 644 $x $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/$y
+
+install -m 0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/
+for source in %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} ; do
+	filename=$(basename ${source} .app)
+	install -T -p -m 0644 ${source} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/${filename}
 done
-install -m 755 -d $RPM_BUILD_ROOT/%{_bindir}
+
+install -m 0755 -d $RPM_BUILD_ROOT/%{_bindir}
 pushd $RPM_BUILD_ROOT/%{_bindir}
-for x in pm-hibernate pm-powersave pm-restart pm-shutdown pm-suspend ; do
-	ln -sf consolehelper $x
+for binary in pm-hibernate pm-powersave pm-suspend pm-suspend-hybrid; do
+	ln -sf consolehelper ${binary}
 done
 popd
+
 install -D -m 0600 /dev/null $RPM_BUILD_ROOT%{_localstatedir}/log/pm-suspend.log
 
 install -D -m 0755 %{SOURCE21} $RPM_BUILD_ROOT%{_exec_prefix}/lib/pm-utils/sleep.d/99hd-apm-restore.hook
@@ -95,13 +99,13 @@
 %pre
 if [ -f %{_sysconfdir}/sysconfig/pm ]; then
 	mkdir -p %{_sysconfdir}/pm/config.d
-	mv %{_sysconfdir}/sysconfig/pm %{_sysconfdir}/pm/config.d/01oldconfig
+	mv %{_sysconfdir}/sysconfig/pm %{_sysconfdir}/pm/config.d/01oldconfig.conf
 fi
 
 
 %post
 if [ -f %{_sysconfdir}/pm/config.rpmsave ]; then
-	mv %{_sysconfdir}/pm/config.rpmsave %{_sysconfdir}/pm/config.d/02oldconfig
+	mv %{_sysconfdir}/pm/config.rpmsave %{_sysconfdir}/pm/config.d/02oldconfig.conf
 fi
 if [ -f %{_localstatedir}/log/pm-suspend.log ] ; then
 	chmod 0600 %{_localstatedir}/log/pm-suspend.log
@@ -114,24 +118,49 @@
 %doc README COPYING AUTHORS ChangeLog
 %config(noreplace) %{_sysconfdir}/pm/config.d/hd-apm-restore.conf
 %{_sysconfdir}/pm/
-%{_sysconfdir}/security/console.apps/*
-%{_sysconfdir}/pam.d/*
+%{_sysconfdir}/security/console.apps/pm-hibernate
+%{_sysconfdir}/security/console.apps/pm-powersave
+%{_sysconfdir}/security/console.apps/pm-suspend
+%{_sysconfdir}/security/console.apps/pm-suspend-hybrid
+%{_sysconfdir}/pam.d/pm-hibernate
+%{_sysconfdir}/pam.d/pm-powersave
+%{_sysconfdir}/pam.d/pm-suspend
+%{_sysconfdir}/pam.d/pm-suspend-hybrid
 %dir %{_exec_prefix}/lib/pm-utils/
 %{_exec_prefix}/lib/pm-utils/bin/
 %{_exec_prefix}/lib/pm-utils/defaults
 %{_exec_prefix}/lib/pm-utils/functions
 %{_exec_prefix}/lib/pm-utils/power.d/
 %{_exec_prefix}/lib/pm-utils/sleep.d/
-%{_bindir}/*
+%{_bindir}/on_ac_power
+%{_bindir}/pm-hibernate
+%{_bindir}/pm-is-supported
+%{_bindir}/pm-powersave
+%{_bindir}/pm-suspend
+%{_bindir}/pm-suspend-hybrid
 %{_sbindir}/pm-hibernate
 %{_sbindir}/pm-powersave
 %{_sbindir}/pm-suspend
 %{_sbindir}/pm-suspend-hybrid
+%{_mandir}/man1/on_ac_power.1*
+%{_mandir}/man1/pm-pmu.1*
 
-%{_mandir}/man*/*
 %ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log
 
 %changelog
+* Tue Jan 08 2008 Till Maas <opensource till name> - 0.99.4-12
+- remove ExclusiveArch, because it contains all supported archs
+  (in case an arch schould be excluded, please use ExcludeArch)
+- improve readability of usermode setup
+- remove pm-restart pm-shutdown from usermode setup, because
+  there are no such binaries
+- list more files in %%files explicit to make it obvious when
+  there are changes in the distributed package
+- add .conf suffix to oldconfig files
+
+* Tue Jan 08 2008 Till Maas <opensource till name> - 0.99.4-11
+- make it possible to specify the hibernate mode (RH #375701)
+
 * Wed Jan 02 2008 Till Maas <opensource till name> - 0.99.4-10
 - enhance hd-apm-restore and add a config file
 - fix source-definition for hd-apm-restore


