summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@fedoraproject.org>2008-04-01 18:07:48 +0000
committerKristian Høgsberg <krh@fedoraproject.org>2008-04-01 18:07:48 +0000
commit0db3f8de4dc5043b4450f61ba10e517c022ba580 (patch)
treea6bffb3eac96d3af17068af94577e455eef23fe0
parent7f2f48f1de66b0f7466232c1b7748842d008f723 (diff)
downloadmesa-0db3f8de4dc5043b4450f61ba10e517c022ba580.tar.gz
mesa-0db3f8de4dc5043b4450f61ba10e517c022ba580.tar.xz
mesa-0db3f8de4dc5043b4450f61ba10e517c022ba580.zip
- Update git snapshot to pull in DRI2 direct rendering.mesa-7_1-0_21_fc9
- Add conflicts for xservers that don't understand the new DRI driver interface.
-rw-r--r--mesa.spec6
1 files changed, 4 insertions, 2 deletions
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.