rpms/pm-utils/devel pm-utils-0.99.0-disable.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 pm-utils.spec, 1.49, 1.50 sources, 1.27, 1.28 pm-utils-0.19-emacs.patch, 1.2, NONE pm-utils-0.19.1-avahi.patch, 1.2, NONE pm-utils-0.19.1-bluetooth.patch, 1.1, NONE pm-utils-0.19.1-check.patch, 1.1, NONE pm-utils-0.19.1-disable.patch, 1.1, NONE pm-utils-0.19.1-permission.patch, 1.1, NONE vbetool-0.3-libpci.patch, 1.2, NONE

Tue Feb 20 20:13:27 UTC 2007

Author: pjones

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

Modified Files:
	.cvsignore pm-utils.spec sources 
Added Files:
	pm-utils-0.99.0-disable.patch 
Removed Files:
	pm-utils-0.19-emacs.patch pm-utils-0.19.1-avahi.patch 
	pm-utils-0.19.1-bluetooth.patch pm-utils-0.19.1-check.patch 
	pm-utils-0.19.1-disable.patch pm-utils-0.19.1-permission.patch 
	vbetool-0.3-libpci.patch 
Log Message:
- update for newer pm-utils release


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

--- NEW FILE pm-utils-0.99.0-disable.patch ---
--- pm-utils-0.99.0/pm/functions.disable	2007-02-20 13:33:04.000000000 -0500
+++ pm-utils-0.99.0/pm/functions	2007-02-20 13:34:38.000000000 -0500
@@ -12,6 +12,8 @@
 INHIBIT=/var/run/pm-utils.inhibit
 PM_LOGFILE=${PM_LOGFILE:=/var/log/pm-suspend.log}
 SUSPEND_MODULES=""
+DISABLE_HIBERNATE="no"
+DISABLE_SUSPEND="no"
 
 [ -f /etc/pm/config ] && . /etc/pm/config
 
@@ -28,6 +30,8 @@
 add_global PM_CMDLINE
 add_global RESUME_MODULES
 add_global SUSPEND_MODULES
