[X2Go-Commits] [python-x2go] 02/02: python-x2go.spec: also use the same detection mechanism for sphinx-build.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit fe9a762bd89bdee3609f11d705f4ed9dbef74bf4
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jan 1 06:41:34 2020 +0100

    python-x2go.spec: also use the same detection mechanism for sphinx-build.
---
 debian/changelog |  1 +
 python-x2go.spec | 17 +++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9db445a..4093c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ python-x2go (0.6.1.3-0x2go1) UNRELEASED; urgency=medium
       Python-2-version).
     + Fix condition in doc build.
     + Reflow comments (only).
+    + Also use the same detection mechanism for sphinx-build.
 
  -- 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 920a642..7df8f0b 100644
--- a/python-x2go.spec
+++ b/python-x2go.spec
@@ -272,26 +272,31 @@ python3 setup.py build
 %if 0%{?with_python3}
 # If we build for Python 3, let's assume that the binary always includes the
 # Python-3-version.
-make -f Makefile.docupload docbuild SPHINX_APIDOC='sphinx-apidoc-%{python3_version}'
+make -f Makefile.docupload docbuild SPHINX_APIDOC='sphinx-apidoc-%{python3_version}' SPHINXBUILD='sphinx-build-%{python3_version}'
 %else
 # Python-2-builds are a bit tricky.
 # Sometimes the Python-2-binary doesn't have any postfix, sometimes the
 # unpostfixed one is the Python-3-version.
 # We'll try to guess and select the most appropriate, if possible.
+# We'll also assume that sphinx-build-X is available if sphinx-apidoc-X is
+# available.
 sphinx_apidoc_bin='sphinx-apidoc'
-sphinx_apidoc_bin_guessed='0'
+sphinx_build_bin='sphinx-build'
+sphinx_bin_guessed='0'
 if [ -n '%{python2_version}' ]; then
   if [ -x "/usr/bin/${sphinx_apidoc_bin}-%{python2_version}" ]; then
     sphinx_apidoc_bin="/usr/bin/${sphinx_apidoc_bin}-%{python2_version}"
-    sphinx_apidoc_bin_guessed='1'
+    sphinx_build_bin="/usr/bin/${sphinx_build_bin}-%{python2_version}"
+    sphinx_bin_guessed='1'
   fi
 fi
-if [ '0' = "${sphinx_apidoc_bin_guessed}" ] && [ -x "/usr/bin/${sphinx_apidoc_bin}-2" ]; then
+if [ '0' = "${sphinx_bin_guessed}" ] && [ -x "/usr/bin/${sphinx_apidoc_bin}-2" ]; then
   sphinx_apidoc_bin="/usr/bin/${sphinx_apidoc_bin}-2"
-  sphinx_apidoc_bin_guessed='1'
+  sphinx_build_bin="/usr/bin/${sphinx_build_bin}-2"
+  sphinx_bin_guessed='1'
 fi
 # Otherwise just use the default and hope very hard that it is the Python-2-version.
-make -f Makefile.docupload docbuild SPHINX_APIDOC="${sphinx_apidoc_bin}"
+make -f Makefile.docupload docbuild SPHINX_APIDOC="${sphinx_apidoc_bin}" SPHINXBUILD="${sphinx_build_bin}"
 %endif
 
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git