This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-cli. commit 72f99acd0fcbdd841f8e49d96ad7172816e4ab68 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 18 20:45:43 2019 +0100 pyhoca-cli.spec: prefer Python 3 if both variants have been requested, so that we only ever build for one variant. --- debian/changelog | 2 ++ pyhoca-cli.spec | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index dee844d..5795334 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ pyhoca-cli (0.6.1.2-0x2go1) UNRELEASED; urgency=medium * New upstream version (0.6.1.1): * pyhoca-cli.spec: + Backport macros from python-x2go.spec. + + Prefer Python 3 if both variants have been requested, so that we only + ever build for one variant. -- X2Go Release Manager <git-admin@x2go.org> Fri, 22 Nov 2019 15:26:45 +0100 diff --git a/pyhoca-cli.spec b/pyhoca-cli.spec index 5e825a3..171fbfe 100644 --- a/pyhoca-cli.spec +++ b/pyhoca-cli.spec @@ -15,6 +15,11 @@ %bcond_without python2 %endif +# Prefer Python 3 if both variants have been requested. +%if 0%{?with_python2} && 0%{?with_python3} +%bcond_with python2 +%endif + # Provide a default implementation, essentially for non-*SuSE platforms. %if 0%{?with_python3} %if ( ! ( 0%{?rhel} ) ) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git