+add_global DISABLE_HIBERNATE
+add_global DISABLE_SUSPEND
 
 source_configs()
 {
@@ -123,11 +127,13 @@
 
 do_suspend()
 {
+	[ ${DISABLE_SUSPEND} == "yes" ] && return 0
 	pm-pmu --suspend || echo -n "mem" > /sys/power/state
 }
 
 do_hibernate()
 {
+	[ ${DISABLE_HIBERNATE} == "yes" ] && return 0
 	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
@@ -1,3 +1,5 @@
 SUSPEND_MODULES="button"
 
 HIBERNATE_RESUME_POST_VIDEO="no"
+DISABLE_HIBERNATE="no"
+DISABLE_SUSPEND="no"


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	8 Aug 2006 17:12:47 -0000	1.22
+++ .cvsignore	20 Feb 2007 20:13:25 -0000	1.23
@@ -1,3 +1,3 @@
-vbetool_0.5-1.tar.gz
 radeontool-1.5.tar.gz
-pm-utils-0.19.1.tar.gz
+pm-utils-0.99.0.tar.gz
+vbetool_0.7-1.tar.gz


Index: pm-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/pm-utils.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- pm-utils.spec	2 Feb 2007 17:52:53 -0000	1.49
+++ pm-utils.spec	20 Feb 2007 20:13:25 -0000	1.50
@@ -1,8 +1,8 @@
 Name: pm-utils
 Summary: Power management utilities and scripts for Fedora Core
 License: GPL
-Version: 0.19.1
-Release: 6%{?dist}
+Version: 0.99.0
+Release: 1%{?dist}
 Group: System Environment/Base
 ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64
 Requires: usermode kbd pciutils >= 2.2.1
@@ -16,7 +16,8 @@
 Source6: pm-powersave.app
 Source7: 60sysfont.hook
 Source8: 65sound.hook
-Source10: http://ftp.debian.org/debian/pool/main/v/vbetool/vbetool_0.5-1.tar.gz
+%define vbever 0.7
+Source10: http://www.srcf.ucam.org/~mjg59/vbetool/vbetool_%{vbever}-1.tar.gz
 Source20: radeontool-1.5.tar.gz
 %ifarch i386 x86_64
 Obsoletes: vbetool
@@ -28,15 +29,14 @@
 BuildRequires: hal-devel pkgconfig pciutils-devel
 BuildRequires: dbus-devel >= 0.90
 
-Patch1: vbetool-0.3-fix-gcc4bug.patch
-Patch2: vbetool-0.3-libpci.patch
-Patch3: pm-utils-0.19-vidhooks.patch
-Patch4: pm-utils-0.19-emacs.patch
-Patch5: pm-utils-0.19.1-permission.patch
-Patch6: pm-utils-0.19.1-disable.patch
-Patch7: pm-utils-0.19.1-bluetooth.patch
-Patch8: pm-utils-0.19.1-check.patch
-Patch9: pm-utils-0.19.1-avahi.patch
+Patch0: pm-utils-0.99.0-disable.patch
+#Patch1: pm-utils-0.19-vidhooks.patch
+
+Patch10: vbetool-0.3-fix-gcc4bug.patch
+
+Patch20: radeontool-1.5.diff
+Patch21: radeontool-fix-option-handling.diff
+Patch22: radeontool-get-rid-of-lspci.diff
 
 %description
 The pm-utils package contains utilities and scripts for Fedora Core
@@ -44,18 +44,20 @@
 
 %prep
 %setup -q -a 10 -a 20
-%patch1 -p0 -b .gcc4
-%patch2 -p0 -b .libpci
-%patch3 -p1 -b .vidhooks
-%patch4 -p1 -b .emacs
-%patch5 -p1 -b .permission
-%patch6 -p1 -b .disable
-%patch7 -p1 -b .bluetooth
-%patch8 -p1 -b .check
-%patch9 -p1 -b .avahi
+
+%patch0 -p1 -b .disable
+#%patch1 -p1 -b .vidhooks
+
+%patch10 -p0 -b .gcc4
+
+cd radeontool-1.5
+%patch20 -p0 -b .volatile
+%patch21 -p0 -b .options
+%patch22 -p0 -b .no-lspci
+cd ..
 
 %build
-cd vbetool-0.4
+cd vbetool-%{vbever}
 %ifarch i386
 %configure
 make
@@ -69,7 +71,7 @@
 
 %ifarch i386 x86_64
 cd radeontool-1.5
-%{__cc} $RPM_OPT_FLAGS -o radeontool radeontool.c
+%{__cc} $RPM_OPT_FLAGS -o radeontool radeontool.c -lpci
 cd ..
 %endif
 
@@ -79,7 +81,7 @@
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %ifarch i386 x86_64
-cd vbetool-0.4
+cd vbetool-%{vbever}
 make DESTDIR=$RPM_BUILD_ROOT install
 cd ..
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pm-utils/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	8 Aug 2006 17:12:47 -0000	1.27
+++ sources	20 Feb 2007 20:13:25 -0000	1.28
@@ -1,3 +1,3 @@
 8065eebe5a2b163e43b40461bfe49a56  radeontool-1.5.tar.gz
-950a87f99d17bc4f4ced73cec7103859  vbetool_0.5-1.tar.gz
-843c93269c70684269e515b60e8f9b1d  pm-utils-0.19.1.tar.gz
+1756f2e71ceaef217220e8e482fce835  vbetool_0.7-1.tar.gz
+5f343ffb6cee216ac7426edcd88524e8  pm-utils-0.99.0.tar.gz


--- pm-utils-0.19-emacs.patch DELETED ---


--- pm-utils-0.19.1-avahi.patch DELETED ---


--- pm-utils-0.19.1-bluetooth.patch DELETED ---


--- pm-utils-0.19.1-check.patch DELETED ---


--- pm-utils-0.19.1-disable.patch DELETED ---


--- pm-utils-0.19.1-permission.patch DELETED ---


--- vbetool-0.3-libpci.patch DELETED ---


