Update to 1.8.4

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

.gitignore

@@ -8,3 +8,11 @@
 /Sphinx-1.5.1.tar.gz
 /Sphinx-1.5.2.tar.gz
 /Sphinx-1.6.3.tar.gz
+/Sphinx-1.6.4.tar.gz
+/Sphinx-1.6.5.tar.gz
+/Sphinx-1.6.6.tar.gz
+/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

@@ -1,9 +1,21 @@
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
 %global with_python3 1
 %else
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
 %endif
 
+%if 0%{?rhel} > 7
+# Build without BuildRequires ImageMagick, to skip imgconverter tests
+%bcond_with imagemagick_tests
+%else
+%bcond_without imagemagick_tests
+%endif
+
+# When bootstrapping sphinx, we don't yet have sphinxcontrib-websupport
+%bcond_without websupport
+# Also, we don't have all the tests requirements
+%bcond_without tests
+
 # Currently, python2 version is always the default: https://fedoraproject.org/wiki/Packaging:Python#Naming
 %if 1
 %global py3_default 0
@@ -14,11 +26,11 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.6.3
+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
@@ -41,42 +53,48 @@ 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
 BuildRequires: python2-setuptools
-BuildRequires: python-docutils
-BuildRequires: python-jinja2
-BuildRequires: python-pygments >= 2.0
-BuildRequires: python-six
+BuildRequires: python2-docutils
+BuildRequires: python2-jinja2
+BuildRequires: python2-pygments >= 2.0
+BuildRequires: python2-six
 BuildRequires: python2-sphinx_rtd_theme
 BuildRequires: python2-sphinx-theme-alabaster
 BuildRequires: python2-imagesize
 BuildRequires: python2-requests
+BuildRequires: python2-packaging
 BuildRequires: python2-typing
+%if %{with websupport}
 BuildRequires: python2-sphinxcontrib-websupport
+%endif
 BuildRequires: environment(modules)
 
 # for fixes
 BuildRequires: dos2unix
 
-# for testing
-BuildRequires: python-nose
+%if %{with tests}
+BuildRequires: python2-nose
 BuildRequires: python2-pytest
-BuildRequires: python-pytest-cov
+BuildRequires: python2-pytest-cov
 BuildRequires: gettext
 BuildRequires: texinfo
 BuildRequires: graphviz
-BuildRequires: python-sqlalchemy
+BuildRequires: python2-sqlalchemy
 BuildRequires: python2-mock
-BuildRequires: python2-simplejson
-BuildRequires: python-html5lib
-BuildRequires: python-whoosh
+BuildRequires: python2-html5lib
+BuildRequires: python2-whoosh
 BuildRequires: python2-snowballstemmer
-BuildRequires: python-enum34
+BuildRequires: python2-enum34
+%if %{with imagemagick_tests}
 BuildRequires: ImageMagick
-# note: no Python3 xapian binding yet
-BuildRequires: xapian-bindings-python
+%endif
 BuildRequires: texlive-collection-fontsrecommended
 BuildRequires: texlive-collection-latex
 BuildRequires: texlive-dvipng
@@ -111,6 +129,7 @@ BuildRequires: tex(tabulary.sty)
 BuildRequires: tex(polyglossia.sty)
 BuildRequires: tex(ctablestack.sty)
 BuildRequires: tex(eu1enc.def)
+%endif
 
 %if 0%{?with_python3}
 BuildRequires: python3-devel
@@ -119,21 +138,25 @@ BuildRequires: python3-setuptools
 BuildRequires: python3-docutils
 BuildRequires: python3-jinja2
 BuildRequires: python3-pygments
+BuildRequires: python3-six
+BuildRequires: python3-sphinx_rtd_theme
+BuildRequires: python3-sphinx-theme-alabaster
+BuildRequires: python3-packaging
+BuildRequires: python3-imagesize
+BuildRequires: python3-requests
+%if %{with websupport}
+BuildRequires: python3-sphinxcontrib-websupport
+%endif
+%if %{with tests}
 BuildRequires: python3-nose
 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
-BuildRequires: python3-six
-BuildRequires: python3-sphinx_rtd_theme
-BuildRequires: python3-sphinx-theme-alabaster
-BuildRequires: python3-imagesize
-BuildRequires: python3-requests
-BuildRequires: python3-sphinxcontrib-websupport
+%endif
 %endif # with_python3
 
 
@@ -168,11 +191,11 @@ the Python docs:
 
 %package -n    python2-sphinx
 Summary:       Python documentation generator
