[xorg-x11-drv-ati] rebase to master includes ppc evergreen fix.

[Dave Airlie]

commit 47e327ddd6897ac3cff1621e762a34dcbcf76ea2
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Nov 25 13:25:53 2011 +0000

    rebase to master includes ppc evergreen fix.

 .gitignore            |    1 +
 sources               |    2 +-
 xorg-x11-drv-ati.spec |   15 +++++++++------
 3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 585bf1c..0bed800 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ xf86-video-ati-20100705.tar.xz
 /xf86-video-ati-20110504.tar.xz
 /xf86-video-ati-20110727.tar.xz
 /xf86-video-ati-6.14.3.tar.bz2
+/xf86-video-ati-20111125.tar.xz
diff --git a/sources b/sources
index 5765533..65c9592 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19126c8421a05d9605883dcf7498d876  xf86-video-ati-6.14.3.tar.bz2
+cf2e5d9b1cd7c49a0429ac51a3ade2a2  xf86-video-ati-20111125.tar.xz
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index a51909b..a2fc6f9 100644
--- a/xorg-x11-drv-ati.spec
+++ b/xorg-x11-drv-ati.spec
@@ -1,8 +1,8 @@
 %define tarball xf86-video-ati
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
-#define gitdate 20110727
-#define gitversion 8c9266ed2
+%define gitdate 20111125
+%define gitversion 534fb6e41
 
 %if 0%{?gitdate}
 %define gver .%{gitdate}git%{gitversion}
@@ -11,13 +11,13 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.14.3
-Release:   2%{?gver}%{?dist}
+Release:   3%{?gver}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 
-Source0:    http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-#Source0: %{tarball}-%{gitdate}.tar.xz
+#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
 
@@ -54,7 +54,7 @@ X.Org X11 ati video driver.
 %patch13 -p1 -b .def
 
 %build
-# autoreconf -iv
+autoreconf -iv
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Nov 25 2011 Dave Airlie <airlied at redhat.com> 6.14.3-3.20111125git534fb6e41
+- rebase to master includes ppc evergreen fix.
+
 * Mon Nov 14 2011 Adam Jackson <ajax at redhat.com> - 6.14.3-2
 - ABI rebuild