* Thu Mar 04 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7.99.901-10.20100304

- Update to today's git.
- BuildRequires libselinux-devel >= 2.0.86

.cvsignore

@@ -1 +1 @@
-xorg-server-20100215.tar.xz
+xorg-server-20100304.tar.xz

commitid

@@ -1 +1 @@
-84905007702da2c05a4f7446b3fc5ff52be49655
+bbae92795c7eab062e6722c42fa7915e0cee5d69

sources

@@ -1 +1 @@
-55513ab7f893cf75c75ffc3186ec1aff  xorg-server-20100223.tar.xz
+d630f8f6756f07305a781ff1f2fcc1ea  xorg-server-20100304.tar.xz

xorg-x11-server.spec

@@ -14,12 +14,12 @@
 # Fix rhpxl to no longer need vesamodes/extramodes
 
 %define pkgname xorg-server
-%define gitdate 20100223
+%define gitdate 20100304
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.99.901
-Release:   9.%{gitdate}%{dist}
+Release:   10.%{gitdate}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -127,7 +127,7 @@ BuildRequires: mesa-libGL-devel >= 7.6-0.6
 # XXX silly...
 BuildRequires: libdrm-devel >= 2.4.0 kernel-headers
 
-BuildRequires: audit-libs-devel libselinux-devel >= 2.0.79-1
+BuildRequires: audit-libs-devel libselinux-devel >= 2.0.86-1
 BuildRequires: libudev-devel
 
 # All server subpackages have a virtual provide for the name of the server
@@ -518,6 +518,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Mar 04 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7.99.901-10.20100304
+- Update to today's git.
+- BuildRequires libselinux-devel >= 2.0.86 
+
 * Thu Feb 25 2010 Dave Airlie <airlied@redhat.com> 1.7.99.901-9.20100223
 - fix right-of patch to allow driver to override right-of with clone
 

xserver-1.6.99-default-modes.patch

@@ -1,6 +1,6 @@
-From 8cdd51d13aa003c888cd2a3a42664e2dc60c354c Mon Sep 17 00:00:00 2001
+From ca85ebddd804305322014c6a71b4122a56c5e634 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 20 Jan 2010 14:55:12 +1300
+Date: Thu, 4 Mar 2010 15:18:38 +1000
 Subject: [PATCH] tweak default mode list yet again
 
 ---
@@ -8,10 +8,10 @@ Subject: [PATCH] tweak default mode list yet again
  1 files changed, 4 insertions(+), 1 deletions(-)
 
 diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 23f4a87..0ce631a 100644
+index 03277be..571ffd0 100644
 --- a/hw/xfree86/modes/xf86Crtc.c
 +++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1578,7 +1578,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+@@ -1582,7 +1582,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
  	int		    min_clock = 0;
  	int		    max_clock = 0;
  	double		    clock;
@@ -19,8 +19,8 @@ index 23f4a87..0ce631a 100644
 +	Bool                add_default_modes;
  	Bool		    debug_modes = config->debug_modes ||
  					  xf86Initialising;
- 	enum { sync_config, sync_edid, sync_default } sync_source = sync_default;
-@@ -1623,6 +1623,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+ 	enum det_monrec_source sync_source = sync_default;
+@@ -1628,6 +1628,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
  	}
  	
  	output_modes = (*output->funcs->get_modes) (output);
@@ -31,5 +31,5 @@ index 23f4a87..0ce631a 100644
  	edid_monitor = output->MonInfo;
  	
 -- 
-1.6.6
+1.6.6.1