[mesa/f16] Mesa 7.11.2 Pull in archful -dri-drivers for libGL to pacify wine (#757464)
Adam Jackson
ajax at fedoraproject.org
Mon Nov 28 16:52:07 UTC 2011
commit 50919da7b322fd7bec490ffdc4c2d3f29e50ceaa
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Nov 28 11:52:02 2011 -0500
Mesa 7.11.2
Pull in archful -dri-drivers for libGL to pacify wine (#757464)
.gitignore | 1 +
mesa.spec | 19 ++++++++++++-------
sources | 1 +
3 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f0e2145..af521e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ mesa-20100720.tar.bz2
/mesa-20110730.tar.xz
/MesaLib-7.11.tar.bz2
/mesa-20111103.tar.xz
+/MesaLib-7.11.2.tar.bz2
diff --git a/mesa.spec b/mesa.spec
index 0237232..047287e 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -20,21 +20,21 @@
%define _default_patch_fuzz 2
%define manpages gl-manpages-1.0.1
-%define gitdate 20111103
+#define gitdate 20111103
#% define snapshot
Summary: Mesa graphics libraries
Name: mesa
-Version: 7.11
-Release: 11%{?dist}
+Version: 7.11.2
+Release: 1%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.mesa3d.org
#Source0: http://downloads.sf.net/mesa3d/MesaLib-%{version}.tar.bz2
#Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2
-#Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2
-Source0: %{name}-%{gitdate}.tar.xz
+Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2
+#Source0: %{name}-%{gitdate}.tar.xz
Source2: %{manpages}.tar.bz2
Source3: make-git-snapshot.sh
@@ -84,6 +84,7 @@ Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Provides: libGL
Requires: libdrm%{?isa} >= 2.4.23-1
+Requires: mesa-dri-drivers%{?_isa} = %{version}-%{release}
%if %{with_hardware}
Conflicts: xorg-x11-server-Xorg < 1.4.99.901-14
%endif
@@ -213,8 +214,8 @@ Mesa offscreen rendering development package
%prep
-#%setup -q -n Mesa-%{version}%{?snapshot} -b0 -b2
-%setup -q -n mesa-%{gitdate} -b2
+%setup -q -n Mesa-%{version}%{?snapshot} -b0 -b2
+#setup -q -n mesa-%{gitdate} -b2
%patch2 -p1 -b .intel-glthread
%patch3 -p1 -b .no-mach64
%patch4 -p1 -b .classic
@@ -462,6 +463,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/osmesa.pc
%changelog
+* Mon Nov 28 2011 Adam Jackson <ajax at redhat.com> 7.11.2-1
+- Mesa 7.11.2
+- Pull in archful -dri-drivers for libGL to pacify wine (#757464)
+
* Wed Nov 09 2011 Adam Jackson <ajax at redhat.com> 7.11-11
- Obsolete more -llvmcore (#752152)
diff --git a/sources b/sources
index 81d81a6..8d5998a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2
333f61aac5367c8b7b9ea22943c448b1 mesa-20111103.tar.xz
+0837c52698fe3252369c3fdb5195afcc MesaLib-7.11.2.tar.bz2
More information about the scm-commits
mailing list