rpms/rhpxl/devel rhpxl-0.49-ibmasm.patch, NONE, 1.1 rhpxl.spec, 1.65, 1.66

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/rhpxl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17529

Modified Files:
	rhpxl.spec 
Added Files:
	rhpxl-0.49-ibmasm.patch 
Log Message:
* Tue Feb 12 2008 Adam Jackson <ajax at redhat.com> 0.49-4
- rhpxl-0.49-ibmasm.patch: Fix string handling in ibmasm setup. (#353021)


rhpxl-0.49-ibmasm.patch:

--- NEW FILE rhpxl-0.49-ibmasm.patch ---
diff -up rhpxl-0.49/rhpxl/xhwstate.py.string rhpxl-0.49/rhpxl/xhwstate.py
--- rhpxl-0.49/rhpxl/xhwstate.py.string	2007-09-06 16:41:42.000000000 -0400
+++ rhpxl-0.49/rhpxl/xhwstate.py	2008-02-12 16:18:41.000000000 -0500
@@ -740,8 +740,8 @@ class XF86HardwareState:
             ibmasm_conf.driver = "ibmasm"
             get_option(ibmasm_conf, "Device").val = ""
             (w, h) = resolution_from_string(self.resolution)
-            get_option(ibmasm_conf, "XScale").val = w
-            get_option(ibmasm_conf, "YScale").val = h
+            get_option(ibmasm_conf, "XScale").val = str(w)
+            get_option(ibmasm_conf, "YScale").val = str(h)
             get_option(ibmasm_conf, "SendCoreEvents").val = "True"
             inputs = xconfig.layout[0].inputs
             ibmasm_ref = xf86config.XF86ConfInputref("ibmasm_remote", "")


Index: rhpxl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- rhpxl.spec	17 Dec 2007 20:09:56 -0000	1.65
+++ rhpxl.spec	12 Feb 2008 21:21:47 -0000	1.66
@@ -4,7 +4,7 @@
 Name: rhpxl
 URL: http://fedoraproject.org/wiki/rhpxl
 Version: 0.49
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: http://ajax.fedoraproject.org/%{name}/%{name}-%{version}.tar.gz
 License: GPLv2
 Group: System Environment/Libraries
@@ -15,6 +15,7 @@
 Requires: pyxf86config >= 0.3.31, xorg-x11-server-Xorg >= 1.0.1-6
 
 Patch0: rhpxl-0.49-pseries-hatred.patch
+Patch1: rhpxl-0.49-ibmasm.patch
 
 %description
 The rhpxl (pronounced 'rapunzel') package contains a Python library for
@@ -23,6 +24,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .pseries
+%patch1 -p1 -b .ibmasm
 
 %build
 make %{?_smp_mflags}
@@ -45,6 +47,9 @@
 %{_sbindir}/ddcprobe
 
 %changelog
+* Tue Feb 12 2008 Adam Jackson <ajax at redhat.com> 0.49-4
+- rhpxl-0.49-ibmasm.patch: Fix string handling in ibmasm setup. (#353021)
+
 * Mon Dec 17 2007 Jeremy Katz <katzj at redhat.com> - 0.49-3
 - Fix traceback in last patch (#421261)