rpms/xorg-x11-server/F-9 .cvsignore, 1.44, 1.45 commitid, 1.16, 1.17 sources, 1.38, 1.39 xorg-x11-server.spec, 1.333, 1.334 xserver-1.5.0-compiz-clip-fix.patch, 1.1, NONE xserver-1.5.0-f-spot-screws-glx.patch, 1.3, NONE xserver-1.5.0-glcore-swap-no-crashy.patch, 1.1, NONE xserver-1.5.0-hal-closedown.patch, 1.1, NONE xserver-1.5.0-selinux-off-by-default.patch, 1.1, NONE xserver-1.5.0-stenciled-visuals.patch, 1.1, NONE

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15210/F-9

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
Removed Files:
	xserver-1.5.0-compiz-clip-fix.patch 
	xserver-1.5.0-f-spot-screws-glx.patch 
	xserver-1.5.0-glcore-swap-no-crashy.patch 
	xserver-1.5.0-hal-closedown.patch 
	xserver-1.5.0-selinux-off-by-default.patch 
	xserver-1.5.0-stenciled-visuals.patch 
Log Message:
Today's git snapshot, essentially 1.5rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore	15 Apr 2008 02:20:52 -0000	1.44
+++ .cvsignore	19 May 2008 17:53:40 -0000	1.45
@@ -1 +1 @@
-xorg-server-20080415.tar.bz2
+xorg-server-20080519.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/commitid,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- commitid	15 Apr 2008 02:20:52 -0000	1.16
+++ commitid	19 May 2008 17:53:40 -0000	1.17
@@ -1 +1 @@
-5a2b538c1bc020af5bc33027ba0d9698338dca46
+e644d2e73f72e7a3e1a9525bdde0de2012efec59


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources	15 Apr 2008 02:20:52 -0000	1.38
+++ sources	19 May 2008 17:53:40 -0000	1.39
@@ -1 +1 @@
-2552f3c3b3c2c61ca85fd3d1515efcff  xorg-server-20080415.tar.bz2
+71e99c6d8ca2caf9923f6645f03e9b83  xorg-server-20080519.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-9/xorg-x11-server.spec,v
retrieving revision 1.333
retrieving revision 1.334
diff -u -r1.333 -r1.334
--- xorg-x11-server.spec	6 May 2008 18:25:09 -0000	1.333
+++ xorg-x11-server.spec	19 May 2008 17:53:40 -0000	1.334
@@ -15,12 +15,12 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20080415
+%define gitdate 20080519
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.901
-Release:   29.%{gitdate}%{?dist}
+Release:   30.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -50,13 +50,6 @@
 Patch1014:  xserver-1.4.99-xaa-evict-pixmaps.patch
 
 Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
-Patch2014:  xserver-1.5.0-compiz-clip-fix.patch
-
-# Trivial things to maybe merge upstream at next rebase
-Patch3000:  xserver-1.5.0-stenciled-visuals.patch
-Patch3001:  xserver-1.5.0-glcore-swap-no-crashy.patch
-Patch3002:  xserver-1.5.0-f-spot-screws-glx.patch
-Patch3003:  xserver-1.5.0-hal-closedown.patch
 
 # Trivial things to never merge upstream ever
 # Don't merge this without protecting the gccisms.
@@ -67,7 +60,6 @@
 Patch5007:  xserver-1.5.0-bad-fbdev-thats-mine.patch
 Patch5008:  xserver-1.5.0-xaa-sucks.patch
 Patch5009:  xserver-1.5.0-no-evdev-keyboards-kthnx.patch
-Patch5010:  xserver-1.5.0-selinux-off-by-default.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri


--- xserver-1.5.0-compiz-clip-fix.patch DELETED ---


--- xserver-1.5.0-f-spot-screws-glx.patch DELETED ---


--- xserver-1.5.0-glcore-swap-no-crashy.patch DELETED ---


--- xserver-1.5.0-hal-closedown.patch DELETED ---


--- xserver-1.5.0-selinux-off-by-default.patch DELETED ---


--- xserver-1.5.0-stenciled-visuals.patch DELETED ---