From 490c35e7c1461729472895a47cae100ffdec188e Mon Sep 17 00:00:00 2001
From: Dan Callaghan <dcallagh@redhat.com>
Date: Mar 07 2018 01:06:56 +0000
Subject: invoke sphinx-build-3 unconditionally


Previously I had set SPHINXBUILD=sphinx-build-3 for the spec file but
left the default as sphinx-build, but that means the docs break in
Jenkins.

We *probably* want to unconditionally always build the docs using
Python 3 now... but I am not totally sure this is the right solution. At
some point in the (very near?) future, sphinx-build should become the
Python 3 version anyway.

---

diff --git a/docs/Makefile b/docs/Makefile
index 6ce88f5..5ab29b5 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    = -W
-SPHINXBUILD   = sphinx-build
+SPHINXBUILD   = sphinx-build-3
 SPHINXPROJ    = WaiverDB
 SOURCEDIR     = .
 BUILDDIR      = _build
@@ -17,4 +17,4 @@ help:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/waiverdb.spec b/waiverdb.spec
index eb9e2d3..8d5b35c 100644
--- a/waiverdb.spec
+++ b/waiverdb.spec
@@ -122,7 +122,7 @@ sed -i 's/\.stg\.fedoraproject\.org/.fedoraproject.org/g' conf/client.conf.examp
 %build
 %if 0%{?fedora} || 0%{?rhel} > 7
 %py3_build
-make -C docs SPHINXBUILD=sphinx-build-3 SPHINXOPTS= html text
+make -C docs SPHINXOPTS= html text
 %else
 %py2_build
 %endif