rpms/mesa/devel mesa.spec,1.174,1.175

[Kristian Høgsberg (krh)]

Author: krh

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24876

Modified Files:
	mesa.spec 
Log Message:
* Mon Mar 31 2008 Kristian Høgsberg <krh at 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.



Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- mesa.spec	31 Mar 2008 23:05:41 -0000	1.174
+++ mesa.spec	1 Apr 2008 18:07:48 -0000	1.175
@@ -39,7 +39,7 @@
 %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: 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 @@
 %changelog
 * Mon Mar 31 2008 Kristian Høgsberg <krh at 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 at redhat.com> - 7.1-0.20
 - Looks like the TexOffset extension does not work, disable for now.