auto-import mesa-6.5-4 on branch devel from mesa-6.5-4.src.rpmmesa-6_5-4

1 files changed, 6 insertions, 1 deletions

diff --git a/mesa.spec b/mesa.spec
index e79cbee..748d122 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -53,7 +53,7 @@
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 6.5
-Release: 3
+Release: 4
 License: MIT/X11
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -74,6 +74,7 @@ Patch3: mesa-modular-dri-dir.patch
 Patch4: mesa-6.4.1-libGLw-enable-motif-support.patch
 Patch5: mesa-6.5-drop-static-inline.patch
 Patch6: mesa-6.5-noexecstack.patch
+Patch7: mesa-6.5-force-r300.patch
 
 # General patches from upstream go here:
 
@@ -241,6 +242,7 @@ install -m 755 %{SOURCE12} ./
 %endif
 %patch5 -p0 -b .drop-static-inline
 %patch6 -p0 -b .noexecstack
+%patch7 -p0 -b .force-r300
 
 # According to Adam, this patch makes metacity's compositing
 # manager noticeably faster, but also may be a little too big of
@@ -432,6 +434,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/glxinfo
 
 %changelog
+* Tue Apr 11 2006 Adam Jackson <ajackson@redhat.com> 6.5-4
+- Disable R300_FORCE_R300 hack for wider testing.
+
 * Mon Apr 10 2006 Kristian Høgsberg <krh@redhat.com> 6.5-3
 - Add mesa-6.5-noexecstack.patch to prevent assembly files from making
   libGL.so have executable stack.