-Requires:      python-sphinx-locale = %{version}-%{release}
+Requires:      python-sphinx-locale = %{?epoch}:%{version}-%{release}
 Requires:      python2-babel
-Requires:      python-docutils
-Requires:      python-jinja2
-Requires:      python-pygments
+Requires:      python2-docutils
+Requires:      python2-jinja2
+Requires:      python2-pygments
 Requires:      python2-mock
 Requires:      python2-snowballstemmer
 Requires:      python2-sphinx_rtd_theme
@@ -180,8 +203,11 @@ Requires:      python2-six
 Requires:      python2-sphinx-theme-alabaster
 Requires:      python2-imagesize
 Requires:      python2-requests
+Requires:      python2-packaging
 Requires:      python2-typing
+%if %{with websupport}
 Requires:      python2-sphinxcontrib-websupport
+%endif
 Requires: environment(modules)
 # Needed to get rid of the alternatives config installed in f24 and f25
 # versions of the package
@@ -190,12 +216,12 @@ Recommends:    graphviz
 Recommends:    ImageMagick
 Obsoletes:     python-sphinx <= 1.2.3
 Obsoletes:     python-sphinxcontrib-napoleon < 0.5
-Provides:      python-sphinxcontrib-napoleon = %{version}-%{release}
+Provides:      python-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release}
 Obsoletes:     python2-Sphinx <= 1.3.1-4
-Provides:      python2-Sphinx = %{version}-%{release}
-Provides:      python(Sphinx) = %{version}-%{release}
+Provides:      python2-Sphinx = %{?epoch}:%{version}-%{release}
+Provides:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 %{?python_provide:%python_provide python2-sphinx}
-Conflicts:     python3-sphinx < %{version}-%{release}
+Conflicts:     python3-sphinx < %{?epoch}:%{version}-%{release}
 
 %description -n python2-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
@@ -228,7 +254,7 @@ the Python docs:
 
 %package latex
 Summary:       LaTeX builder dependencies for %{name}
-Requires:      python(Sphinx) = %{version}-%{release}
+Requires:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 Requires:      texlive-collection-fontsrecommended
 Requires:      texlive-collection-latex
 Requires:      texlive-dvipng
@@ -280,8 +306,7 @@ builder.
 %if 0%{?with_python3}
 %package -n python3-sphinx
 Summary:       Python documentation generator
-Group:         Development/Tools
-Requires:      python-sphinx-locale = %{version}-%{release}
+Requires:      python-sphinx-locale = %{?epoch}:%{version}-%{release}
 Requires:      python3-babel
 Requires:      python3-docutils
 Requires:      python3-jinja2
@@ -293,7 +318,10 @@ Requires:      python3-sphinx-theme-alabaster
 Requires:      python3-imagesize
 Requires:      python3-requests
 Requires:      python3-six
+Requires:      python3-packaging
+%if %{with websupport}
 Requires:      python3-sphinxcontrib-websupport
+%endif
 Recommends:    graphviz
 Recommends:    ImageMagick
 Requires: environment(modules)
@@ -301,10 +329,10 @@ Requires: environment(modules)
 # versions of the package
 Requires(pre): /usr/sbin/alternatives
 Obsoletes:     python3-sphinxcontrib-napoleon < 0.3.0
-Provides:      python3-sphinxcontrib-napoleon = %{version}-%{release}
-Provides:      python(Sphinx) = %{version}-%{release}
+Provides:      python3-sphinxcontrib-napoleon = %{?epoch}:%{version}-%{release}
+Provides:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 %{?python_provide:%python_provide python3-sphinx}
-Conflicts:     python2-Sphinx < %{version}-%{release}
+Conflicts:     python2-Sphinx < %{?epoch}:%{version}-%{release}
 
 %description -n python3-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
@@ -338,9 +366,8 @@ the Python docs:
 
 %package doc
 Summary:       Documentation for %{name}
-Group:         Documentation
 License:       BSD
-Requires:      python(Sphinx) = %{version}-%{release}
+Requires:      python(Sphinx) = %{?epoch}:%{version}-%{release}
 
 %description doc
 Sphinx is a tool that makes it easy to create intelligent and
@@ -355,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
@@ -373,26 +399,38 @@ This package contains locale files for Sphinx
 
 cp %{SOURCE5} .
 
-sed '1d' -i sphinx/pycode/pgen2/token.py
-
 # fix line encoding of bundled jquery.js
 dos2unix -k ./sphinx/themes/basic/static/jquery.js
 
