rpms/pm-utils/F-11 pm-utils-1.2.5-fix-kms.patch, NONE, 1.1 pm-utils.spec, 1.116, 1.117

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/pm-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11808

Modified Files:
	pm-utils.spec 
Added Files:
	pm-utils-1.2.5-fix-kms.patch 
Log Message:
* Fri Apr 24 2009 Richard Hughes <rhughes at redhat.com> - 1.2.5-2
- Backport a patch from upstream to fix resume using KMS on 855GM.
- Fixes #496026


pm-utils-1.2.5-fix-kms.patch:

--- NEW FILE pm-utils-1.2.5-fix-kms.patch ---
>From e5cdb5bb6a573a36b0c872c889c8b8f25009cc45 Mon Sep 17 00:00:00 2001
From: Michael Biebl <mbiebl at gmail.com>
Date: Thu, 16 Apr 2009 22:23:46 +0000
Subject: Fix typo in have_kms()

The function is correctly called add_parameters.
Debian bug http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524243
---
diff --git a/pm/sleep.d/98smart-kernel-video b/pm/sleep.d/98smart-kernel-video
index 6ec301b..911896c 100755
--- a/pm/sleep.d/98smart-kernel-video
+++ b/pm/sleep.d/98smart-kernel-video
@@ -34,7 +34,7 @@ have_kms()
     # attempt to run any quirks
     [ -d /sys/class/drm/card0/device/graphics/fb0 ] || return 1
     remove_all_video_quirks
-    add_parameter --quirk-no-chvt
+    add_parameters --quirk-no-chvt
 }
 
 have_nvidia()
--
cgit v0.8.2


Index: pm-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pm-utils/F-11/pm-utils.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- pm-utils.spec	14 Apr 2009 09:41:45 -0000	1.116
+++ pm-utils.spec	24 Apr 2009 09:47:36 -0000	1.117
@@ -2,7 +2,7 @@
 Summary: Power management utilities and scripts for Fedora
 License: GPLv2
 Version: 1.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 URL: http://pm-utils.freedesktop.org
 # for chvt
@@ -25,6 +25,9 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# Already upstream: e5cdb5bb6a573a36b0c872c889c8b8f25009cc45
+Patch0:    pm-utils-1.2.5-fix-kms.patch
+
 
 %description
 The pm-utils package contains utilities and scripts useful for tasks related
@@ -43,6 +46,7 @@
 
 %prep
 %setup -q 
+%patch0 -p1 -b .fix-kms
 
 %build
 %configure
@@ -104,6 +108,10 @@
 
 
 %changelog
+* Fri Apr 24 2009 Richard Hughes <rhughes at redhat.com> - 1.2.5-2
+- Backport a patch from upstream to fix resume using KMS on 855GM.
+- Fixes #496026
+
 * Tue Apr 14 2009 Richard Hughes <rhughes at redhat.com> - 1.2.5-1
 - New upstream version
 - If running on a system that is using KMS, we will refuse to handle any video