This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch release/4.0.1.x in repository x2goserver. from 7bca259 Make man2html an optional tool. Don't fail if it is missing on the build system (required for openSUSE/SLES builds). new ed064bc Add to R: x2goserver-xsession. new 6bbe8c3 No shell expansion possible in obs-build, detect perl version only for non-SUSE builds. new de62c51 x2goserver.spec: Don't mention /etc/x2go/x2gosql/sql twice (directly and with wildcard). new 0a8db77 Fix x2goserver-xsession/Makefile on SUSE. Detect SUSE distro and create Xsession related directory symlinks (xinitrc.d and Xclients.d). The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 6 ++++++ x2goserver-xsession/Makefile | 2 ++ x2goserver.spec | 10 +++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 6bbe8c3784362bebb922a8a1eb937ab5bb02e62b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 15:53:49 2014 +0200 No shell expansion possible in obs-build, detect perl version only for non-SUSE builds. Conflicts (resolved by Mike Gabriel): x2goserver.spec --- debian/changelog | 2 ++ x2goserver.spec | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4454f05..7e7d703 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium * x2goserver.spec: + Add to R: perl(File::Which). + Additionally adapt to building on openSUSE/SLES. + + No shell expansion possible in obs-build, detect perl version only for + non-SUSE builds. + Add to R: x2goserver-xsession. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 diff --git a/x2goserver.spec b/x2goserver.spec index be1d2cb..9ce6bb6 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -39,7 +39,11 @@ Requires: lsof # For netstat in x2goresume-session Requires: net-tools Requires: openssh-server +%if 0%{suse_version} +Requires: perl +%else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%endif # We need a database # For killall in x2gosuspend-session Requires: psmisc @@ -84,7 +88,11 @@ administrations. %package printing Summary: X2Go Server (printing support) Requires: %{name} = %{version}-%{release} +%if 0%{suse_version} +Requires: perl +%else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%endif Group: Applications/Communications %description printing -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit ed064bc4e624797d852d685cd2eaf80eeae0e4ee Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 15:53:08 2014 +0200 Add to R: x2goserver-xsession. --- debian/changelog | 1 + x2goserver.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 372a99f..4454f05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium * x2goserver.spec: + Add to R: perl(File::Which). + Additionally adapt to building on openSUSE/SLES. + + Add to R: x2goserver-xsession. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 diff --git a/x2goserver.spec b/x2goserver.spec index b8ecd38..be1d2cb 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -62,7 +62,7 @@ Requires(preun): systemd Requires(postun): systemd %endif Requires: x2goserver-extensions -#Recommends: x2goserver-xsession +Requires: x2goserver-xsession #Recommands: x2goserver-fmbindings #Recommends: x2goserver-printing -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit de62c515e12addce4409ff5a06e4c046c384326e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 16:01:36 2014 +0200 x2goserver.spec: Don't mention /etc/x2go/x2gosql/sql twice (directly and with wildcard). Conflicts (resolved by Mike Gabriel): x2goserver.spec --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 7e7d703..13800fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium + No shell expansion possible in obs-build, detect perl version only for non-SUSE builds. + Add to R: x2goserver-xsession. + + Don't mention /etc/x2go/x2gosql/sql twice (directly and with wildcard). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit 0a8db775d02f053e7e5a959e24dd758474664ee4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 16:02:39 2014 +0200 Fix x2goserver-xsession/Makefile on SUSE. Detect SUSE distro and create Xsession related directory symlinks (xinitrc.d and Xclients.d). --- debian/changelog | 2 ++ x2goserver-xsession/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 13800fd..b1dee2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium purpose do not recursively dive into the complete subtree. (Fixes: #633). - Make man2html an optional tool. Don't fail if it is missing on the build system (required for openSUSE/SLES builds). + - Fix x2goserver-xsession/Makefile on SUSE. Detect SUSE distro and create + Xsession related directory symlinks (xinitrc.d and Xclients.d). * debian/control: + Add D (x2goserver): libfile-which-perl. * x2goserver.spec: diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index ee8757b..d1ebffc 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -60,6 +60,8 @@ install_config: if [ -e /etc/redhat-release ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi if [ -e /etc/gentoo-release ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi if [ -e /etc/gentoo-release ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi + if [ -e /etc/SUSE-brand ]; then if [ -d $(XINITRCDIR) ]; then $(INSTALL_SYMLINK) $(XINITRCDIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/xinitrc.d; fi; fi + if [ -e /etc/SUSE-brand ]; then if [ -d $(XCLIENTSDIR) ]; then $(INSTALL_SYMLINK) $(XCLIENTSDIR) $(DESTDIR)$(ETCDIR)/Xclients.d; else $(INSTALL_DIR) $(DESTDIR)$(ETCDIR)/Xclients.d; fi; fi install_man: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org