From 665646fbd2c86d023ec753d858f8f4bd7997457a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Feb 08 2012 22:42:10 +0000
Subject: xserver 1.11.4

xserver-1.11.2-record-crasher.patch: drop, 53e347b22bb7
xserver-1.11.2-dix-button-state-must-show-the-logical-buttons-not-p.patch:
drop, 4b3866102

---

diff --git a/.gitignore b/.gitignore
index 2024d18..a6ea0b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ xorg-server-1.9.1.tar.bz2
 /xorg-server-1.11.2.tar.bz2
 /xorg-server-1.11.2.902.tar.bz2
 /xorg-server-1.11.3.tar.bz2
+/xorg-server-1.11.4.tar.bz2
diff --git a/sources b/sources
index 9a02760..db58d6c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a7194c437963627e1db0dd2d6c1a1984  xorg-server-1.11.3.tar.bz2
+256325e9b17dff479d92bed97f6b0adb  xorg-server-1.11.4.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 6c59834..f257fac 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -29,7 +29,7 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.11.3
+Version:   1.11.4
 Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
@@ -87,13 +87,6 @@ Patch7007: xserver-1.10.99.1-test.patch
 # Submitted to upstream but not merged for 1.11
 Patch7009: xserver-1.10.99-config-add-udev-systemd-multi-seat-support.patch
 
-# BUg #714746: Xorg crash in record when ProcDRI2WaitMSCReply called
-Patch7012: xserver-1.11.2-record-crasher.patch
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=655928, XI2 button state is
-# incorrect if the pointer is mapped
-Patch7013: xserver-1.11.2-dix-button-state-must-show-the-logical-buttons-not-p.patch
-
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -558,6 +551,12 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Thu Feb 09 2012 Peter Hutterer <peter.hutterer@redhat.com> 1.11.4-1
+- xserver 1.11.4
+- xserver-1.11.2-record-crasher.patch: drop, 53e347b22bb7
+- xserver-1.11.2-dix-button-state-must-show-the-logical-buttons-not-p.patch:
+  drop, 4b3866102
+
 * Mon Dec 19 2011 Peter Hutterer <peter.hutterer@redhat.com> 1.11.3-1
 - xserver 1.11.3
 - xserver-1.11.2-dix-button-state-must-show-the-logical-buttons-not-p.patch: