[xorg-x11-drv-mga] mga 1.6.1

[Dave Airlie]

commit da78baa9905f6410bf5ca5224901b7b4f2763d83
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jul 18 03:38:32 2012 -0400

    mga 1.6.1

 .gitignore                                         |    1 +
 ...ind-to-device-if-there-is-a-kernel-driver.patch |   35 -----
 mga-1.4.6.1-get-client-pointer.patch               |  150 --------------------
 sources                                            |    2 +-
 xorg-x11-drv-mga.spec                              |    7 +-
 5 files changed, 6 insertions(+), 189 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e962bf8..d3bf5b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xf86-video-mga-1.4.11.tar.bz2
 xf86-video-mga-1.4.13.tar.bz2
 /xf86-video-mga-20120104.tar.bz2
+/xf86-video-mga-1.6.1.tar.bz2
diff --git a/sources b/sources
index daf5c29..64ab5c6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13ba37132d7aa6ba693b35ec73ee6fe6  xf86-video-mga-20120104.tar.bz2
+ef4f727f5408c6ab11c28fe98b6b4fb8  xf86-video-mga-1.6.1.tar.bz2
diff --git a/xorg-x11-drv-mga.spec b/xorg-x11-drv-mga.spec
index 2bc399d..0bc0cd6 100644
--- a/xorg-x11-drv-mga.spec
+++ b/xorg-x11-drv-mga.spec
@@ -7,7 +7,7 @@
 
 Summary:   Xorg X11 mga video driver
 Name:      xorg-x11-drv-mga
-Version:   1.5.0
+Version:   1.6.1
 Release:   1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 URL:       http://www.x.org
 License: MIT
@@ -23,7 +23,6 @@ Source0:   http://x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
 Patch0: mga-1.4.5-no-hal-advertising.patch
 Patch2: mga-1.4.12-bigendian.patch
-Patch3: 0001-mga-don-t-bind-to-device-if-there-is-a-kernel-driver.patch
 
 ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
 
@@ -42,7 +41,6 @@ X.Org X11 mga video driver.
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 %patch0 -p1 -b .hal
 %patch2 -p1 -b .bigendian
-%patch3 -p1 -b .nokms
 
 %build
 autoreconf -v --install || exit 1
@@ -65,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/mga.4*
 
 %changelog
+* Wed Jul 18 2012 Dave Airlie <airlied at redhat.com> 1.6.1-1
+- mga 1.6.1
+
 * Fri May 25 2012 Dave Airlie <airlied at redhat.com> 1.5.0-1
 - rebase to 1.5.0 + add don't bind to KMS driver support