rpms/xorg-x11-server/devel .cvsignore, 1.39, 1.40 commitid, 1.12, 1.13 sources, 1.34, 1.35 xorg-x11-server.spec, 1.310, 1.311 xserver-1.5.0-aspect-match.patch, 1.1, NONE xserver-1.5.0-ia64.patch, 1.1, NONE xserver-1.5.0-x86emu.patch, 1.2, NONE

[Adam Jackson (ajax)]

Author: ajax

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

Modified Files:
	.cvsignore commitid sources xorg-x11-server.spec 
Removed Files:
	xserver-1.5.0-aspect-match.patch xserver-1.5.0-ia64.patch 
	xserver-1.5.0-x86emu.patch 
Log Message:
Today's snapshot.  mergey-merge-merge.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore	11 Mar 2008 01:18:22 -0000	1.39
+++ .cvsignore	14 Mar 2008 19:50:58 -0000	1.40
@@ -1 +1 @@
-xorg-server-20080310.tar.bz2
+xorg-server-20080314.tar.bz2


Index: commitid
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/commitid,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- commitid	11 Mar 2008 01:18:22 -0000	1.12
+++ commitid	14 Mar 2008 19:50:58 -0000	1.13
@@ -1 +1 @@
-02feb14a678e3b8ad9acf0b6db8d159b4fd64147
+4a61cf3b08942895868e18bff11e0e4e12f69a7e


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources	11 Mar 2008 01:18:22 -0000	1.34
+++ sources	14 Mar 2008 19:50:58 -0000	1.35
@@ -1 +1 @@
-5d8257eb3d8f466e7c48540cb3740a19  xorg-server-20080310.tar.bz2
+455e0406e3b9f7a22d33f596284f9cd0  xorg-server-20080314.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- xorg-x11-server.spec	13 Mar 2008 19:07:47 -0000	1.310
+++ xorg-x11-server.spec	14 Mar 2008 19:50:58 -0000	1.311
@@ -15,12 +15,12 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20080310
+%define gitdate 20080314
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.901
-Release:   8.%{gitdate}%{?dist}
+Release:   9.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -60,13 +60,10 @@
 # This really could be done prettier.
 Patch5002: xserver-1.4.99-ssh-isnt-local.patch
 
-Patch5003: xserver-1.5.0-x86emu.patch
 Patch5004: xserver-1.5.0-wfs.patch
 Patch5005: xserver-1.5.0-unselinux.patch
-Patch5006: xserver-1.5.0-ia64.patch
 Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch
 Patch5008: xserver-1.5.0-xaa-sucks.patch
-Patch5009: xserver-1.5.0-aspect-match.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -124,7 +121,7 @@
 Requires: libdrm >= 2.4.0
 %endif
 
-BuildRequires: libselinux-devel audit-libs-devel
+BuildRequires: audit-libs-devel libselinux-devel >= 2.0.59-1
 BuildRequires: hal-devel dbus-devel
 
 # Make sure libXfont has the catalogue FPE
@@ -515,6 +512,9 @@
 
 
 %changelog
+* Fri Mar 14 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-9.20080314
+- Today's snapshot.  Mostly just patch merge with rawhide.
+
 * Thu Mar 13 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-8.20080310
 - xserver-1.5.0-aspect-match.patch: Fix the RANDR 1.2 initial configuration
   heuristic for the case where the best possible mode is the first one in


--- xserver-1.5.0-aspect-match.patch DELETED ---


--- xserver-1.5.0-ia64.patch DELETED ---


--- xserver-1.5.0-x86emu.patch DELETED ---