[xorg-x11-drv-ati] rebase to snapshot of git master (no UMS code)

[Dave Airlie]

commit a0fab99ed9e1234dc52ec1371d917ceb25f0fb2a
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Jun 29 16:03:38 2012 +0100

    rebase to snapshot of git master (no UMS code)

 .gitignore            |    1 +
 radeon-no-ums.patch   |   21 ---------------------
 sources               |    2 +-
 xorg-x11-drv-ati.spec |   15 ++++++++-------
 4 files changed, 10 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 401e965..d85d0be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ xf86-video-ati-20100705.tar.xz
 /xf86-video-ati-20120329.tar.xz
 /xf86-video-ati-20120417.tar.xz
 /xf86-video-ati-20120602.tar.xz
+/xf86-video-ati-20120629.tar.xz
diff --git a/sources b/sources
index 2ccf049..7a47435 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17df84f912a4f3c7ee49668aa6a2848a  xf86-video-ati-20120602.tar.xz
+e2f5d59b67110f315215ae73f1250c3e  xf86-video-ati-20120629.tar.xz
diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec
index 3d7bea0..a555d2e 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 20120602
-%define gitversion 930760942
+%define gitdate 20120629
+%define gitversion 5ebebfdb4
 
 %if 0%{?gitdate}
 %define gver .%{gitdate}git%{gitversion}
@@ -10,8 +10,8 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.14.4
-Release:   6%{?gver}%{?dist}
+Version:   7.0.0
+Release:   0.1%{?gver}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -21,7 +21,6 @@ Source0: %{tarball}-%{gitdate}.tar.xz
 
 Patch10:    radeon-6.12.2-lvds-default-modes.patch
 Patch13:    fix-default-modes.patch
-Patch14:    radeon-no-ums.patch
 
 ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
 
@@ -36,7 +35,7 @@ BuildRequires: libudev-devel
 
 Requires: Xorg %(xserver-sdk-abi-requires ansic)
 Requires: Xorg %(xserver-sdk-abi-requires videodrv)
-Requires: libdrm >= 2.4.33-1
+Requires: libdrm >= 2.4.36-1
 
 %description 
 X.Org X11 ati video driver.
@@ -45,7 +44,6 @@ X.Org X11 ati video driver.
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{?!gitdate:%{version}}
 %patch10 -p1 -b .lvds
 %patch13 -p1 -b .def
-%patch14 -p1 -b .no-ums
 
 %build
 autoreconf -iv
@@ -73,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Fri Jun 29 2012 Dave Airlie <airlied at redhat.com> 7.0.0-0.1
+- rebase to snapshot of git master (no UMS code)
+
 * Sat Jun 02 2012 Dave Airlie <airlied at redhat.com> 6.14.4-6
 - update to latest master to fix plymouth->gdm handover.