[xorg-x11-server] xserver 1.8.99.906

[Peter Hutterer]

commit 66f6b1c8a4dd899620deea629ef20966eabe1597
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Aug 13 17:02:28 2010 +1000

    xserver 1.8.99.906
    
    xserver-1.8-enter-leave-woes.patch: drop, upstream.

 .gitignore                         |    1 +
 sources                            |    2 +-
 xorg-x11-server.spec               |   13 ++--
 xserver-1.8-enter-leave-woes.patch |  120 ------------------------------------
 4 files changed, 9 insertions(+), 127 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7decd59..74001e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xorg-server-20100716.tar.xz
+xorg-server-1.8.99.906.tar.bz2
diff --git a/sources b/sources
index a938be5..9edbba7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3dfe6f7d8a922d804bca4e3e85415d1c  xorg-server-20100716.tar.xz
+d4ab361cacc35e2ed4587019980b7e57  xorg-server-1.8.99.906.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 4f39cf8..a998bbc 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -25,12 +25,12 @@
 %define extension_minor 0
 
 %define pkgname xorg-server
-%define gitdate 20100716
+#define gitdate 20100716
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.8.99.905
-Release:   3%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.8.99.906
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -97,9 +97,6 @@ Patch6053: xserver-1.8-disable-vboxvideo.patch
 
 # https://bugs.freedesktop.org/show_bug.cgi?id=28672
 Patch7000: xserver-1.8.0-no-xorg.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=538482
-# this patch needs some exposure for side-effects before upstreaming
-Patch7001: xserver-1.8-enter-leave-woes.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -549,6 +546,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Aug 13 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.8.99.906-1
+- xserver 1.8.99.906
+- xserver-1.8-enter-leave-woes.patch: drop, upstream.
+
 * Mon Aug 02 2010 Adam Jackson <ajax at redhat.com> 1.8.99.905-3
 - Drop RANDR debugging patch, not useful.