rpms/xorg-x11-server/devel xorg-x11-server.spec,1.229,1.230

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8135

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Mon Jun 04 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-7
- xserver-1.3.0-randrama-no-zero-screens.patch: For RANDR 1.2's fake
  Xinerama info, don't report Xinerama as being active if there are no
  RANDR 1.2 CRTCs active for that screen.  (#234567)
- xserver-1.3.0-arm-iopl.patch: Add __arm__ conditionals to many #ifdefs.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- xorg-x11-server.spec	26 May 2007 18:16:46 -0000	1.229
+++ xorg-x11-server.spec	4 Jun 2007 15:58:39 -0000	1.230
@@ -9,7 +9,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.3.0.0
-Release:   6%{?dist}
+Release:   6%{?dist}.jx
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -60,7 +60,9 @@
 Patch2004:  xserver-1.2.0-honor-displaysize.patch
 Patch2005:  xserver-1.2.99.901-xephyr-crash-at-exit.patch
 Patch2006:  xserver-1.3.0-less-randr-fakerama.patch
-Patch2007: xserver-1.3.0-randr12-config-hack.patch
+Patch2007:  xserver-1.3.0-randr12-config-hack.patch
+Patch2008:  xserver-1.3.0-randrama-no-zero-screens.patch
+Patch2009:  xserver-1.3.0-arm-iopl.patch
 
 # assorted PCI layer shenanigans.  oh the pain.
 Patch2500:  xorg-x11-server-1.2.99-unbreak-domain.patch
@@ -306,6 +308,8 @@
 %patch2005 -p1 -b .xephyr-crash
 %patch2006 -p1 -b .fakerama
 %patch2007 -p1 -b .randrconfig
+%patch2008 -p1 -b .randrama-zero-screens
+%patch2009 -p1 -b .arm
 
 %patch2500 -p1 -b .unbreak-domains
 %patch2501 -p1 -b .pci-bus-count
@@ -571,6 +575,15 @@
 
 
 %changelog
+* Mon Jun 04 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-7
+- xserver-1.3.0-randrama-no-zero-screens.patch: For RANDR 1.2's fake
+  Xinerama info, don't report Xinerama as being active if there are no
+  RANDR 1.2 CRTCs active for that screen.  (#234567)
+- xserver-1.3.0-arm-iopl.patch: Add __arm__ conditionals to many #ifdefs.
+
+* Thu May 31 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-7
+- 
+
 * Sat May 26 2007 Adam Jackson <ajax at redhat.com> 1.3.0.0-6
 - Make sdk subpackage Require: pkgconfig.  Spotted in review for
   xorg-x11-drv-apm. (#226577)