[mesa/f15/master] snapshot upstream again to hopefully fix ILK bug

[Dave Airlie]

commit 9f7b14f2f9c2ddaba0dd2cfc5fccdebdc7f3bf20
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Mar 30 14:10:04 2011 +1000

    snapshot upstream again to hopefully fix ILK bug

 .gitignore            |    1 +
 mesa-7.11-fixes.patch |  111 -------------------------------------------------
 mesa.spec             |    9 ++--
 sources               |    2 +-
 4 files changed, 7 insertions(+), 116 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2e356bc..dda81af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ mesa-20100720.tar.bz2
 /mesa-20110107.tar.xz
 /MesaLib-7.10.1.tar.bz2
 /mesa-20110327.tar.xz
+/mesa-20110330.tar.xz
diff --git a/mesa.spec b/mesa.spec
index 0898c70..bf9668e 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -12,13 +12,13 @@
 %define _default_patch_fuzz 2
 
 %define manpages gl-manpages-1.0.1
-%define gitdate 20110327
+%define gitdate 20110330
 #% define snapshot 
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.11
-Release: 0.1.%{gitdate}.0%{?dist}
+Release: 0.2.%{gitdate}.0%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -31,7 +31,6 @@ Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 Source4: llvmcore.mk
 
-Patch1: mesa-7.11-fixes.patch
 Patch2: mesa-7.1-nukeglthread-debug.patch
 Patch3: mesa-no-mach64.patch
 Patch4: legacy-drivers.patch
@@ -215,7 +214,6 @@ Requires: Xorg %(xserver-sdk-abi-requires ansic) %(xserver-sdk-abi-requires vide
 %prep
 #setup -q -n Mesa-%{version}%{?snapshot} -b0 -b2
 %setup -q -n mesa-%{gitdate} -b2
-%patch1 -p1 -b .upstream
 %patch2 -p1 -b .intel-glthread
 %patch3 -p1 -b .no-mach64
 %patch4 -p1 -b .classic
@@ -487,6 +485,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libOSMesa.so
 
 %changelog
+* Wed Mar 30 2011 Dave Airlie <airlied at redhat.com> 7.11-0.2.20110330.0
+- snapshot upstream again to hopefully fix ILK bug
+
 * Sun Mar 27 2011 Dave Airlie <airlied at redhat.com> 7.11-0.1.20110327.0
 - pull latest snapshot + 3 post snapshot fixes
 
diff --git a/sources b/sources
index e8deb48..1f3ea74 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
-3ad97eb2b70c9cd1ec8483e826f02b01  mesa-20110327.tar.xz
+08d37442be3d2c40010aa3c5fa3eb787  mesa-20110330.tar.xz