rpms/mesa/devel .cvsignore, 1.24, 1.25 mesa.spec, 1.181, 1.182 sources, 1.23, 1.24 mesa-7.1-dri2.patch, 1.1, NONE mesa-7.1-fbconfig-fix.patch, 1.1, NONE mesa-7.1-visual-crash.patch, 1.1, NONE

[Dave Airlie (airlied)]

Author: airlied

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

Modified Files:
	.cvsignore mesa.spec sources 
Removed Files:
	mesa-7.1-dri2.patch mesa-7.1-fbconfig-fix.patch 
	mesa-7.1-visual-crash.patch 
Log Message:
* Tue Apr 15 2008 Dave Airlie <airlied at redhat.com> 7.1-0.25
- Rebase to latest upstream - drop patches applied there.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	31 Mar 2008 23:05:41 -0000	1.24
+++ .cvsignore	15 Apr 2008 02:22:47 -0000	1.25
@@ -1,3 +1 @@
-gl-manpages-1.0.1.tar.bz2
-mesa-20080311.tar.bz2
-mesa-20080331.tar.bz2
+mesa-20080415.tar.bz2


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- mesa.spec	12 Apr 2008 17:49:22 -0000	1.181
+++ mesa.spec	15 Apr 2008 02:22:47 -0000	1.182
@@ -10,12 +10,12 @@
 %endif
 
 %define manpages gl-manpages-1.0.1
-%define gitdate 20080331
+%define gitdate 20080415
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.1
-Release: 0.24%{?dist}
+Release: 0.25%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -33,9 +33,6 @@
 # This doesn't work, disable for now.
 Patch3: disable-tex-offset.patch
 
-Patch4: mesa-7.1-visual-crash.patch
-Patch5: mesa-7.1-fbconfig-fix.patch
-Patch6: mesa-7.1-dri2.patch
 Patch7: mesa-7.1-link-shared.patch
 # lets only build drivers on sparc that are remotely useful
 Patch8: mesa-7.1-sparc.patch
@@ -164,9 +161,6 @@
 %patch0 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
 %patch3 -p1 -b .disable-tex-offset
-%patch4 -p1 -b .visual-crash
-%patch5 -p1 -b .fbconfig
-%patch6 -p1 -b .dri2
 %patch7 -p1 -b .dricore
 %patch8 -p1
 
@@ -417,6 +411,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Tue Apr 15 2008 Dave Airlie <airlied at redhat.com> 7.1-0.25
+- Rebase to latest upstream - drop patches applied there.
+
 * Sat Apr 12 2008 Dennis Gilmore <dennis at ausil.us> 7.1-0.24
 - add patch so that we only build dri drivers on sparc that are remotely
   useful.  sis driver breaks the build and the intel ones will never exist


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	31 Mar 2008 23:05:41 -0000	1.23
+++ sources	15 Apr 2008 02:22:47 -0000	1.24
@@ -1,3 +1 @@
-6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
-35148aa4ae18e67e69d0fea04ab07e83  mesa-20080311.tar.bz2
-ddedbff848f14c0615a7cf3589cc9018  mesa-20080331.tar.bz2
+4c32a78a28832fa34e0a5a04c6b9057c  mesa-20080415.tar.bz2


--- mesa-7.1-dri2.patch DELETED ---


--- mesa-7.1-fbconfig-fix.patch DELETED ---


--- mesa-7.1-visual-crash.patch DELETED ---