File 0003-doc-Use-the-correct-sphinx-build-binary-fo... of Package dnf-plugins-core

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-doc-Use-the-correct-sphinx-build-binary-for-Python-2.patch of Package dnf-plugins-core (Revision b47753dc18459732cffac7f5edb40fa9)

Currently displaying revision b47753dc18459732cffac7f5edb40fa9 , Show latest

From 35568fea8fdedfe4134dea2e26637c5070d24448 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Sun, 6 Jan 2019 21:15:22 -0500
Subject: [PATCH 3/3] doc: Use the correct sphinx-build binary for Python 2 or
 Python 3

When trying to build dnf-plugins-core purely as a Python 3 package,
man page generation fails because sphinx-build cannot be found, due
to python3-sphinx not providing that binary.
---
 doc/CMakeLists.txt | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 0c24597..e67f42e 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,11 +1,18 @@
 # html and man documentation are separate targets, apparently there's no way to
 # tell sphinx-build to do them both in one go:
+
+if (${PYTHON_VERSION_MAJOR} STREQUAL "2")
+    SET(SPHINX_BUILD_NAME "sphinx-build")
+else()
+    SET(SPHINX_BUILD_NAME "sphinx-build-3")
+endif()
+
 ADD_CUSTOM_TARGET (doc-html
-		  PYTHONPATH=${CMAKE_SOURCE_DIR} sphinx-build -b html
+		  PYTHONPATH=${CMAKE_SOURCE_DIR} ${SPHINX_BUILD_NAME} -b html
 		  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
 		  COMMENT "Building html documentation")
 ADD_CUSTOM_TARGET (doc-man
-		  PYTHONPATH=${CMAKE_SOURCE_DIR} sphinx-build -b man
+		  PYTHONPATH=${CMAKE_SOURCE_DIR} ${SPHINX_BUILD_NAME} -b man
 		  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
 		  COMMENT "Building manpage documentation")
 ADD_CUSTOM_TARGET (doc)
-- 
2.20.1

Places

File 0003-doc-Use-the-correct-sphinx-build-binary-for-Python-2.patch of Package dnf-plugins-core (Revision b47753dc18459732cffac7f5edb40fa9)

Places