Subject: x2goserver Fedora install issues
From: Orion Poplawski <[email-masked]>
To: [email-masked]
Date: Tue, 30 Jul 2013 12:27:56 -0600

Package: x2goserver
Version: 4.0.1.6
Tags: patch

During the x2goserver Fedora package review we had a couple issues addressed 
by the attached patches.

-- 
Orion Poplawski
Technical Manager                     303-415-9701 x222
NWRA, Boulder/CoRA Office             FAX: 303-415-9702
3380 Mitchell Lane                       [email-masked]
Boulder, CO 80301                   http://www.nwra.com
From 6362a9a0437aaba373bd6835a0ee1c5063b32d3e Mon Sep 17 00:00:00 2001
From: Orion Poplawski <[email-masked]>
Date: Tue, 30 Jul 2013 11:44:15 -0600
Subject: [PATCH 1/3] Install Xsession executable

---
 x2goserver-xsession/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index 4fe806d..98d16cc 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -58,7 +58,7 @@ install_config:
 #       provide target dirs for X11 related symlinks
 	mkdir -p $(DESTDIR)/etc/X11/Xsession.d
 	touch $(DESTDIR)/etc/X11/Xsession.options
-	$(INSTALL_FILE) etc/Xsession                    $(DESTDIR)$(ETCDIR)/
+	$(INSTALL_PROGRAM) etc/Xsession                 $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_SYMLINK) /etc/X11/Xresources          $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_SYMLINK) /etc/X11/Xsession.d          $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_SYMLINK) /etc/X11/Xsession.options    $(DESTDIR)$(ETCDIR)/
-- 
1.8.3.1

From 8f7543e5856a4fd57f71569dc8ac000f11547fca Mon Sep 17 00:00:00 2001
From: Orion Poplawski <[email-masked]>
Date: Tue, 30 Jul 2013 11:45:06 -0600
Subject: [PATCH 2/3] Do not install Xsession.options, not used

---
 x2goserver-xsession/Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index 98d16cc..fa6c8e4 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -57,11 +57,9 @@ install_config:
 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
 #       provide target dirs for X11 related symlinks
 	mkdir -p $(DESTDIR)/etc/X11/Xsession.d
-	touch $(DESTDIR)/etc/X11/Xsession.options
 	$(INSTALL_PROGRAM) etc/Xsession                 $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_SYMLINK) /etc/X11/Xresources          $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_SYMLINK) /etc/X11/Xsession.d          $(DESTDIR)$(ETCDIR)/
-	$(INSTALL_SYMLINK) /etc/X11/Xsession.options    $(DESTDIR)$(ETCDIR)/

 install_man:
-- 
1.8.3.1

From dff7a2ea8fb105e112c7a75a2d357160d8ca4537 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <[email-masked]>
Date: Tue, 30 Jul 2013 12:23:19 -0600
Subject: [PATCH 3/3] Make Xsession.d symlink configurable

---
 x2goserver-xsession/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index fa6c8e4..c83d36d 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -20,6 +20,8 @@ LIBDIR=$(PREFIX)/lib/x2go
 MANDIR=$(PREFIX)/share/man
 SHAREDIR=$(PREFIX)/share/x2go
 
+XSESSIONDIR ?= /etc/X11/Xsession.d
+
 #BIN_SCRIPTS=$(shell cd bin && echo *)
 #SBIN_SCRIPTS=$(shell cd sbin && echo *)
 #LIB_FILES=$(shell cd lib && echo *)
@@ -56,10 +58,9 @@ install_scripts:
 install_config:
 	$(INSTALL_DIR) $(DESTDIR)$(ETCDIR)
 #       provide target dirs for X11 related symlinks
-	mkdir -p $(DESTDIR)/etc/X11/Xsession.d
 	$(INSTALL_PROGRAM) etc/Xsession                 $(DESTDIR)$(ETCDIR)/
 	$(INSTALL_SYMLINK) /etc/X11/Xresources          $(DESTDIR)$(ETCDIR)/
-	$(INSTALL_SYMLINK) /etc/X11/Xsession.d          $(DESTDIR)$(ETCDIR)/
+	$(INSTALL_SYMLINK) $(XSESSIONDIR)               $(DESTDIR)$(ETCDIR)/Xsession.d

 install_man:
-- 
1.8.3.1