Author: ajax
Update of /cvs/pkgs/rpms/rhpxl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21527
Modified Files:
rhpxl.spec
Added Files:
rhpxl-0.49-pseries-hatred.patch
Log Message:
* Fri Nov 30 2007 Adam Jackson <ajax(a)redhat.com> 0.49-2
- rhpxl-0.49-pseries-hatred.patch: Use the same pseries detection everywhere.
rhpxl-0.49-pseries-hatred.patch:
--- NEW FILE rhpxl-0.49-pseries-hatred.patch ---
diff -up rhpxl-0.49/rhpxl/videocard.py.jx rhpxl-0.49/rhpxl/videocard.py
--- rhpxl-0.49/rhpxl/videocard.py.jx 2007-09-06 16:41:42.000000000 -0400
+++ rhpxl-0.49/rhpxl/videocard.py 2007-11-30 15:05:50.000000000 -0500
@@ -146,8 +146,8 @@ class VideoCardInfo:
if forceDriver:
vc.setDriver(forceDriver)
self.videocards.append(vc)
- elif os.uname()[4].count("ppc") > 0 and card.pcidom > 0:
- # ppc X server is 32-bit. pseries maps domains > 0 above
+ elif rhpl.arch.getCanonArch() == "ppc64pseries":
+ # ppc X server is 32-bit. pseries maps VRAM BARs above
# the 4G boundary. X bus addresses are host pointers,
# therefore native drivers won't work. fbdev instead.
vc.setDriver('fbdev')
Index: rhpxl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhpxl/devel/rhpxl.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- rhpxl.spec 6 Sep 2007 21:00:08 -0000 1.61
+++ rhpxl.spec 30 Nov 2007 20:06:52 -0000 1.62
@@ -4,7 +4,7 @@
Name: rhpxl
URL:
http://fedoraproject.org/wiki/rhpxl
Version: 0.49
-Release: 1%{?dist}
+Release: 2%{?dist}
Source0:
http://ajax.fedoraproject.org/%{name}/%{name}-%{version}.tar.gz
License: GPLv2
Group: System Environment/Libraries
@@ -14,12 +14,15 @@
Requires: python, rhpl, kudzu >= 1.2.75, newt, hwdata >= 0.169
Requires: pyxf86config >= 0.3.31, xorg-x11-server-Xorg >= 1.0.1-6
+Patch0: rhpxl-0.49-pseries-hatred.patch
+
%description
The rhpxl (pronounced 'rapunzel') package contains a Python library for
configuring and running X.
%prep
%setup -q
+%patch0 -p1 -b .pseries
%build
make %{?_smp_mflags}
@@ -41,6 +44,9 @@
%{_sbindir}/ddcprobe
%changelog
+* Fri Nov 30 2007 Adam Jackson <ajax(a)redhat.com> 0.49-2
+- rhpxl-0.49-pseries-hatred.patch: Use the same pseries detection everywhere.
+
* Thu Sep 06 2007 Adam Jackson <ajax(a)redhat.com> 0.49-1
- rhpxl 0.49. Fixes domainful PPC machines, and avoids probing for serial
mice since they make USB devices go boom.