From 644a86f3cca5a7d273aae978f505b19be5a842b7 Mon Sep 17 00:00:00 2001
From: Jonathan Underwood <jonathan.underwood@gmail.com>
Date: May 26 2015 14:19:29 +0000
Subject: Add patch to correctly locate Xorg binary in Fedora 22 onwards (BZ 1224678)


---

diff --git a/xpra-0.14.22-fedora22-xorg.patch b/xpra-0.14.22-fedora22-xorg.patch
new file mode 100644
index 0000000..8abd7c4
--- /dev/null
+++ b/xpra-0.14.22-fedora22-xorg.patch
@@ -0,0 +1,19 @@
+diff -up xpra-0.14.22/scripts/xpra_Xdummy.orig2 xpra-0.14.22/scripts/xpra_Xdummy
+--- xpra-0.14.22/scripts/xpra_Xdummy.orig2	2015-05-26 14:48:03.916843869 +0100
++++ xpra-0.14.22/scripts/xpra_Xdummy	2015-05-26 14:50:23.657805625 +0100
+@@ -35,8 +35,13 @@ find_ld_linux() {
+ 	fi
+ }
+ 
+-if [ -x "/usr/libexec/Xorg.bin" ]; then
+-	#Fedora 21+ workaround where /usr/bin/Xorg is not suid
++if [ -x "/usr/libexec/Xorg" ]; then
++	#Fedora 22+ workaround where /usr/bin/Xorg is not suid
++	#because it is a script, which calls /usr/libexec/Xorg.wrap
++	#which is setuid, and which eventually calls this one:
++	XORG_BIN="/usr/libexec/Xorg"
++elif [ -x "/usr/libexec/Xorg.bin" ]; then
++	#Fedora 21 workaround where /usr/bin/Xorg is not suid
+ 	#because it is a script, which calls /usr/libexec/Xorg.wrap
+ 	#which is setuid, and which eventually calls this one:
+ 	XORG_BIN="/usr/libexec/Xorg.bin"
diff --git a/xpra.spec b/xpra.spec
index 1d2172e..61472f0 100644
--- a/xpra.spec
+++ b/xpra.spec
@@ -22,7 +22,7 @@
 
 Name:           xpra
 Version:        0.14.22
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Remote display server for applications and desktops
 
 License:        GPLv2+ and BSD and LGPLv3+ and MIT
@@ -39,8 +39,12 @@ Patch1:         %{name}-unbundle-rencode.patch
 Patch2:         xpra-0.14-stop-using-void-driver.patch
 # This patch fixes up the paragraphs to end with a period so the
 # validation doesn't bail. It also expands the text to be more
-# helpful.
+# helpful - will be included in 0.14.24.
 Patch3:         xpra-0.14.22-appdata.patch
+# This patch fixes:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1224678
+# https://www.xpra.org/trac/ticket/872
+Patch4:         xpra-0.14.22-fedora22-xorg.patch
 
 BuildRequires:  python2-devel pygobject2-devel pygtk2-devel
 BuildRequires:  libXtst-devel
@@ -96,6 +100,7 @@ network bandwidth constraints.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 #use the system python-rencode
 rm -f xpra/net/rencode/*
@@ -204,6 +209,9 @@ fi
 
 
 %changelog
+* Tue May 26 2015 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 0.14.22-5
+- Add patch to correctly locate Xorg binary in Fedora 22 onwards (BZ 1224678)
+
 * Tue Apr 28 2015 Jonathan G. Underwood <jonathan.underwood@gmail.com> - 0.14.22-4
 - Patch appdata file to have more information and proper paragraph
   ending period so validation works