rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.219, 1.220 xserver-1.3.0-no-prerelease-warning.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv849

Modified Files:
	xorg-x11-server.spec xserver-1.3.0-no-prerelease-warning.patch 
Log Message:
remove a stray patch hunk


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- xorg-x11-server.spec	11 Apr 2007 21:34:24 -0000	1.219
+++ xorg-x11-server.spec	11 Apr 2007 21:44:10 -0000	1.220
@@ -58,6 +58,8 @@
 Patch2004:  xserver-1.2.0-honor-displaysize.patch
 Patch2005:  xserver-1.2.99.901-xephyr-crash-at-exit.patch
 
+Patch9999: fuck-the-kernel.patch
+
 # assorted PCI layer shenanigans.  oh the pain.
 Patch2500:  xorg-x11-server-1.2.99-unbreak-domain.patch
 Patch2501:  xserver-1.3.0-pci-bus-count.patch
@@ -296,6 +298,8 @@
 %patch2503 -p1 -b .rom-search
 %patch2504 -p1 -b .domain-obiwan
 
+%patch9999 -p1 -b .jx
+
 %build
 
 # --with-rgb-path should be superfluous now ?

xserver-1.3.0-no-prerelease-warning.patch:
 xf86Init.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: xserver-1.3.0-no-prerelease-warning.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xserver-1.3.0-no-prerelease-warning.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xserver-1.3.0-no-prerelease-warning.patch	11 Apr 2007 21:34:45 -0000	1.1
+++ xserver-1.3.0-no-prerelease-warning.patch	11 Apr 2007 21:44:10 -0000	1.2
@@ -1,14 +1,3 @@
---- xorg-server-1.2.99.905/configure.ac.jx	2007-04-06 16:52:25.000000000 -0400
-+++ xorg-server-1.2.99.905/configure.ac	2007-04-06 17:45:10.000000000 -0400
-@@ -238,7 +238,7 @@
- 	;;
-   x86_64*|amd64*)
-   	use_x86_asm="yes"
--	I386_VIDEO=yes
-+	I386_VIDEO=no
- 	case $host_os in
- 		*freebsd*)	AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;
- 		*netbsd*)	AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl])
 --- xorg-server-1.2.99.905/hw/xfree86/common/xf86Init.c.jx	2007-01-31 19:55:51.000000000 -0500
 +++ xorg-server-1.2.99.905/hw/xfree86/common/xf86Init.c	2007-04-11 12:32:24.000000000 -0400
 @@ -1770,7 +1770,7 @@