Tue Apr 8 21:01:10 UTC 2008

Author: ajax

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

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
Removed Files:
	xserver-1.5.0-dont-bitch-about-record.patch 
	xserver-1.5.0-fix-dri2-crash-on-fail.patch 
	xserver-1.5.0-fix-lsl-quirk.patch 
	xserver-1.5.0-handle-failing-dri-create-screen.patch 
	xserver-1.5.0-unbreak-dri2-glcore-visuals.patch 
	xserver-1.5.0-unselinux.patch xserver-1.5.0-vmmouse.patch 
	xserver-1.5.0-wfs.patch 
Log Message:
the revenge of the importatron



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43

--- .cvsignore	1 Apr 2008 19:35:53 -0000	1.42
+++ .cvsignore	8 Apr 2008 20:59:51 -0000	1.43
@@ -1,2 +1 @@
-xorg-server-20080331.tar.bz2
-xorg-server-20080401.tar.bz2
+xorg-server-20080407.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- commitid	1 Apr 2008 19:30:46 -0000	1.14
+++ commitid	8 Apr 2008 20:59:51 -0000	1.15
@@ -1 +1 @@
-2156bdf3b7b5b7d3ee4d3278eac0f28c7bff830a
+85b855f26f1578d52e9ed1dd0e3a9a1340ef1a2d


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	1 Apr 2008 19:30:46 -0000	1.36
+++ sources	8 Apr 2008 20:59:51 -0000	1.37
@@ -1 +1 @@
-e858611812f37e34092e13c51094e2ce  xorg-server-20080401.tar.bz2
+3a69d1948a47ecd77d8e2adc9d34179a  xorg-server-20080407.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- xorg-x11-server.spec	7 Apr 2008 14:15:08 -0000	1.322
+++ xorg-x11-server.spec	8 Apr 2008 20:59:51 -0000	1.323
@@ -15,12 +15,12 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20080401
+%define gitdate 20080407
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.901
-Release:   18.%{gitdate}%{?dist}
+Release:   19.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -60,16 +60,9 @@
 # This really could be done prettier.
 Patch5002: xserver-1.4.99-ssh-isnt-local.patch
 
-Patch5004: xserver-1.5.0-wfs.patch
-Patch5005: xserver-1.5.0-unselinux.patch
 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
-Patch5011: xserver-1.5.0-fix-lsl-quirk.patch
-Patch5012: xserver-1.5.0-fix-dri2-crash-on-fail.patch
-Patch5013: xserver-1.5.0-unbreak-dri2-glcore-visuals.patch
-Patch5014: xserver-1.5.0-dont-bitch-about-record.patch
-Patch5015: xserver-1.5.0-handle-failing-dri-create-screen.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -96,6 +89,7 @@
 
 BuildRequires: xorg-x11-proto-devel >= 7.3-10
 BuildRequires: damageproto >= 1.1
+BuildRequires: dri2proto >= 1.1
 BuildRequires: fixesproto >= 4.0
 BuildRequires: glproto >= 1.4.9
 BuildRequires: kbproto >= 1.0.3
@@ -304,6 +298,7 @@
 # --with-rgb-path should be superfluous now ?
 # --with-pie ?
 autoreconf -v --install || exit 1
+export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow"
 %configure --enable-maintainer-mode %{xservers} \
 	--disable-static \
 	--with-pic \
@@ -518,6 +513,9 @@
 
 
 %changelog
+* Tue Apr 08 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-19.20080407
+- Today's rebase.  Patch merge, some int10 fixes.
+
 * Mon Apr 07 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-18.20080401
 - xorg-x11-server-Red-Hat-extramodes.patch: Remove some of the more
   implausible modes.  Cargo cult programming woo.


--- xserver-1.5.0-dont-bitch-about-record.patch DELETED ---


--- xserver-1.5.0-fix-dri2-crash-on-fail.patch DELETED ---


--- xserver-1.5.0-fix-lsl-quirk.patch DELETED ---


--- xserver-1.5.0-handle-failing-dri-create-screen.patch DELETED ---


--- xserver-1.5.0-unbreak-dri2-glcore-visuals.patch DELETED ---


--- xserver-1.5.0-unselinux.patch DELETED ---


--- xserver-1.5.0-vmmouse.patch DELETED ---


--- xserver-1.5.0-wfs.patch DELETED ---


