Update to 1.8.4

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

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

python-sphinx.spec

@@ -26,12 +26,11 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.7.5
+Version:    1.8.4
 Release:    1%{?dist}
 Epoch:      1
 Summary:    Python documentation generator
 
-Group:      Development/Tools
 
 # Unless otherwise noted, the license for code is BSD
 # sphinx/util/stemmer.py Public Domain
@@ -54,6 +53,10 @@ 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
@@ -85,7 +88,6 @@ BuildRequires: texinfo
 BuildRequires: graphviz
 BuildRequires: python2-sqlalchemy
 BuildRequires: python2-mock
-BuildRequires: python2-simplejson
 BuildRequires: python2-html5lib
 BuildRequires: python2-whoosh
 BuildRequires: python2-snowballstemmer
@@ -93,8 +95,6 @@ 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
@@ -153,7 +153,6 @@ 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
@@ -307,7 +306,6 @@ builder.
 %if 0%{?with_python3}
 %package -n python3-sphinx
 Summary:       Python documentation generator
-Group:         Development/Tools
 Requires:      python-sphinx-locale = %{?epoch}:%{version}-%{release}
 Requires:      python3-babel
 Requires:      python3-docutils
@@ -368,7 +366,6 @@ the Python docs:
 
 %package doc
 Summary:       Documentation for %{name}
-Group:         Documentation
 License:       BSD
 Requires:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 
@@ -385,7 +382,6 @@ This package contains documentation in reST and HTML formats.
 
 %package locale
 Summary:       Locale files for %{name}
-Group:         Development/Tools
 License:       BSD
 
 %description locale
@@ -553,13 +549,13 @@ rm tests/test_build_linkcheck.py
 
 # Igoring test_api_translator for now as it fails on Fedora.
 # The issue has been reported upstream: https://github.com/sphinx-doc/sphinx/issues/4710
-LANG=en_US.UTF-8 %{__python2} -m pytest -v --ignore=tests/test_api_translator.py
+LANG=C.UTF-8 pytest-2
 %if 0%{?with_python3}
 pushd %{py3dir}
 # Currently, all linkcheck tests hit external websites.  Since network access
 # is disabled in koji, we have to disable these.
 rm tests/test_build_linkcheck.py
-LANG=en_US.UTF-8 PYTHON=python3 make test
+pytest-3
 popd
 %endif # with_python3
 %endif # with tests
@@ -618,9 +614,47 @@ popd
 
 
 %changelog
+* Thu Feb 07 2019 Alfredo Moralejo <amoralej@redhat.com> - 1:1.8.4-1
+- Update to 1.8.4.
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.7.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:1.7.6-2
+- Drop explicit locale setting for python3, use C.UTF-8 for python2
+  See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
+
+* 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.5.tar.gz) = db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8
+SHA512 (Sphinx-1.8.4.tar.gz) = 6821bb56c30b52f357ae55f5db45f056883c457eae62a0751a2b654519a07bca9edccb7678b29fa380379f059c9d8899d9e7b06ceccca5ec26962e6f83bb8578

sphinx-test_theming.diff

@@ -0,0 +1,12 @@
+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'