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