rpms/xorg-x11-drv-ati/devel make-git-snapshot.sh, NONE, 1.1 .cvsignore, 1.29, 1.30 sources, 1.29, 1.30 xorg-x11-drv-ati.spec, 1.181, 1.182 radeon-6.12.2-to-git.patch, 1.1, NONE

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16209

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Added Files:
	make-git-snapshot.sh 
Removed Files:
	radeon-6.12.2-to-git.patch 
Log Message:
* Fri Aug 21 2009 Dave Airlie <airlied at redhat.com> 6.12.2-22
- change to a git snapshot



--- NEW FILE make-git-snapshot.sh ---
#!/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=xf86-video-ati-$( date +%Y%m%d )

echo REF ${REF:+--reference $REF}
echo DIRNAME $DIRNAME
echo HEAD ${1:-HEAD}

rm -rf $DIRNAME

git clone ${REF:+--reference $REF} \
	git://git.freedesktop.org/git/xorg/driver/xf86-video-ati $DIRNAME

GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
	| xz > $DIRNAME.tar.xz

# rm -rf $DIRNAME


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	13 Apr 2009 17:50:18 -0000	1.29
+++ .cvsignore	21 Aug 2009 03:29:10 -0000	1.30
@@ -1 +1 @@
-xf86-video-ati-6.12.2.tar.bz2
+xf86-video-ati-20090821.tar.xz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	13 Apr 2009 17:50:19 -0000	1.29
+++ sources	21 Aug 2009 03:29:11 -0000	1.30
@@ -1 +1 @@
-2bf50461378771497501ca7f678d36f3  xf86-video-ati-6.12.2.tar.bz2
+b2b452333f35258394111e57b5db90b6  xf86-video-ati-20090821.tar.xz


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -p -r1.181 -r1.182
--- xorg-x11-drv-ati.spec	4 Aug 2009 05:55:27 -0000	1.181
+++ xorg-x11-drv-ati.spec	21 Aug 2009 03:29:11 -0000	1.182
@@ -1,21 +1,22 @@
 %define tarball xf86-video-ati
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
+%define gitdate 20090821
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   21%{?dist}
+Release:   22%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:    http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+#Source0:    http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Source0: %{tarball}-%{gitdate}.tar.xz
 # unlike the other drivers, radeon.xinf is generated
 Source1:    mkxinf
 
-Patch0:     radeon-6.12.2-to-git.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
@@ -41,8 +42,7 @@ Obsoletes: xorg-x11-drv-avivo <= 0.0.2
 X.Org X11 ati video driver.
 
 %prep
-%setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .git
+%setup -q -n %{tarball}-%{gitdate}
 %patch6 -p1 -b .bgnr
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Aug 21 2009 Dave Airlie <airlied at redhat.com> 6.12.2-22
+- change to a git snapshot
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 6.12.2-21
 - ati: rebase to git master - need to fixup a few patches later
 


--- radeon-6.12.2-to-git.patch DELETED ---