rpms/xorg-x11-server/devel .cvsignore, 1.11, 1.12 sources, 1.9, 1.10 xorg-x11-server.spec, 1.51, 1.52 xorg-x11-server-1.0.1-SEGV-on-null-interface.patch, 1.1, NONE xorg-x11-server-1.0.1-fbpict-fix-rounding.patch, 1.1, NONE xorg-x11-server-1.0.99.2-no-kdrive-dri.patch, 1.1, NONE

[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-serv31346/devel

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Removed Files:
	xorg-x11-server-1.0.1-SEGV-on-null-interface.patch 
	xorg-x11-server-1.0.1-fbpict-fix-rounding.patch 
	xorg-x11-server-1.0.99.2-no-kdrive-dri.patch 
Log Message:
auto-import xorg-x11-server-1.0.99.901-1 on branch devel from xorg-x11-server-1.0.99.901-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	4 Apr 2006 22:07:57 -0000	1.11
+++ .cvsignore	10 Apr 2006 03:10:33 -0000	1.12
@@ -1 +1 @@
-xorg-server-1.0.99.2.tar.bz2
+xorg-server-1.0.99.901.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	4 Apr 2006 22:07:57 -0000	1.9
+++ sources	10 Apr 2006 03:10:33 -0000	1.10
@@ -1 +1 @@
-e19e7e7e923c6a549c0d114c3f5c498c  xorg-server-1.0.99.2.tar.bz2
+9100da4b892b8f8bf741db7ac371476e  xorg-server-1.0.99.901.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- xorg-x11-server.spec	6 Apr 2006 21:17:53 -0000	1.51
+++ xorg-x11-server.spec	10 Apr 2006 03:10:33 -0000	1.52
@@ -3,8 +3,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.0.99.2
-Release:   2
+Version:   1.0.99.901
+Release:   1
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -23,7 +23,7 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292.  hacky patch
 Patch7:    xorg-x11-server-1.0.1-fpic-libxf86config.patch
 # REMOVE ME FOR 1.0.99.3
-Patch8:	   xorg-x11-server-1.0.99.2-no-kdrive-dri.patch
+#Patch8:	   xorg-x11-server-1.0.99.2-no-kdrive-dri.patch
 
 # Spiffiffity feature/optimization patches.
 Patch100:  xorg-server-1.0.99.2-spiffiffity.patch
@@ -258,7 +258,7 @@
 %patch4 -p0 -b .composite-fastpath-fdo4320
 %patch6 -p1 -b .randrsdk
 %patch7 -p1 -b .xf86configfpic
-%patch8 -p0 -b .no-kdrive-dri
+#%patch8 -p0 -b .no-kdrive-dri
 
 %patch100 -p0 -b .spiffiffity
 
@@ -565,6 +565,9 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Sat Apr  8 2006 Adam Jackson <ajackson at redhat.com> 1.0.99.901-1
+- Update to 7.1 RC1.
+
 * Thu Apr  6 2006 Adam Jackson <ajax at redhat.com> 1.0.99.2-2
 - Remove LBX to match upstream policy.
 - Add Xephyr server.


--- xorg-x11-server-1.0.1-SEGV-on-null-interface.patch DELETED ---


--- xorg-x11-server-1.0.1-fbpict-fix-rounding.patch DELETED ---


--- xorg-x11-server-1.0.99.2-no-kdrive-dri.patch DELETED ---