This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from d3b0ce5 python-x2go.spec: add Python-3-autodetection via %{python3_version} and fallbacks to %{py3_ver} and yet another to the plain "3" postfix. new b2c50d9 python-x2go.spec: fix fallback detection. new dcc3c76 python-x2go.spec: fix sphinx-{apidoc,build} calls by using the new shell variables, not RPM macros. The 2 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 | 4 ++++ python-x2go.spec | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit dcc3c764c5dfb87fb88e5f7b949457627bb374e6 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 1 10:21:08 2020 +0100 python-x2go.spec: fix sphinx-{apidoc,build} calls by using the new shell variables, not RPM macros. --- debian/changelog | 2 ++ python-x2go.spec | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 80454f2..a95dfcd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,8 @@ python-x2go (0.6.1.3-0x2go1) UNRELEASED; urgency=medium %{py3_ver} and yet another to the plain "3" postfix. + Fix fallback detection. We want to fall back if the variables are empty, not set. + + Fix sphinx-{apidoc,build} calls by using the new shell variables, not + RPM macros. -- X2Go Release Manager <git-admin@x2go.org> Thu, 26 Dec 2019 10:37:02 +0100 diff --git a/python-x2go.spec b/python-x2go.spec index 8ac139f..cc3e74b 100644 --- a/python-x2go.spec +++ b/python-x2go.spec @@ -286,7 +286,7 @@ if [ -z "${sphinx_postfix}" ]; then # just yet, so let's see how well that goes for now. fi fi -make -f Makefile.docupload docbuild SPHINX_APIDOC='sphinx-apidoc-%{sphinx_postfix}' SPHINXBUILD='sphinx-build-%{sphinx_postfix}' +make -f Makefile.docupload docbuild SPHINX_APIDOC="sphinx-apidoc-${sphinx_postfix}" SPHINXBUILD="sphinx-build-${sphinx_postfix}" %else # Python-2-builds are a bit tricky. # Sometimes the Python-2-binary doesn't have any postfix, sometimes the -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit b2c50d93cf579227325230c28d6669d0160d476e Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 1 10:20:05 2020 +0100 python-x2go.spec: fix fallback detection. We want to fall back if the variables are empty, not set. --- debian/changelog | 2 ++ python-x2go.spec | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ef5d682..80454f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ python-x2go (0.6.1.3-0x2go1) UNRELEASED; urgency=medium + Correctly check for existance of %{python2_version}. + Add Python-3-autodetection via %{python3_version} and fallbacks to %{py3_ver} and yet another to the plain "3" postfix. + + Fix fallback detection. We want to fall back if the variables are empty, + not set. -- X2Go Release Manager <git-admin@x2go.org> Thu, 26 Dec 2019 10:37:02 +0100 diff --git a/python-x2go.spec b/python-x2go.spec index aa568da..8ac139f 100644 --- a/python-x2go.spec +++ b/python-x2go.spec @@ -275,9 +275,9 @@ python3 setup.py build # Older distros, especially *SuSE versions, do not support %{python3_version}, # though, so we will have to use %{py3_ver} instead. sphinx_postfix='%{?python3_version}' -if [ -n "${sphinx_postfix}" ]; then +if [ -z "${sphinx_postfix}" ]; then sphinx_postfix='%{?py3_ver}' - if [ -n "${sphinx_postfix}" ]; then + if [ -z "${sphinx_postfix}" ]; then # And if not even that exists, fall back to the plain -3 postfix. sphinx_postfix='3' -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
-
git-admin＠x2go.org