[xorg-x11-server] Git snapshot 20140428

[Hans de Goede]

commit cec8696bb8a9281515bc377f88b9fe9e6e0648f4
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Apr 25 16:14:45 2014 +0200

    Git snapshot 20140428
    
    - This fixes the silent hardware cursor API break in 1.15.99.902 (#1090897)

 ...-Make-the-suid-root-wrapper-always-start-.patch |    2 +-
 Xorg.wrap.man                                      |   67 --------------
 Xwrapper.config.man                                |    1 -
 commitid                                           |    2 +-
 glamor_font.h                                      |   49 ----------
 glamor_program.h                                   |   94 --------------------
 glamor_transform.h                                 |   87 ------------------
 sources                                            |    2 +-
 xorg-x11-server.spec                               |   28 +++----
 9 files changed, 14 insertions(+), 318 deletions(-)
---
diff --git a/0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch b/0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
index 6502426..831652f 100644
--- a/0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
+++ b/0001-Fedora-hack-Make-the-suid-root-wrapper-always-start-.patch
@@ -35,7 +35,7 @@ index 90c8c11..539bfe4 100644
 -    int needs_root_rights = -1;
 +    int needs_root_rights = 1;
  
-     parse_config(&allowed, &needs_root_rights);
+     progname = argv[0];
  
 -- 
 1.9.0
diff --git a/commitid b/commitid
index e493f49..38fa58f 100644
--- a/commitid
+++ b/commitid
@@ -1 +1 @@
-90642948cc78834d95f7a3bddaac7ff77b68ed7e
+4c3932620c29c91dfbbc8eb09c84efcaa7ec873e
diff --git a/sources b/sources
index f5269ff..3c44991 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-180e40ae77dd163452f6e8fcf1fc8b18  xorg-server-1.15.99.902.tar.bz2
+2c67326a5a3cd84d3d554a7b3c947f8d  xorg-server-20140428.tar.xz
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index aec7bfd..be7ba86 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -8,7 +8,7 @@
 # format, and add a PatchN: line.  If you want to push something upstream,
 # check out the master branch, pull, cherry-pick, and push.
 
-#global gitdate 20131118
+%global gitdate 20140428
 %global stable_abi 1
 
 %if !0%{?gitdate} || %{stable_abi}
@@ -42,7 +42,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.15.99.902
-Release:   3%{?gitdate:.%{gitdate}}%{dist}
+Release:   4%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -51,8 +51,8 @@ Group:     User Interface/X
 %if 0%{?gitdate}
 # git snapshot.  to recreate, run:
 # ./make-git-snapshot.sh `cat commitid`
-#Source0:   xorg-server-%{gitdate}.tar.xz
-Source0:   http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
+Source0:   xorg-server-%{gitdate}.tar.xz
+#Source0:   http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
 Source1:   make-git-snapshot.sh
 Source2:   commitid
 %else
@@ -74,13 +74,7 @@ Source31: xserver-sdk-abi-requires.git
 # maintainer convenience script
 Source40: driver-abi-rebuild.sh
 
-# workaround for make dist bug in 1.15.99.902, remove once fixed
-Source50: Xorg.wrap.man
-Source51: Xwrapper.config.man
-Source52: glamor_font.h
-Source53: glamor_program.h
-Source54: glamor_transform.h
-
+# Fix pending upstream
 Patch1: 0001-Fix-compilation-of-int10-module-on-arm.patch
 
 # Trivial things to never merge upstream ever:
@@ -341,8 +335,8 @@ Xserver source code needed to build VNC server (Xvnc)
 
 
 %prep
-#setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-%setup -q -n %{pkgname}-%{version}
+%setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+#setup -q -n %{pkgname}-%{version}
 
 #if 0%{?gitdate}
 %if 0
@@ -363,10 +357,6 @@ git add .
 git commit -a -q -m "%{version} baseline."
 %endif
 
-# workaround for make dist bug in 1.15.99.902, remove once fixed
-cp %{SOURCE50} %{SOURCE51} hw/xfree86/man
-cp %{SOURCE52} %{SOURCE53} %{SOURCE54} glamor
-
 # Apply all the patches.
 git am -p1 %{patches} < /dev/null
 
@@ -617,6 +607,10 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 
 
 %changelog
+* Mon Apr 28 2014 Hans de Goede <hdegoede at redhat.com> - 1.15.99.902-4.20140428
+- Git snapshot 20140428
+- This fixes the silent hardware cursor API break in 1.15.99.902 (#1090897)
+
 * Fri Apr 25 2014 Hans de Goede <hdegoede at redhat.com> - 1.15.99.902-3
 - Add missing BuildRequires for dbus-devel, libepoxy-devel, mesa-libEGL-devel,
   mesa-libgbm-devel and systemd-devel