rpms/pm-utils/devel pm-utils-hd-apm-restore.conf, NONE, 1.1 pm-utils-99hd-apm-restore, 1.3, 1.4 pm-utils.spec, 1.86, 1.87

[Till Maas (till)]

Author: till

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

Modified Files:
	pm-utils-99hd-apm-restore pm-utils.spec 
Added Files:
	pm-utils-hd-apm-restore.conf 
Log Message:
* 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
- add hook suffix for hook script



--- NEW FILE pm-utils-hd-apm-restore.conf ---
# Config file for hd-apm-restore hook

# Devices, where the hd apm value should be restored, separated by space
#HD_APM_DEVICES="sda"

# Use this to overwrite a value for a device in case hdparm reports
# "unknown value" for the apm level. This is ignored when hdparm
# returns an other value.
#HD_APM_LEVEL_sda=192


Index: pm-utils-99hd-apm-restore
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils-99hd-apm-restore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pm-utils-99hd-apm-restore	2 Jan 2008 15:42:14 -0000	1.3
+++ pm-utils-99hd-apm-restore	2 Jan 2008 16:56:36 -0000	1.4
@@ -1,5 +1,16 @@
 #!/bin/bash
 # vim:noexpandtab
+#
+#    Author: Till Maas <opensource till name>
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 


Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- pm-utils.spec	2 Jan 2008 13:32:48 -0000	1.86
+++ pm-utils.spec	2 Jan 2008 16:56:36 -0000	1.87
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 0.99.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 ExclusiveArch: i386 x86_64 ia64 ppc ppc64 %{?arm} sparc sparcv9 sparc64
@@ -14,18 +14,20 @@
 %endif
 Conflicts: bluez-utils < 2.25-6
 Source0: pm-utils-%{version}.tar.gz
-Source1: pm-utils-99hd-apm-restore
-
 Source1: pm-suspend.pam
 Source2: pm-hibernate.pam
 Source3: pm-powersave.pam
 Source4: pm-suspend-hybrid.pam
 
+
 Source11: pm-suspend.app
 Source12: pm-hibernate.app
 Source13: pm-powersave.app
 Source14: pm-suspend-hybrid.app
 
+Source21: pm-utils-99hd-apm-restore
+Source22: pm-utils-hd-apm-restore.conf
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: hal-devel pkgconfig
 BuildRequires: dbus-devel >= 0.90
@@ -83,7 +85,8 @@
 popd
 install -D -m 0600 /dev/null $RPM_BUILD_ROOT%{_localstatedir}/log/pm-suspend.log
 
-install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_exec_prefix}/lib/pm-utils/sleep.d/99hd-apm-restore
+install -D -m 0755 %{SOURCE21} $RPM_BUILD_ROOT%{_exec_prefix}/lib/pm-utils/sleep.d/99hd-apm-restore.hook
+install -D -m 0644 %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/pm/config.d/hd-apm-restore.conf
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -109,6 +112,7 @@
 %files
 %defattr(-,root,root,-)
 %doc README COPYING AUTHORS ChangeLog
+%config(noreplace) %{_sysconfdir}/pm/config.d/hd-apm-restore.conf
 %{_sysconfdir}/pm/
 %{_sysconfdir}/security/console.apps/*
 %{_sysconfdir}/pam.d/*
@@ -128,6 +132,11 @@
 %ghost %verify(not md5 size mtime) %{_localstatedir}/log/pm-suspend.log
 
 %changelog
+* 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
+- add hook suffix for hook script
+
 * Wed Jan 02 2008 Till Maas <opensource till name> - 0.99.4-9
 - restore hd apm level (RH #382061)
 - Add hdparm requires for new hook