From orion@cora.nwra.com Tue Jul 30 20:52:21 2013 Received: (at submit) by bugs.x2go.org; 30 Jul 2013 18:52:22 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham version=3.3.2 X-Greylist: delayed 1462 seconds by postgrey-1.34 at ymir; Tue, 30 Jul 2013 20:52:21 CEST Received: from mail.cora.nwra.com (mercury.cora.nwra.com [4.28.99.165]) by ymir (Postfix) with ESMTPS id 6CA0A5DB17 for ; Tue, 30 Jul 2013 20:52:21 +0200 (CEST) Received: from [10.10.20.7] (barry.cora.nwra.com [10.10.20.7]) (authenticated bits=0) by mail.cora.nwra.com (8.14.4/8.14.4) with ESMTP id r6UIRuM1010061 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO) for ; Tue, 30 Jul 2013 12:27:57 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cora.nwra.com; s=default; t=1375208877; bh=rTIj22yHYpwnM03oC6AlPuolhUnsjY0CvEBcu155zc4=; h=Message-ID:Date:From:MIME-Version:To:Subject:Content-Type; b=HNGIrU9zgdNF5jJTeYqaTVt5npbfd7UMsMK8Yw2rArwl8Xm2lutmZC/iQm2G4d5HL tBKaXtdHlj4y69NHMJ5OKtXJeHCr4UcnMOQKq60IoTh9di72KIiEZhq7rOk2Y/TrDO Zjt4bkwqycxPVraTCc0ubgHgNpSng/pafGHWiFtc= Message-ID: <51F805AC.3060803@cora.nwra.com> Date: Tue, 30 Jul 2013 12:27:56 -0600 From: Orion Poplawski User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: submit@bugs.x2go.org Subject: x2goserver Fedora install issues Content-Type: multipart/mixed; boundary="------------000705050802020006030400" This is a multi-part message in MIME format. --------------000705050802020006030400 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit 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 orion@nwra.com Boulder, CO 80301 http://www.nwra.com --------------000705050802020006030400 Content-Type: text/x-patch; name="0001-Install-Xsession-executable.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Install-Xsession-executable.patch" >From 6362a9a0437aaba373bd6835a0ee1c5063b32d3e Mon Sep 17 00:00:00 2001 From: Orion Poplawski 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 --------------000705050802020006030400 Content-Type: text/x-patch; name="0002-Do-not-install-Xsession.options-not-used.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-Do-not-install-Xsession.options-not-used.patch" >From 8f7543e5856a4fd57f71569dc8ac000f11547fca Mon Sep 17 00:00:00 2001 From: Orion Poplawski 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 --------------000705050802020006030400 Content-Type: text/x-patch; name="0003-Make-Xsession.d-symlink-configurable.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0003-Make-Xsession.d-symlink-configurable.patch" >From dff7a2ea8fb105e112c7a75a2d357160d8ca4537 Mon Sep 17 00:00:00 2001 From: Orion Poplawski 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 --------------000705050802020006030400--