This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 2d4a20f Make man2html an optional tool. Don't fail if it is missing on the build system (required for openSUSE/SLES builds). new 3cce397 Add to R: x2goserver-xsession. new b70e550 No shell expansion possible in obs-build, detect perl version only for non-SUSE builds. new 8b68ee2 x2goserver.spec: Don't mention /etc/x2go/x2gosql/sql twice (directly and with wildcard). new e9e9baf 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 | 31 +++++++++++++++++++++++++++---- 3 files changed, 35 insertions(+), 4 deletions(-) -- 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 master in repository x2goserver. commit 3cce397a5fe1648a5cac5e91b5ac01545e95850e 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 92499a3..8c93c9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -147,6 +147,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 61b92f0..e312ad3 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -63,7 +63,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 master in repository x2goserver. commit b70e550b70378bd21afef0d6cee781d151edaf0d 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. --- debian/changelog | 2 ++ x2goserver.spec | 26 +++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8c93c9d..d4771ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -147,6 +147,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 e312ad3..e6b6595 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 Requires: perl(Try::Tiny) # We need a database # For killall in x2gosuspend-session @@ -83,8 +87,12 @@ administrations. %package common -Summary: X2Go Server (common files) +Summiary: X2Go Server (common files) +%if 0%{suse_version} +Requires: perl +%else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%endif Group: Applications/Communications %description common @@ -105,7 +113,11 @@ Summary: Perl X2Go::Server package Requires: x2goserver-common = %{version}-%{release} Requires: perl-X2Go-Log = %{version}-%{release} Requires: perl-X2Go-Server-DB = %{version}-%{release} +%if 0%{suse_version} +Requires: perl +%else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%endif Group: Development/Libraries %description -n perl-X2Go-Server @@ -126,7 +138,11 @@ Requires: x2goserver-common = %{version}-%{release} Requires: perl-X2Go-Log = %{version}-%{release} Requires: perl(DBD::SQLite) Requires: perl(DBD::Pg) +%if 0%{suse_version} +Requires: perl +%else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%endif Group: Development/Libraries %description -n perl-X2Go-Server-DB @@ -144,7 +160,11 @@ This package contains the X2Go::Server::DB Perl package. %package -n perl-X2Go-Log Summary: Perl X2Go::Log package Requires: x2goserver-common = %{version}-%{release} +%if 0%{suse_version} +Requires: perl +%else Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +%endif Group: Development/Libraries %description -n perl-X2Go-Log @@ -162,7 +182,11 @@ This package contains the X2Go::Log Perl package. %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 master in repository x2goserver. commit 8b68ee2cce25a387c34d81530b435cc086964051 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). --- debian/changelog | 1 + x2goserver.spec | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d4771ac..c8c9d3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -150,6 +150,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 diff --git a/x2goserver.spec b/x2goserver.spec index e6b6595..a574a2b 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -485,9 +485,8 @@ exit 0 %files common %dir %{_sysconfdir}/x2go/ -%config(noreplace) %{_sysconfdir}/x2go/x2go* %dir %{_sysconfdir}/x2go/x2gosql -%config(noreplace) %{_sysconfdir}/x2go/x2gosql/sql +%config(noreplace) %{_sysconfdir}/x2go/x2go* %{_mandir}/man5/x2goserver.conf.5.gz %dir %{_datadir}/x2go/versions %{_datadir}/x2go/versions/VERSION.x2goserver-common -- 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 master in repository x2goserver. commit e9e9baf23c32e182e872e64868e4d347e66bdc84 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 c8c9d3c..ee396ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -142,6 +142,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