[rpms/pcl] f44: Fix Sphinx documentation build

[rpms/pcl] f44: Fix Sphinx documentation build

[Rich Mattes]

A new commit has been pushed.

Repo   : rpms/pcl
Branch : f44
Commit : 40b491ad52d4a66db5349adcb56cd87d6a26d741
Author : Rich Mattes <richmattes@gmail.com>
Date   : 2020-06-07T17:40:55-04:00
Stats  : +46/-7 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/pcl/c/40b491ad52d4a66db5349adcb56cd87d6a26d741?branch=f44

Log:
Fix Sphinx documentation build

---
diff --git a/pcl-1.11.0-sphinx.patch b/pcl-1.11.0-sphinx.patch
new file mode 100644
index 0000000..f942ac4
--- /dev/null
+++ b/pcl-1.11.0-sphinx.patch
@@ -0,0 +1,42 @@
+diff -up ./doc/advanced/content/conf.py.sphinx ./doc/advanced/content/conf.py
+--- ./doc/advanced/content/conf.py.sphinx	2020-05-11 04:59:26.000000000 -0400
++++ ./doc/advanced/content/conf.py	2020-06-07 16:11:04.398144850 -0400
+@@ -4,7 +4,7 @@
+ # -- General configuration -----------------------------------------------------
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.imgmath', 'sphinxcontrib.doxylink.doxylink']
++extensions = ['sphinx.ext.imgmath']
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ # templates_path = ['_templates']
+@@ -69,7 +69,7 @@ pygments_style = 'sphinx'
+ 
+ # The theme to use for HTML and HTML Help pages.  Major themes that come with
+ # Sphinx are currently 'default' and 'sphinxdoc'.
+-html_theme = 'sphinx_rtd_theme'
++html_theme = 'sphinxdoc'
+ 
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further.  For a list of options available for each theme, see the
+diff -up ./doc/tutorials/content/conf.py.sphinx ./doc/tutorials/content/conf.py
+--- ./doc/tutorials/content/conf.py.sphinx	2020-05-11 04:59:26.000000000 -0400
++++ ./doc/tutorials/content/conf.py	2020-06-07 16:10:46.555225064 -0400
+@@ -4,7 +4,7 @@
+ # -- General configuration -----------------------------------------------------
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.imgmath', 'sphinxcontrib.doxylink.doxylink']
++extensions = ['sphinx.ext.imgmath']
+ imgmath_dvipng_args = ['-gamma', '1.5', '-D', '110', '-bg', 'Transparent']
+ 
+ # Add any paths that contain templates here, relative to this directory.
+@@ -70,7 +70,7 @@ pygments_style = 'sphinx'
+ 
+ # The theme to use for HTML and HTML Help pages.  Major themes that come with
+ # Sphinx are currently 'default' and 'sphinxdoc'.
+-html_theme = 'sphinx_rtd_theme'
++html_theme = 'sphinxdoc'
+ 
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further.  For a list of options available for each theme, see the

diff --git a/pcl.spec b/pcl.spec
index 04d5c9a..75cf6c6 100644
--- a/pcl.spec
+++ b/pcl.spec
@@ -22,6 +22,8 @@ Patch2:         %{name}-1.11.0-fedora.patch
 Patch3:         %{name}-1.11.0-doxyfix.patch
 # Split up explicit template instantiations so that builders don't run out of memory
 Patch4:         %{name}-1.11.0-oom.patch
+# Use a built-in sphinx documentation theme and disable doxylink plugin
+Patch5:         %{name}-1.11.0-sphinx.patch
 
 # For plain building
 BuildRequires:  cmake, gcc-c++, boost-devel
@@ -83,15 +85,13 @@ Library.
 %patch2 -p0 -b .fedora
 %patch3 -p0 -b .doxyfix
 %patch4 -p1 -b .oom
+%patch5 -p1 -b .sphinx
 
 # Just to make it obvious we're not using any of these
 rm -fr recognition/include/pcl/recognition/3rdparty/metslib
 rm -fr surface/src/3rdparty/opennurbs
 rm -rf surface/include/pcl/surface/3rdparty/opennurbs
 
-# Get rid of doxylink stuff (not in Fedora yet)
-sed -i "s/, 'sphinxcontrib.doxylink.doxylink'//g" doc/advanced/content/conf.py doc/tutorials/content/conf.py
-
 %build
 mkdir build
 pushd build
@@ -120,14 +120,11 @@ pushd build
 
 # Don't use mflags, we're hitting out of memory errors on the koji builders
 %make_build
-#make doc
-#make tutorials
-#make advanced
 popd
 
 %install
 pushd build
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 # Remove libtool archives
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'