Update to 1.7.5 (bz#1570451)

1. Introduce --without websupport

 Sphinx (build)requires sphinxcontrib-websupport but that
 (build)requires sphinx. This bcond can be used to bootstrap this.

2. Introduce --without tests

 The tests bring a lot of additional dependencies that make
 bootstrapping harder. This allows to build without tests.

3. Build the docs with self

 The documentation was built with 'python', thus importing sphinx
 from python2's sitelib. Sphinx was installed because of the above
 mentioned buildrequirement of sphinxcontrib-websupport.
 Now current sphinx from PWD is used, also python3 is used when
 available, otherwise python2. Never just python.

.gitignore

@@ -14,4 +14,3 @@
 /Sphinx-1.7.1.tar.gz
 /Sphinx-1.7.2.tar.gz
 /Sphinx-1.7.5.tar.gz
-/Sphinx-1.7.6.tar.gz

python-sphinx.spec

@@ -26,7 +26,7 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.7.6
+Version:    1.7.5
 Release:    1%{?dist}
 Epoch:      1
 Summary:    Python documentation generator
@@ -54,10 +54,6 @@ Source6:    default-sphinx-command.in
 # to fetch images, which is not possible in koji or mock.
 Patch0: xfail-test_latex_remote_images.patch
 
-# Allow extra themes to exist. We pull in python[23]-sphinx-theme-alabaster
-# which causes that test to fail.
-Patch1: sphinx-test_theming.diff
-
 BuildArch:     noarch
 BuildRequires: python2-devel >= 2.4
 BuildRequires: python2-babel
@@ -89,6 +85,7 @@ BuildRequires: texinfo
 BuildRequires: graphviz
 BuildRequires: python2-sqlalchemy
 BuildRequires: python2-mock
+BuildRequires: python2-simplejson
 BuildRequires: python2-html5lib
 BuildRequires: python2-whoosh
 BuildRequires: python2-snowballstemmer
@@ -96,6 +93,8 @@ BuildRequires: python2-enum34
 %if %{with imagemagick_tests}
 BuildRequires: ImageMagick
 %endif
+# note: no Python3 xapian binding yet
+BuildRequires: python2-xapian
 BuildRequires: texlive-collection-fontsrecommended
 BuildRequires: texlive-collection-latex
 BuildRequires: texlive-dvipng
@@ -154,6 +153,7 @@ BuildRequires: python3-pytest
 BuildRequires: python3-pytest-cov
 BuildRequires: python3-sqlalchemy
 BuildRequires: python3-mock
+BuildRequires: python3-simplejson
 BuildRequires: python3-html5lib
 BuildRequires: python3-whoosh
 BuildRequires: python3-snowballstemmer
@@ -618,37 +618,9 @@ popd
 
 
 %changelog
-* Mon Jul 23 2018 Marcel Plch <mplch@redhat.com> - 1:1.7.6-1
-- Update to 1.7.6
-
-* Fri Jul 13 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-6
-- Remove unused dependencies on xapian and simplejson
-
-* Thu Jul  5 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:1.7.5-5
-- Add patch to fix build if alabaster theme is installed
-- Add patch for #1589868
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-4
-- Enable tests
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-3
-- Enable websupport
-
-* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-2
-- Rebuilt for Python 3.7
-
 * Tue Jun 19 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.7.5-1
 - Update to 1.7.5 (bz#1570451)
 
-* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.2-5
-- Rebuilt for Python 3.7
-
-* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.2-4
-- Bootstrap for Python 3.7
-
-* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.2-3
-- Bootstrap for Python 3.7
-
 * Wed Apr 11 2018 Petr Viktorin <pviktori@redhat.com> - 1:1.7.2-2
 - Conditionalize the ImageMagick build dependency & tests
 

sources

@@ -1 +1 @@
-SHA512 (Sphinx-1.7.6.tar.gz) = 505c4e92c1a09c48a50d8bd0ec86089bd3f0f5352302ae330e2fba6e61316f40c6ec3726e2cfaeb54de0818127a26ef5364ac92bcf254283022c38c4e95d419c
+SHA512 (Sphinx-1.7.5.tar.gz) = db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8

sphinx-test_theming.diff

@@ -1,12 +0,0 @@
-diff -ru Sphinx-1.7.6/tests/test_theming.py Sphinx-1.7.6_patched/tests/test_theming.py
---- Sphinx-1.7.6/tests/test_theming.py	2018-07-16 11:24:40.000000000 +0200
-+++ Sphinx-1.7.6_patched/tests/test_theming.py	2018-07-20 15:17:35.049263077 +0200
-@@ -31,7 +31,7 @@
-         themes.append('alabaster')
- 
-     # test Theme class API
--    assert set(app.html_themes.keys()) == set(themes)
-+    assert set(app.html_themes.keys()) >= set(themes)
-     assert app.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme'
-     assert app.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip'
-     assert app.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles'