From ef7113ffa0f7c987b44910b6b396b0bbbd1238b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@fedoraproject.org>
Date: Wed, 12 Mar 2008 02:43:37 +0000
Subject: [PATCH] =?UTF-8?q?*=20Tue=20Mar=2011=202008=20Kristian=20H=C3=B8g?=
 =?UTF-8?q?sberg=20<krh@redhat.com>=201.4.99.901-4.20080310=20-=20Checkout?=
 =?UTF-8?q?=20the=20tip=20of=20the=20git=20snapshot=20so=20we=20get=20the?=
 =?UTF-8?q?=20most=20recent=20DRI2=20=20=20texture=20from=20pixmap=20chang?=
 =?UTF-8?q?es=20in=20the=20build.=20=20Bump=20mesa=20build=20requires.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xorg-x11-server.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 7c39c98..861fcf1 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.901
-Release:   3.%{gitdate}%{?dist}
+Release:   4.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -110,8 +110,8 @@ BuildRequires: libXv-devel
 
 # openssl? really?
 BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex
-BuildRequires: mesa-libGL-devel >= 7.1-0.19
-BuildRequires: mesa-source >= 7.1-0.19
+BuildRequires: mesa-libGL-devel >= 7.1-0.20
+BuildRequires: mesa-source >= 7.1-0.20
 # XXX silly...
 BuildRequires: libdrm-devel >= 2.4.0
 %if %{with_hw_servers}
@@ -271,7 +271,7 @@ Xserver source code needed to build VNC server (Xvnc)
 
 %if 0%{gitdate}
 # XXX hack
-git checkout -b fedora 921cbc58036491eab491b4c7b07111f04aa58d40
+git checkout -b fedora
 # make it something you can push to.
 sed -i 's/git/&+ssh/' .git/config
 %else
@@ -509,6 +509,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 11 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.901-4.20080310
+- Checkout the tip of the git snapshot so we get the most recent DRI2
+  texture from pixmap changes in the build.  Bump mesa build requires.
+
 * Tue Mar 11 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-3.20080310
 - New 1.5 snapshot.
 - xserver-1.5-x86emy.patch: Fix an x86emu quirk.