[xorg-x11-server] Today's git snapshot xserver-1.12-xaa-sdk-headers.patch: drop, a55214d11916b

[Peter Hutterer]

commit b3d82f3676477945d0ff2609a93d8e390aaefff4
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Jan 24 08:41:11 2012 +1000

    Today's git snapshot
    xserver-1.12-xaa-sdk-headers.patch: drop, a55214d11916b

 .gitignore                         |    1 +
 commitid                           |    2 +-
 sources                            |    2 +-
 xorg-x11-server.spec               |   11 ++++---
 xserver-1.12-xaa-sdk-headers.patch |   50 ------------------------------------
 5 files changed, 9 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7a2e632..6b87d70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ xorg-server-1.9.1.tar.bz2
 /xorg-server-1.11.1.tar.bz2
 /xorg-server-20111109.tar.xz
 /xorg-server-20120103.tar.xz
+/xorg-server-20120124.tar.xz
diff --git a/commitid b/commitid
index 832a426..bda6144 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-98cde254acb9b98337ddecf64c138d38c14ec2bf
+954bb994842aa43a0f272858e65036c016b729a4
diff --git a/sources b/sources
index 2a150b8..b83e57c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d57316232fb6d617b844639456239a6  xorg-server-20120103.tar.xz
+6f5d63d685404c4232b7e60f70bcf579  xorg-server-20120124.tar.xz
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index f1ae363..0618c51 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -9,7 +9,7 @@
 # check out the master branch, pull, cherry-pick, and push.  FIXME describe
 # rebasing, add convenience 'make' targets maybe.
 
-%define gitdate 20120103
+%define gitdate 20120124
 %define stable_abi 0
 
 %if !0%{?gitdate} || %{stable_abi}
@@ -48,7 +48,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.11.99.901
-Release:   2%{?gitdate:.%{gitdate}}%{dist}
+Release:   3%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -98,9 +98,6 @@ Patch6030: xserver-1.6.99-right-of.patch
 # tests require Xorg
 Patch7007: xserver-1.10.99.1-test.patch
 
-# always install xaa headers even though we don't build the module
-Patch7012: xserver-1.12-xaa-sdk-headers.patch
-
 # Fix libselinux-triggered build error
 # RedHat/Fedora-specific patch
 Patch7013: xserver-1.12-Xext-fix-selinux-build-failure.patch
@@ -560,6 +557,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Jan 24 2012 Peter Hutterer <peter.hutterer at redhat.com> 1.11.99.901-3.20120124
+- Today's git snapshot
+- xserver-1.12-xaa-sdk-headers.patch: drop, a55214d11916b
+
 * Wed Jan 04 2012 Peter Hutterer <peter.hutterer at redhat.com> 1.11.99.901-2.20120103
 - xserver-1.12-Xext-fix-selinux-build-failure.patch: fix build error
   triggered by Red Hat-specific patch to libselinux