[xorg-x11-server] xserver 1.9.0

[Peter Hutterer]

commit c6ce83d02afcce8a2613d69a23a80db54de5a833
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Aug 23 09:08:26 2010 +1000

    xserver 1.9.0
    
    xserver-1.9-reset-root-null.patch: drop, upstream.

 .gitignore                        |    1 +
 sources                           |    2 +-
 xorg-x11-server.spec              |    9 ++++--
 xserver-1.9-reset-root-null.patch |   59 -------------------------------------
 4 files changed, 8 insertions(+), 63 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 74001e1..dd40231 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xorg-server-20100716.tar.xz
 xorg-server-1.8.99.906.tar.bz2
+xorg-server-1.9.0.tar.bz2
diff --git a/sources b/sources
index 9edbba7..8807af4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4ab361cacc35e2ed4587019980b7e57  xorg-server-1.8.99.906.tar.bz2
+ba1173998a5a4216fd7b40eded96697e  xorg-server-1.9.0.tar.bz2
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index af2e324..a0fde8d 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -29,8 +29,8 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.8.99.906
-Release:   2%{?gitdate:.%{gitdate}}%{dist}
+Version:   1.9.0
+Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -97,7 +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
-Patch7001: xserver-1.9-reset-root-null.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -547,6 +546,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Aug 23 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.9.0-1
+- xserver 1.9.0
+- xserver-1.9-reset-root-null.patch: drop, upstream.
+
 * Mon Aug 16 2010 Dave Airlie <airlied at redhat.com> 1.8.99.906-2
 - fix use-after-free for root window - hopefully fix (#596985)