require sshfs and x86_64: patch for nx libs path, kde path and openmamba in Xsession [release 4.0.1.19-2mamba;Thu Apr 07 2016]

x2goserver-4.0.1.19-kde-path.patch

@@ -0,0 +1,44 @@
+--- x2goserver-4.0.1.19/x2goserver/bin/x2goruncommand.orig	2016-04-08 00:34:39.358892294 +0200
++++ x2goserver-4.0.1.19/x2goserver/bin/x2goruncommand	2016-04-08 00:36:02.377865986 +0200
+@@ -189,7 +189,7 @@
+ elif [ "$cmd" == "MATE" ]; then
+ 	cmd="/usr/bin/mate-session"
+ elif [ "$cmd" == "KDE" ]; then
+-	cmd="/usr/bin/startkde"
++	cmd="/opt/kde/bin/startkde"
+ elif [ "$cmd" == "XFCE4" ] || [ "$cmd" == "XFCE" ]; then
+ 	cmd="/usr/bin/xfce4-session"
+ elif [ "$cmd" == "LXDE" ]; then
+@@ -211,8 +211,8 @@
+ 		cmd="/usr/bin/firefox"
+ 	elif  [ -e "/usr/bin/abrowser" ]; then
+ 		cmd="/usr/bin/abrowser"
+-	elif  [ -e "/usr/bin/konqueror" ]; then
+-		cmd="/usr/bin/konqueror"
++	elif  [ -e "/opt/kde/bin/konqueror" ]; then
++		cmd="/opt/kde/bin/konqueror"
+ 	elif  [ -e "/usr/bin/galeon" ]; then
+ 		cmd="/usr/bin/galeon"
+ 	elif  [ -e "/usr/bin/chromium-browser" ]; then
+@@ -225,8 +225,8 @@
+ 		cmd="/usr/bin/thunderbird"
+ 	elif  [ -e "/usr/bin/icedove" ]; then
+ 		cmd="/usr/bin/icedove"
+-	elif  [ -e "/usr/bin/kmail" ]; then
+-		cmd="/usr/bin/kmail"
++	elif  [ -e "/opt/kde/bin/kmail" ]; then
++		cmd="/opt/kde/bin/kmail"
+ 	elif  [ -e "/usr/bin/evolution" ]; then
+ 		cmd="/usr/bin/evolution"
+ 	fi
+@@ -241,8 +241,8 @@
+ fi
+ 
+ if [ "$cmd" == "TERMINAL" ]; then
+-	if [ -e "/usr/bin/konsole" ]; then
+-		cmd="/usr/bin/konsole"
++	if [ -e "/opt/kde/bin/konsole" ]; then
++		cmd="/opt/kde/bin/konsole"
+ 	elif  [ -e "/usr/bin/mate-terminal" ]; then
+ 		cmd="/usr/bin/mate-terminal"
+ 	elif  [ -e "/usr/bin/gnome-terminal" ]; then

x2goserver-4.0.1.19-openmamba-enable.patch

@@ -0,0 +1,11 @@
+--- x2goserver-4.0.1.19/x2goserver-xsession/etc/Xsession.orig	2016-04-08 01:06:59.309430045 +0200
++++ x2goserver-4.0.1.19/x2goserver-xsession/etc/Xsession	2016-04-08 01:07:29.785415078 +0200
+@@ -130,7 +130,7 @@
+ 		done
+ 		set -e
+ 	fi
+-elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
++elif [ -f /etc/openmamba-release ] || [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE-brand ] || [ -f /etc/SuSE-release ]; then
+ 
+ 	# define a fallback... (should never be needed). The XSESSION_EXEC var gets set in
+ 	# X2Go's x2goruncommand script and can be used with obsolete switchdesk or with

x2goserver-x86_64-lib-nx.patch

@@ -0,0 +1,13 @@
+--- x2goserver-4.0.1.19/x2goserver/bin/x2gopath.orig	2016-04-07 23:37:29.800912417 +0200
++++ x2goserver-4.0.1.19/x2goserver/bin/x2gopath	2016-04-07 23:37:39.453914084 +0200
+@@ -36,8 +36,8 @@
+ 	"lib") printf '%s' "$base/lib/x2go";;
+ 	"libexec") printf '%s' "$base/lib/x2go";;
+ 	"share") printf '%s' "$base/share/x2go";;
+-	"nx-x11") printf '%s' "$base/lib/nx/X11";;
+-	"xinerama") printf '%s' "$base/lib/nx/X11/Xinerama";;
++	"nx-x11") printf '%s' "$base/lib64/nx/X11";;
++	"xinerama") printf '%s' "$base/lib64/nx/X11/Xinerama";;
+ 	*) exit 1;;
+ esac;
+ 

x2goserver.spec

@@ -5,7 +5,7 @@
 
 Name:          x2goserver
 Version:       4.0.1.19
-Release:       1mamba
+Release:       2mamba
 Summary:       A Remote Desktop server
 Group:         System/Servers
 Vendor:        openmamba
@@ -13,6 +13,9 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://wiki.x2go.org/
 Source:        http://code.x2go.org/releases/source/x2goserver/x2goserver-%{version}.tar.gz
+Patch0:        x2goserver-x86_64-lib-nx.patch
+Patch1:        x2goserver-4.0.1.19-kde-path.patch
+Patch2:        x2goserver-4.0.1.19-openmamba-enable.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -26,6 +29,7 @@ BuildRequires: perl-devel
 ## AUTOBUILDREQ-END
 Requires:      perl-DBD-SQLite
 Requires:      nx-libs
+Requires:      sshfs
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -33,6 +37,11 @@ X2Go is a Remote Desktop server.
 
 %prep
 %setup -q
+%ifarch x86_64
+%patch0 -p1
+%endif
+%patch1 -p1
+%patch2 -p1
 
 %build
 %make PREFIX=%{_prefix}
@@ -111,5 +120,8 @@ exit 0
 %doc COPYING
 
 %changelog
+* Thu Apr 07 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.1.19-2mamba
+- require sshfs and x86_64: patch for nx libs path, kde path and openmamba in Xsession
+
 * Thu Nov 26 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 4.0.1.19-1mamba
 - package created using the webbuild interface