+%if %{without imagemagick_tests}
+rm tests/test_ext_imgconverter.py
+%endif
+
+%if %{without websupport}
+rm tests/test_websupport.py tests/test_api_translator.py
+%endif
+
 %if 0%{?with_python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
 %endif # with_python3
 
-
 %build
 %py2_build
 %if 0%{?with_python3}
 %py3_build
 %endif # with_python3
 
+export PYTHONPATH=$PWD
 pushd doc
-make html
-make man
+%if 0%{?with_python3}
+export SPHINXBUILD="%{__python3} ../sphinx/cmd/build.py"
+%else
+export SPHINXBUILD="%{__python2} ../sphinx/cmd/build.py"
+%endif
+
+make html SPHINXBUILD="$SPHINXBUILD"
+make man SPHINXBUILD="$SPHINXBUILD"
 rm -rf _build/html/.buildinfo
 mv _build/html ..
 popd
@@ -407,12 +445,6 @@ for i in sphinx-{apidoc,autogen,build,quickstart}; do
     ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3
     ln -s %{_bindir}/$i-3 %{buildroot}%{_libexecdir}/python3-sphinx/$i
 done
-
-# These appear to be incomplete C extensions to speed up parsing.  They are not
-# built by setup.py yet.  Removing them in %%install so that if sphinx does
-# make use of them, and we don't notice, we only remove these source files
-# after the build has created the .so's
-rm %{buildroot}%{python3_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c}
 %endif # with_python3
 
 %py2_install
@@ -423,12 +455,6 @@ for i in sphinx-{apidoc,autogen,build,quickstart}; do
     ln -s %{_bindir}/$i-2 %{buildroot}%{_libexecdir}/python2-sphinx/$i
 done
 
-# These appear to be incomplete C extensions to speed up parsing.  They are not
-# built by setup.py yet.  Removing them in %%install so that if sphinx does
-# make use of them, and we don't notice, we only remove these source files
-# after the build has created the .so's
-rm %{buildroot}%{python2_sitelib}/sphinx/pycode/pgen2/parse.{pyx,c}
-
 pushd doc
 # Deliver man pages
 install -d %{buildroot}%{_mandir}/man1
@@ -459,7 +485,7 @@ mv doc reST
 
 # Move language files to /usr/share;
 # patch to support this incorporated in 0.6.6
-pushd %{buildroot}%{python_sitelib}
+pushd %{buildroot}%{python2_sitelib}
 
 for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
 do
@@ -513,32 +539,26 @@ done
   >> sphinx.lang
 
 
+%if %{with tests}
 %check
+export PYTHONPATH=$PWD
+
 # 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 make test
+
+# 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=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
-
-
-%pre -n python2-sphinx
-# python-sphinx as shipped in an update to f24 and f25 used alternatives.  So
-# we need to clean up the alternatives configuration until at least f27
-%{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python2_version} || :
-
-%if 0%{?with_python3}
-%pre -n python3-sphinx
-# python-sphinx as shipped in an update to f24 and f25 used alternatives.  So
-# we need to clean up the alternatives configuration until at least f27
-%{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python3_version} || :
-%endif # with_python3
+%endif # with tests
 
 
 %files latex
@@ -594,6 +614,81 @@ 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
+
+* Wed Apr 11 2018 Petr Viktorin <pviktori@redhat.com> - 1:1.7.2-1
+- Update to 1.7.2 (bz#1558968)
+
+* Tue Mar 13 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.7.1-1
+- Update to 1.7.1 (bz#1534802)
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Jan 09 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.6-1
+- Update to 1.6.6 (bz#1532435)
+
+* Mon Dec 11 2017 Iryna Shcherbina <ishcherb@redhat.com> - 1:1.6.5-2
+- Fix ambiguous Python 2 dependency declarations
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Mon Nov 06 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.5-1
+- Update to 1.6.5 (bz#1508237)
+
+* Mon Oct 09 2017 Troy Dawson <tdawson@redhat.com> - 1:1.6.4-2
+- Cleanup spec file conditionals
+
+* Tue Sep 26 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.4-1
+- Update to 1.6.4 (bz#1426928)
+
+* Wed Sep 20 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.3-3
+- Provide the epoch tag in order to keep the upgrade path clean.
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Thu Jul 20 2017 Charalampos Stratakis <cstratak@redhat.com> - - 1.6.3-1
 - Update to 1.6.3 (bz#1426928)
 

sources

@@ -1 +1 @@
-SHA512 (Sphinx-1.6.3.tar.gz) = d5aec58e19239db4e61fcd6b103fcc838d97aad5a7aaf9279ff1097791d9cd1ba245989307a2d1049c123058b84ca4e91db192a1672c040d80fafed3907736ae
+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'