[x2goserver] Disable Xsession support for now - Debian specific (Bug #1038834)

[Orion Poplawski]

commit 61cf400b7229802609c6421a14121706727c3972
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sat Dec 7 22:32:41 2013 -0700

    Disable Xsession support for now - Debian specific (Bug #1038834)

 x2goserver.spec |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/x2goserver.spec b/x2goserver.spec
index cd4ea85..7b5e3fa 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -1,7 +1,7 @@
 #global checkout 20130722git65169c9
 Name:           x2goserver
 Version:        4.0.1.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        X2Go server daemon scripts
 
 Group:          Applications/Communications
@@ -87,14 +87,15 @@ server).
 %patch0 -p1 -b .pwgen
 %patch1 -p1 -b .mktemp
 
-# Set pach
-#find -type f | xargs sed -i -r -e '/^((LIBDIR|X2GO_LIB_PATH)=|use lib|my \$x2go_lib_path)/s,/lib/,/%{_lib}/,'
+# Set path
 find -type f | xargs sed -i -r -e '/^LIBDIR=/s,/lib/,/%{_lib}/,'
 sed -i -e 's,/lib/,/%{_lib}/,' x2goserver/bin/x2gopath
 # Don't try to be root
 sed -i -e 's/-o root -g root//' */Makefile
 # Perl pure_install
 sed -i -e 's/perl install/perl pure_install/' Makefile
+# Do not ship xsession - Debian specific
+sed -i -e '/xsession/s/^/#/' Makefile
 
 
 %build
@@ -105,9 +106,9 @@ make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%
 %install
 make install DESTDIR=%{buildroot} PREFIX=%{_prefix} XSESSIONDIR=/etc/X11/xinit/Xclients.d
 
-# Make symbolic link relative
-rm %{buildroot}%{_sysconfdir}/x2go/Xresources
-ln -s ../X11/Xresources %{buildroot}%{_sysconfdir}/x2go/
+# Make symbolic link relative (xsession - disabled for now)
+#rm %{buildroot}%{_sysconfdir}/x2go/Xresources
+#ln -s ../X11/Xresources %{buildroot}%{_sysconfdir}/x2go/
 
 # Remove placeholder files
 rm %{buildroot}%{_libdir}/x2go/extensions/*.d/.placeholder
@@ -178,10 +179,11 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver
 %dir %{_sysconfdir}/x2go/
 %config(noreplace) %{_sysconfdir}/x2go/x*
-%config(noreplace) %{_sysconfdir}/x2go/Xsession.options
-%{_sysconfdir}/x2go/Xresources
-%{_sysconfdir}/x2go/Xsession
-%{_sysconfdir}/x2go/Xsession.d
+# xsession - disabled for now
+#%config(noreplace) %{_sysconfdir}/x2go/Xsession.options
+#%{_sysconfdir}/x2go/Xresources
+#%{_sysconfdir}/x2go/Xsession
+#%{_sysconfdir}/x2go/Xsession.d
 %{_bindir}/x2go*
 %exclude %{_bindir}/x2goprint
 %dir %{_libdir}/x2go
@@ -226,6 +228,9 @@ exit 0
 %attr(0700,x2goprint,x2goprint) %{_localstatedir}/spool/x2goprint
 
 %changelog
+* Sat Dec 7 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.9-2
+- Disable Xsession support for now - Debian specific (Bug #1038834)
+
 * Mon Dec 2 2013 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.9-1
 - Update to 4.0.1.9
 - Drop incorrect keyboard patch