[xorg-x11-server] Fix startx crash introduced by 1.15.99.904 (rhbz#1118540)

[Hans de Goede]

commit 8456581c5795e90535595d8dd1a9c27f8ac86211
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Jul 11 10:46:30 2014 +0200

    Fix startx crash introduced by 1.15.99.904 (rhbz#1118540)

 ...TRIB_DRIVER-overlapping-with-ODEV_ATTRIB_.patch |   29 ++++++++++++++++++++
 xorg-x11-server.spec                               |    8 +++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/0003-Fix-ODEV_ATTRIB_DRIVER-overlapping-with-ODEV_ATTRIB_.patch b/0003-Fix-ODEV_ATTRIB_DRIVER-overlapping-with-ODEV_ATTRIB_.patch
new file mode 100644
index 0000000..8bc280f
--- /dev/null
+++ b/0003-Fix-ODEV_ATTRIB_DRIVER-overlapping-with-ODEV_ATTRIB_.patch
@@ -0,0 +1,29 @@
+From 3e4e029cca08e97ede67d19020476cd460eec00f Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Fri, 11 Jul 2014 09:49:13 +0200
+Subject: [PATCH 3/3] Fix ODEV_ATTRIB_DRIVER overlapping with ODEV_ATTRIB_FD
+
+Looks like the value of ODEV_ATTRIB_DRIVER was not updated when the patch
+adding it got rebased on top of a newer server version.
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ include/hotplug.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/hotplug.h b/include/hotplug.h
+index c4268a0..b2c0d78 100644
+--- a/include/hotplug.h
++++ b/include/hotplug.h
+@@ -88,7 +88,7 @@ config_odev_free_attributes(struct OdevAttributes *attribs);
+ /* Minor number of the device node pointed to by ODEV_ATTRIB_PATH */
+ #define ODEV_ATTRIB_MINOR 6
+ /* kernel driver name */
+-#define ODEV_ATTRIB_DRIVER 4
++#define ODEV_ATTRIB_DRIVER 7
+ 
+ typedef void (*config_odev_probe_proc_ptr)(struct OdevAttributes *attribs);
+ void config_odev_probe(config_odev_probe_proc_ptr probe_callback);
+-- 
+2.0.0
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 36007a4..27ba3f3 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -42,7 +42,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.15.99.904
-Release:   2%{?gitdate:.%{gitdate}}%{dist}
+Release:   3%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -80,6 +80,9 @@ Patch0001: 0001-headers-Fix-build-errors-with-latest-glibc.patch
 # Revert of a touchpad motion scaling fix with known issues (rhbz#1104789)
 Patch0002: 0002-Revert-dix-fix-up-coordinate-scaling-when-external-m.patch
 
+# Submitted upstream
+Patch0003: 0003-Fix-ODEV_ATTRIB_DRIVER-overlapping-with-ODEV_ATTRIB_.patch
+
 # Trivial things to never merge upstream ever:
 # This really could be done prettier.
 Patch5002: xserver-1.4.99-ssh-isnt-local.patch
@@ -623,6 +626,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Fri Jul 11 2014 Hans de Goede <hdegoede at redhat.com> - 1.15.99.904-3
+- Fix startx crash introduced by 1.15.99.904 (rhbz#1118540)
+
 * Fri Jul 11 2014 Peter Hutterer <peter.hutterer at redhat.com> 1.15.99.904-2
 - Don't  force the screensaver off on DPMS unblank