rpms/pm-utils/devel .cvsignore, 1.23, 1.24 pm-utils-0.99.0-disable.patch, 1.1, 1.2 pm-utils.spec, 1.50, 1.51 sources, 1.28, 1.29 60sysfont.hook, 1.2, NONE 65sound.hook, 1.1, NONE

Tue Mar 6 19:39:53 UTC 2007

Author: pjones

Update of /cvs/dist/rpms/pm-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16643

Modified Files:
	.cvsignore pm-utils-0.99.0-disable.patch pm-utils.spec sources 
Removed Files:
	60sysfont.hook 65sound.hook 
Log Message:
- update to 0.99.1



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24

--- .cvsignore	20 Feb 2007 20:13:25 -0000	1.23
+++ .cvsignore	6 Mar 2007 19:39:51 -0000	1.24
@@ -1,3 +1,3 @@
 radeontool-1.5.tar.gz
-pm-utils-0.99.0.tar.gz
 vbetool_0.7-1.tar.gz
+pm-utils-0.99.1.tar.gz

pm-utils-0.99.0-disable.patch:
 defaults  |    2 ++
 functions |    6 ++++++
 2 files changed, 8 insertions(+)

Index: pm-utils-0.99.0-disable.patch
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils-0.99.0-disable.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pm-utils-0.99.0-disable.patch	20 Feb 2007 20:13:25 -0000	1.1
+++ pm-utils-0.99.0-disable.patch	6 Mar 2007 19:39:51 -0000	1.2
@@ -32,8 +32,8 @@
  	echo -n "platform" > /sys/power/disk
  	echo -n "disk" > /sys/power/state
  }
---- pm-utils-0.99.0/pm/config.disable	2007-02-20 13:35:07.000000000 -0500
-+++ pm-utils-0.99.0/pm/config	2007-02-20 13:35:10.000000000 -0500
+--- pm-utils-0.99.0/pm/defaults.disable	2007-02-20 13:35:07.000000000 -0500
++++ pm-utils-0.99.0/pm/defaults	2007-02-20 13:35:10.000000000 -0500
 @@ -1,3 +1,5 @@
  SUSPEND_MODULES="button"
  


Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- pm-utils.spec	20 Feb 2007 20:13:25 -0000	1.50
+++ pm-utils.spec	6 Mar 2007 19:39:51 -0000	1.51
@@ -1,7 +1,7 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora Core
 License: GPL
-Version: 0.99.0
+Version: 0.99.1
 Release: 1%{?dist}
 Group: System Environment/Base
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
@@ -14,8 +14,6 @@
 Source4: pm-suspend.app
 Source5: pm-hibernate.app
 Source6: pm-powersave.app
-Source7: 60sysfont.hook
-Source8: 65sound.hook
 %define vbever 0.7
 Source10: http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{vbever}-1.tar.gz
 Source20: radeontool-1.5.tar.gz
@@ -109,34 +107,32 @@
 	ln -sf consolehelper $x
 done
 popd
-chmod -x $RPM_BUILD_ROOT/etc/pm/hooks/49bluetooth
-
-# Symlink the config file to /etc/sysconfig
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
-ln -sf %{_sysconfdir}/pm/config $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/power-management
-
-# Install sysfont hook
-install -m 755 %{SOURCE7} $RPM_BUILD_ROOT/%{_sysconfdir}/pm/hooks/60sysfont
-
-# Install alsa store/restore hook
-install -m 755 %{SOURCE8} $RPM_BUILD_ROOT/%{_sysconfdir}/pm/hooks/65sound
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
 %pre
 if [ -f /etc/sysconfig/pm ]; then
-	mkdir -p /etc/pm
-	cp -a /etc/sysconfig/pm /etc/pm/config
+	mkdir -p /etc/pm/config.d
+	mv /etc/sysconfig/pm /etc/pm/config.d/01oldconfig
+fi
+
+%post
+if [ -f /etc/pm/config.rpmsave ]; then
+	mkdir -p /etc/pm/config.d
+	mv /etc/pm/config.rpmsave /etc/pm/config.d/02oldconfig
 fi
 
 %files
 %defattr(-,root,root)
-%{_sysconfdir}/pm
-%config(noreplace) %{_sysconfdir}/pm/config
-%{_sysconfdir}/sysconfig/power-management
+%{_sysconfdir}/pm/*
 %{_sysconfdir}/security/console.apps/*
 %{_sysconfdir}/pam.d/*
+%{_libdir}/pm-utils/bin/*
+%{_libdir}/pm-utils/defaults
+%{_libdir}/pm-utils/functions
+%{_libdir}/pm-utils/power.d/*
+%{_libdir}/pm-utils/sleep.d/*
 %{_bindir}/*
 %{_sbindir}/*
 %{_mandir}/man*/*


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	20 Feb 2007 20:13:25 -0000	1.28
+++ sources	6 Mar 2007 19:39:51 -0000	1.29
@@ -1,3 +1,3 @@
 8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
 1756f2e71ceaef217220e8e482fce835  vbetool_0.7-1.tar.gz
-5f343ffb6cee216ac7426edcd88524e8  pm-utils-0.99.0.tar.gz
+572ac2950c25faba52729b4f7e2a6cba  pm-utils-0.99.1.tar.gz


--- 60sysfont.hook DELETED ---


--- 65sound.hook DELETED ---


