diff --git a/.gitignore b/.gitignore index 0134fae..b4b31fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ -/Sphinx-1.2.3.tar.gz -/Sphinx-1.3.1.tar.gz -/Sphinx-1.4.4.tar.gz -/Sphinx-1.4.5.tar.gz -/Sphinx-1.4.6.tar.gz -/Sphinx-1.4.8.tar.gz -/Sphinx-1.4.9.tar.gz +/Sphinx-1.5.2.tar.gz diff --git a/python-sphinx.spec b/python-sphinx.spec index a6bcb47..8b2c97a 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -14,8 +14,8 @@ %endif Name: python-sphinx -Version: 1.4.9 -Release: 3%{?dist} +Version: 1.5.2 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -27,7 +27,6 @@ Group: Development/Tools License: BSD and Public Domain and Python and (MIT or GPLv2) URL: http://sphinx-doc.org/ Source0: https://files.pythonhosted.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz -#Patch0: Sphinx-1.2.1-mantarget.patch BuildArch: noarch BuildRequires: python2-devel >= 2.4 @@ -40,19 +39,26 @@ BuildRequires: python-six BuildRequires: python2-sphinx_rtd_theme BuildRequires: python2-sphinx-theme-alabaster BuildRequires: python2-imagesize +BuildRequires: python2-requests +BuildRequires: environment(modules) # for fixes BuildRequires: dos2unix # for testing BuildRequires: python-nose +BuildRequires: python2-pytest +BuildRequires: python-pytest-cov BuildRequires: gettext BuildRequires: texinfo BuildRequires: graphviz BuildRequires: python-sqlalchemy BuildRequires: python2-mock +BuildRequires: python2-simplejson +BuildRequires: python-html5lib BuildRequires: python-whoosh BuildRequires: python2-snowballstemmer +BuildRequires: python-enum34 # note: no Python3 xapian binding yet BuildRequires: xapian-bindings-python BuildRequires: texlive-collection-fontsrecommended @@ -62,7 +68,6 @@ BuildRequires: texlive-dvisvgm BuildRequires: texlive-ucs BuildRequires: tex(cmap.sty) BuildRequires: tex(ecrm1000.tfm) -BuildRequires: tex(fancybox.sty) BuildRequires: tex(footnote.sty) BuildRequires: tex(framed.sty) BuildRequires: tex(multirow.sty) @@ -85,6 +90,10 @@ BuildRequires: tex(eqparbox.sty) BuildRequires: tex(atbegshi.sty) BuildRequires: tex(anyfontsize.sty) BuildRequires: tex(luatex85.sty) +BuildRequires: tex(fncychap.sty) +BuildRequires: tex(tabulary.sty) +BuildRequires: tex(polyglossia.sty) +BuildRequires: tex(eu1enc.def) %if 0%{?with_python3} BuildRequires: python3-devel @@ -94,14 +103,19 @@ BuildRequires: python3-docutils BuildRequires: python3-jinja2 BuildRequires: python3-pygments 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 %endif # with_python3 @@ -147,6 +161,7 @@ Requires: python2-sphinx_rtd_theme Requires: python2-six Requires: python2-sphinx-theme-alabaster Requires: python2-imagesize +Requires: python2-requests Recommends: graphviz Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -198,7 +213,6 @@ Requires: texlive-dvisvgm Requires: texlive-ucs Requires: tex(cmap.sty) Requires: tex(ecrm1000.tfm) -Requires: tex(fancybox.sty) Requires: tex(footnote.sty) Requires: tex(framed.sty) Requires: tex(multirow.sty) @@ -221,6 +235,10 @@ Requires: tex(eqparbox.sty) Requires: tex(atbegshi.sty) Requires: tex(anyfontsize.sty) Requires: tex(luatex85.sty) +Requires: tex(fncychap.sty) +Requires: tex(tabulary.sty) +Requires: tex(polyglossia.sty) +Requires: tex(eu1enc.def) Obsoletes: python3-sphinx-latex < 1.4.4-2 %description latex @@ -249,6 +267,7 @@ Requires: python3-snowballstemmer Requires: python3-sphinx_rtd_theme Requires: python3-sphinx-theme-alabaster Requires: python3-imagesize +Requires: python3-requests Requires: python3-six Recommends: graphviz Requires(post): %{_sbindir}/update-alternatives @@ -258,7 +277,6 @@ Provides: python3-sphinxcontrib-napoleon = %{version}-%{release} Provides: python(Sphinx) = %{version}-%{release} %{?python_provide:%python_provide python3-sphinx} Conflicts: python2-Sphinx < %{version}-%{release} -Conflicts: python2-sphinx < %{version}-%{release} %description -n python3-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -528,6 +546,17 @@ fi %changelog +* Fri Feb 17 2017 Toshio Kuratomi - - 1.5.2-1 +- Update to 1.5.2 +- Remove a few latex dependencies that are no longer needed +- Remove xapian patch; now in upstream tarball + +* Fri Feb 17 2017 Fedora Release Engineering - 1.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 17 2017 Orion Poplawski - 1.5.1-1 +- Update to 1.5.1 + * Wed Jan 18 2017 Toshio Kuratomi - - 1.4.9-3 - Change alternatives priority so that the python2 version gets the default to follow Fedora policy. diff --git a/sources b/sources index 0eaf98a..a6650e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Sphinx-1.4.9.tar.gz) = 8dd16fc947a59a1fadb0b00f0f6a83a4dd1321569cdb86a96d68f6f9c9acb85d5fa234ffde1a986b95346569b166a90647cc5e9b64516bc184ebad932b1c0156 +SHA512 (Sphinx-1.5.2.tar.gz) = 32c8fb98d72e998fcce8c46ceddcbb0a0776d0e9ce75dc96cef48139b8b47ebe9636243fb48b9e04c8e1d5c56e09fc4c60248fbbef810fba9813b83a3e6cbe88