From 3d9a6101c90e2d42e83883daf131b7d3338eee90 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Tue, 13 Mar 2018 15:15:28 +0100 Subject: [PATCH] Update to 1.7.1 (bz#1534802) --- .gitignore | 1 + python-sphinx.spec | 44 +++++++++++++------------------------------- sources | 2 +- 3 files changed, 15 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 47766fd..81ac3ef 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /Sphinx-1.6.4.tar.gz /Sphinx-1.6.5.tar.gz /Sphinx-1.6.6.tar.gz +/Sphinx-1.7.1.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index 0aa9e94..ba0c0f6 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,8 +14,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.6.6 -Release: 2%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Epoch: 1 Summary: Python documentation generator @@ -54,6 +54,7 @@ BuildRequires: python2-sphinx_rtd_theme BuildRequires: python2-sphinx-theme-alabaster BuildRequires: python2-imagesize BuildRequires: python2-requests +BuildRequires: python2-packaging BuildRequires: python2-typing BuildRequires: python2-sphinxcontrib-websupport BuildRequires: environment(modules) @@ -132,6 +133,7 @@ BuildRequires: python3-snowballstemmer BuildRequires: python3-six BuildRequires: python3-sphinx_rtd_theme BuildRequires: python3-sphinx-theme-alabaster +BuildRequires: python3-packaging BuildRequires: python3-imagesize BuildRequires: python3-requests BuildRequires: python3-sphinxcontrib-websupport @@ -181,6 +183,7 @@ Requires: python2-six Requires: python2-sphinx-theme-alabaster Requires: python2-imagesize Requires: python2-requests +Requires: python2-packaging Requires: python2-typing Requires: python2-sphinxcontrib-websupport Requires: environment(modules) @@ -295,6 +298,7 @@ Requires: python3-imagesize Requires: python3-requests Requires: python3-six Requires: python3-sphinxcontrib-websupport +Requires: python3-packaging Recommends: graphviz Recommends: ImageMagick Requires: environment(modules) @@ -374,8 +378,6 @@ 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 @@ -408,12 +410,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 @@ -424,12 +420,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 @@ -460,7 +450,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 @@ -518,7 +508,9 @@ done # 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=en_US.UTF-8 %{__python2} -m pytest -v --ignore=tests/test_api_translator.py %if 0%{?with_python3} pushd %{py3dir} # Currently, all linkcheck tests hit external websites. Since network access @@ -529,19 +521,6 @@ 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 - - %files latex %license LICENSE @@ -595,6 +574,9 @@ popd %changelog +* Tue Mar 13 2018 Charalampos Stratakis - 1:1.7.1-1 +- Update to 1.7.1 (bz#1534802) + * Fri Feb 09 2018 Fedora Release Engineering - 1:1.6.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 5c2d7d9..f70f705 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.6.6.tar.gz) = 5f6a88805b2a032302c70ef59f4ed65fc149feef94ed303d579af67de7297ebd6867481d966d668f5ab00a30238bbfbc09d715582fd74993af230c8e5eede30f +SHA512 (Sphinx-1.7.1.tar.gz) = ea9a7b512cde5c39d75d0d5e8856954c334c84f91bba6a9d3b604df1df688639b20115ec71e55f80c802e90234db5e48d5766fbe8619e4a9f2890e1d7aab915f