[xorg-x11-server] xserver 1.12

[Peter Hutterer]

commit 9add1434c2a2cfb48166784a5395f017fa500689
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Mar 5 16:01:20 2012 +1000

    xserver 1.12
    
    - xserver-1.12-dix-reset-last.scroll-when-resetting-the-valuator-45.patch:
      drop, 6f2838818

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 xorg-x11-server.spec                               |   14 +++---
 ...ast.scroll-when-resetting-the-valuator-45.patch |   47 --------------------
 4 files changed, 10 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9d9355b..39afc54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ xorg-server-1.9.1.tar.bz2
 /xorg-server-20120103.tar.xz
 /xorg-server-20120124.tar.xz
 /xorg-server-20120215.tar.xz
+/xorg-server-1.12.0.tar.bz2
diff --git a/sources b/sources
index 95ebe07..6681ac7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c1392aeef04d011b4a79f010c157dab  xorg-server-20120215.tar.xz
+3a3c4281f32c8702749e8f129372a355  xorg-server-1.12.0.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index b6f3d22..989b0c3 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 20120215
+#define gitdate 20120215
 %define stable_abi 1
 
 %if !0%{?gitdate} || %{stable_abi}
@@ -47,8 +47,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.11.99.903
-Release:   2%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.12.0
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -102,9 +102,6 @@ Patch7007: xserver-1.10.99.1-test.patch
 # RedHat/Fedora-specific patch
 Patch7013: xserver-1.12-Xext-fix-selinux-build-failure.patch
 
-# Bug 788632 - all scrolled windows jump up one page after you middle click a link
-Patch7014: xserver-1.12-dix-reset-last.scroll-when-resetting-the-valuator-45.patch
-
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -566,6 +563,11 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Mar 05 2012 Peter Hutterer <peter.hutterer at redhat.com> 1.12.0-1
+- xserver 1.12
+- xserver-1.12-dix-reset-last.scroll-when-resetting-the-valuator-45.patch:
+  drop, 6f2838818
+
 * Thu Feb 16 2012 Adam Jackson <ajax at redhat.com> 1.11.99.903-2.20120215
 - Don't pretend int10 is a thing on non-PC arches