rpms/mesa/devel .cvsignore, 1.21, 1.22 make-git-snapshot.sh, 1.1, 1.2 mesa.spec, 1.170, 1.171 sources, 1.20, 1.21 mesa-7.1-dri-drivers.patch, 1.7, NONE

[Kristian Høgsberg (krh)]

Author: krh

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

Modified Files:
	.cvsignore make-git-snapshot.sh mesa.spec sources 
Removed Files:
	mesa-7.1-dri-drivers.patch 
Log Message:
* Mon Mar  3 2008 Kristian Høgsberg <krh at redhat.com> - 7.1-0.19
- Bump to latest git snapshot.
- Drop mesa-7.1-dri-drivers.patch, it's upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	21 Feb 2008 02:05:31 -0000	1.21
+++ .cvsignore	4 Mar 2008 01:15:35 -0000	1.22
@@ -1,3 +1,2 @@
 gl-manpages-1.0.1.tar.bz2
-mesa-20080215.tar.bz2
-mesa-20080218.tar.bz2
+mesa-20080303.tar.bz2


Index: make-git-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/make-git-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- make-git-snapshot.sh	15 Feb 2008 23:21:58 -0000	1.1
+++ make-git-snapshot.sh	4 Mar 2008 01:15:35 -0000	1.2
@@ -1,17 +1,22 @@
 #!/bin/sh
 
+# Usage: ./make-git-snapshot.sh [COMMIT]
+#
+# to make a snapshot of the given tag/branch.  Defaults to HEAD.
+# Point env var REF to a local mesa repo to reduce clone time.
+
 DIRNAME=mesa-$( date +%Y%m%d )
 
+echo REF ${REF:+--reference $REF}
+echo DIRNAME $DIRNAME
+echo HEAD ${1:-HEAD}
+
 rm -rf $DIRNAME
-git clone git://git.freedesktop.org/git/mesa/mesa $DIRNAME
-cd $DIRNAME
-if [ -z "$1" ]; then
-    git log | head -1
-else
-    git checkout $1
-fi
-git log | head -1 | awk '{ print $2 }' > ../commitid
-git repack -a -d
-cd ..
-tar jcf $DIRNAME.tar.bz2 $DIRNAME
-rm -rf $DIRNAME
+
+git clone ${REF:+--reference $REF} \
+	git://git.freedesktop.org/git/mesa/mesa $DIRNAME
+
+GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
+	| bzip2 > $DIRNAME.tar.bz2
+
+# rm -rf $DIRNAME


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- mesa.spec	3 Mar 2008 02:52:48 -0000	1.170
+++ mesa.spec	4 Mar 2008 01:15:35 -0000	1.171
@@ -10,12 +10,12 @@
 %endif
 
 %define manpages gl-manpages-1.0.1
-%define gitdate 20080218
+%define gitdate 20080303
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.1
-Release: 0.18%{?dist}
+Release: 0.19%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -28,7 +28,6 @@
 Source3: make-git-snapshot.sh
 
 Patch0: mesa-7.1pre-osmesa-version.patch
-Patch1: mesa-7.1-dri-drivers.patch
 Patch2: mesa-7.1pre-nukeglthread-debug.patch
 
 BuildRequires: pkgconfig autoconf automake
@@ -151,7 +150,6 @@
 #%setup -q -n Mesa-%{version}pre -b1 -b2
 %setup -q -n mesa-%{gitdate} -b2
 %patch0 -p1 -b .osmesa
-%patch1 -p1 -b .dri-drivers
 %patch2 -p1 -b .intel-glthread
 
 # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT
@@ -395,6 +393,10 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Mon Mar  3 2008 Kristian Høgsberg <krh at redhat.com> - 7.1-0.19
+- Bump to latest git snapshot.
+- Drop mesa-7.1-dri-drivers.patch, it's upstream.
+
 * Mon Mar 03 2008 Dave Airlie <airlied at redhat.com> 7.1-0.18
 - fix i915 build due to symbol visibility
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	21 Feb 2008 02:05:31 -0000	1.20
+++ sources	4 Mar 2008 01:15:35 -0000	1.21
@@ -1,2 +1,2 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
-0faf6afeee7f2ef78efeb681690c0c25  mesa-20080218.tar.bz2
+2b1a09d87cd56f4601265993ac747db3  mesa-20080303.tar.bz2


--- mesa-7.1-dri-drivers.patch DELETED ---