[xorg-x11-server] xserver 1.14RC1

[Adam Jackson]

commit bd41e025fa4cf5009cc1273c47802551ea9a86c5
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jan 9 18:20:13 2013 -0500

    xserver 1.14RC1

 ...r-ioctl-KDSKBMUTE-1-over-ioctl-KDSKBMODE-.patch |   86 ----------
 0001-linux-Refactor-xf86-En-Dis-ableIO.patch       |  136 ----------------
 ...f86-Fix-build-against-recent-Linux-kernel.patch |   35 ----
 0002-linux-Make-failure-to-iopl-non-fatal.patch    |   40 -----
 ...nge-the-semantics-of-driverFunc-GET_REQUI.patch |  163 --------------------
 commitid                                           |    2 +-
 driver-abi-rebuild.sh                              |    9 +-
 xorg-x11-server.spec                               |   21 +--
 8 files changed, 16 insertions(+), 476 deletions(-)
---
diff --git a/commitid b/commitid
index 21cf3d4..a440709 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-6619f5c0e1086b57888ff7146e8ed5897b50d440
+6703a7c7cf1a349c137e247a0c8eb462ff7b07be
diff --git a/driver-abi-rebuild.sh b/driver-abi-rebuild.sh
index b8b0109..b8062d4 100755
--- a/driver-abi-rebuild.sh
+++ b/driver-abi-rebuild.sh
@@ -6,7 +6,14 @@
 mkdir -p abi-rebuild
 pushd abi-rebuild
 
-repoquery --qf="%{name}" --whatrequires xserver-abi\* | xargs -n 1 fedpkg co
+fedpkg co xorg-x11-drivers
+pushd xorg-x11-drivers
+driverlist=$(grep ^Requires *.spec | awk '{ print $2 }')
+popd
+
+rm -rf xorg-x11-drivers
+echo $driverlist | xargs -n1 fedpkg co
+
 for i in */ ; do
     [ -e $i/dead.package ] && continue
     pushd $i
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 9142025..08facd6 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -6,11 +6,10 @@
 # If you need to add a patch to the server, just do it like a normal git
 # operation, dump it with git-format-patch to a file in the standard naming
 # format, and add a PatchN: line.  If you want to push something upstream,
-# check out the master branch, pull, cherry-pick, and push.  FIXME describe
-# rebasing, add convenience 'make' targets maybe.
+# check out the master branch, pull, cherry-pick, and push.
 
-#global gitdate 20120822
-%global stable_abi 1
+%global gitdate 20130109
+%global stable_abi 0
 
 %if !0%{?gitdate} || %{stable_abi}
 # Released ABI versions.  Have to keep these manually in sync with the
@@ -42,7 +41,7 @@
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.13.1
+Version:   1.13.99.901
 Release:   1%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
@@ -92,9 +91,6 @@ Patch7013: xserver-1.12-Xext-fix-selinux-build-failure.patch
 # needed when building without xorg (aka s390x)
 Patch7017: xserver-1.12.2-xorg-touch-test.patch
 
-Patch7022: 0001-linux-Refactor-xf86-En-Dis-ableIO.patch
-Patch7023: 0002-linux-Make-failure-to-iopl-non-fatal.patch
-Patch7024: 0003-xfree86-Change-the-semantics-of-driverFunc-GET_REQUI.patch
 Patch7025: 0001-Always-install-vbe-and-int10-sdk-headers.patch
 
 # do not upstream - do not even use here yet
@@ -102,15 +98,9 @@ Patch7027: xserver-autobind-hotplug.patch
 
 Patch7052: 0001-xf86-return-NULL-for-compat-output-if-no-outputs.patch
 
-# kernel doesn't use _INPUT_H anymore
-Patch7060:  0001-xf86-Fix-build-against-recent-Linux-kernel.patch
-
 # Fix non-PCI configuration-less setups - broken
 #Patch7061:  v2-xf86-Fix-non-PCI-configuration-less-setups.patch
 
-# Bug 878956 - After installation is complete, Alt+F4 is broken
-Patch7063: 0001-linux-Prefer-ioctl-KDSKBMUTE-1-over-ioctl-KDSKBMODE-.patch
-
 # mustard: make the default queue length bigger to calm abrt down
 Patch7064: 0001-mieq-Bump-default-queue-size-to-512.patch
 
@@ -592,6 +582,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Wed Jan 09 2013 Adam Jackson <ajax at redhat.com> 1.13.99.901-1
+- xserver 1.14RC1
+
 * Tue Dec 18 2012 Peter Hutterer <peter.hutterer at redhat.com> 1.13.1-1
 - server 1.13.1