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