[X2Go-Commits] [python-x2go] 02/02: python-x2go.spec: fix sphinx-{apidoc, build} calls by using the new shell variables, not RPM macros.
git-admin at x2go.org
git-admin at x2go.org
Wed Jan 1 10:21:22 CET 2020
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 at 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 at 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
More information about the x2go-commits
mailing list