From 0db3f8de4dc5043b4450f61ba10e517c022ba580 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@fedoraproject.org>
Date: Apr 01 2008 18:07:48 +0000
Subject: - Update git snapshot to pull in DRI2 direct rendering.

- Add conflicts for xservers that don't understand the new DRI driver
    interface.

---

diff --git a/mesa.spec b/mesa.spec
index dbd6de3..96351b9 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -39,7 +39,7 @@ BuildRequires: libdrm-devel >= 2.4.0-0.5
 %endif
 BuildRequires: libXxf86vm-devel
 BuildRequires: expat-devel >= 2.0
-BuildRequires: xorg-x11-proto-devel >= 7.1-9
+BuildRequires: xorg-x11-proto-devel >= 7.1-10
 BuildRequires: makedepend
 BuildRequires: libselinux-devel
 BuildRequires: libXext-devel
@@ -60,12 +60,12 @@ Obsoletes: Mesa XFree86-libs XFree86-Mesa-libGL xorg-x11-Mesa-libGL
 Obsoletes: xorg-x11-libs
 %if %{with_dri}
 Requires: libdrm >= 2.3.0
+Conflicts: xorg-x11-server-Xorg < 1.4.99.901-14
 %endif
 
 %description libGL
 Mesa libGL runtime libraries and DRI drivers.
 
-
 %package libGL-devel
 Summary: Mesa libGL development package
 Group: Development/Libraries
@@ -399,6 +399,8 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Mon Mar 31 2008 Kristian Høgsberg <krh@redhat.com> - 7.1-0.21
 - Update git snapshot to pull in DRI2 direct rendering.
+- Add conflicts for xservers that don't understand the new DRI driver
+  interface.
 
 * Tue Mar 11 2008 Kristian Høgsberg <krh@redhat.com> - 7.1-0.20
 - Looks like the TexOffset extension does not work, disable for now.