- Update to 2.1:

* Many major updates in the package
  * Supports only python 3.5+
- Remove obsolete conditionals wrt 3.5+ only support

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=127

Sphinx-1.8.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7658aab75c920288a8cf6f09f244c6cfdae30d82d803ac1634d9f223a80ca08
-size 5756582

Sphinx-2.1.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7a359a91fb04054ec77d68ff97cb8728f8cc322e25f22dc94299d67e0e6a7123
+size 6229880

python-Sphinx.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jun  4 11:37:51 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Update to 2.1:
+  * Many major updates in the package
+  * Supports only python 3.5+
+- Remove obsolete conditionals wrt 3.5+ only support
+
 -------------------------------------------------------------------
 Wed Apr 10 20:43:43 UTC 2019 - Dirk Mueller <dmueller@suse.com>
 

python-Sphinx.spec

@@ -18,11 +18,6 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define oldpython python
-%if 0%{?suse_version} != 1315
-%bcond_without latex
-%else
-%bcond_with latex
-%endif
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
 %define psuffix -test
@@ -31,8 +26,9 @@
 %define psuffix %{nil}
 %bcond_with test
 %endif
+%define skip_python2 1
 Name:           python-Sphinx%{psuffix}
-Version:        1.8.5
+Version:        2.1.0
 Release:        0
 Summary:        Python documentation generator
 License:        BSD-2-Clause
@@ -49,47 +45,36 @@ Requires:       python-Babel >= 1.3
 Requires:       python-Jinja2 >= 2.3
 Requires:       python-Pygments >= 2.1
 Requires:       python-alabaster >= 0.7
-Requires:       python-docutils >= 0.11
+Requires:       python-docutils >= 0.12
 Requires:       python-imagesize
-Requires:       python-requests >= 2.0.0
+Requires:       python-requests >= 2.5.0
-Requires:       python-six >= 1.5
+Requires:       python-setuptools
 Requires:       python-snowballstemmer >= 1.1
 Requires:       python-sphinx_rtd_theme
+Requires:       python-sphinxcontrib-applehelp
+Requires:       python-sphinxcontrib-devhelp
+Requires:       python-sphinxcontrib-htmlhelp
+Requires:       python-sphinxcontrib-jsmath
+Requires:       python-sphinxcontrib-qthelp
+Requires:       python-sphinxcontrib-serializinghtml
 Requires:       python-sphinxcontrib-websupport
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
+Recommends:     python-SQLAlchemy >= 0.9
+Recommends:     python-Sphinx-doc-man
+Recommends:     python-Whoosh >= 2.0
 BuildArch:      noarch
 %if %{with test}
 BuildRequires:  %{python_module Sphinx = %{version}}
 BuildRequires:  %{python_module Sphinx-latex = %{version}}
 BuildRequires:  %{python_module html5lib}
-BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module sphinxcontrib-websupport}
 BuildRequires:  ImageMagick
 BuildRequires:  python3-mypy
+BuildRequires:  python3-testsuite
 BuildRequires:  python3-typed-ast
 %endif
-%if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24
-Recommends:     python-Sphinx-doc-man
-Recommends:     python-SQLAlchemy >= 0.9
-Recommends:     python-Whoosh >= 2.0
-%endif
-%ifpython2
-Requires:       python-enum34
-Requires:       python-typing
-%endif
-%ifpython3
-%if %{python3_version_nodots} < 35
-Requires:       python-typing
-%endif
-%endif
-%ifpython2
-%if ! %{with test}
-Obsoletes:      %{oldpython}-sphinx < %{version}
-Provides:       %{oldpython}-sphinx = %{version}
-%endif
-%endif
 %python_subpackages
 
 %description
@@ -106,8 +91,11 @@ the parsing and translating suite, the Docutils.
 Summary:        Sphinx packages for LaTeX
 Group:          Productivity/Publishing/TeX/Base
 Requires:       python-Sphinx = %{version}
+Requires:       texlive-dvipng
 Requires:       texlive-gnu-freefont
 Requires:       texlive-latex
+Requires:       texlive-latexmk
+Requires:       texlive-makeindex
 Requires:       texlive-metafont
 Requires:       texlive-pdftex
 Requires:       tex(8r.enc)
@@ -167,13 +155,8 @@ Requires:       tex(titlesec.sty)
 Requires:       tex(upquote.sty)
 Requires:       tex(utf8.def)
 Requires:       tex(utf8x.def)
-Requires:       tex(wrapfig.sty)
-%if 0%{?suse_version} > 1320
-Requires:       texlive-dvipng
-Requires:       texlive-latexmk
-Requires:       texlive-makeindex
 Requires:       tex(varwidth.sty)
-%endif
+Requires:       tex(wrapfig.sty)
 
 %description    latex
 Sphinx is a tool that facilitates creating documentation for Python
@@ -185,7 +168,7 @@ This package contains the LaTeX components for python-Sphinx.
 %package -n python-Sphinx-doc
 Summary:        Man files for python-Sphinx
 Group:          Documentation/Other
-Requires:       python-Sphinx = %{version}
+Requires:       python3-Sphinx = %{version}
 
 %description -n python-Sphinx-doc
 Sphinx is a tool that facilitates creating documentation for Python
@@ -202,7 +185,8 @@ This package contains the documentation for Sphinx.
 %package -n python-Sphinx-doc-man
 Summary:        Man files for python-Sphinx
 Group:          Documentation/Man
-Requires:       python-Sphinx = %{version}
+Requires:       python3-Sphinx = %{version}
+Supplements:    python3-Sphinx
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
 Obsoletes:      %{python_module Sphinx-doc-man-common <= %{version}}
@@ -255,10 +239,6 @@ mv build/sphinx/{html,man} build.doc/
 %python_expand mkdir -p %{buildroot}%{$python_sitelib}/sphinxcontrib
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-# # Prepare lang lists
-# %%find_lang sphinx
-# %%python_expand grep -F "%%{$python_sitelib}" sphinx.lang > sphinx_%%{$python_bin_suffix}.lang
-
 %else
 mkdir -p %{buildroot}%{_docdir}/python-Sphinx/
 mv build.doc/html %{buildroot}%{_docdir}/python-Sphinx/
@@ -268,12 +248,6 @@ mv build.doc/man/sphinx-all.1 %{buildroot}%{_mandir}/man1/sphinx-all.1
 mv build.doc/man/sphinx-apidoc.1 %{buildroot}%{_mandir}/man1/sphinx-apidoc.1
 mv build.doc/man/sphinx-build.1 %{buildroot}%{_mandir}/man1/sphinx-build.1
 mv build.doc/man/sphinx-quickstart.1 %{buildroot}%{_mandir}/man1/sphinx-quickstart.1
-
-%python_clone %{buildroot}%{_mandir}/man1/sphinx-all.1
-%python_clone %{buildroot}%{_mandir}/man1/sphinx-apidoc.1
-%python_clone %{buildroot}%{_mandir}/man1/sphinx-build.1
-%python_clone %{buildroot}%{_mandir}/man1/sphinx-quickstart.1
-
 %endif
 
 # Always deduplicate
@@ -290,44 +264,32 @@ mv build.doc/man/sphinx-quickstart.1 %{buildroot}%{_mandir}/man1/sphinx-quicksta
 %check
 %if %{with test}
 export LC_ALL="C.utf8"
-%{python_expand export PYTHONPATH=$PYTHONPATH:%{buildroot}%{$python_sitelib}
+%pytest tests -k 'not (linkcheck or test_latex_images)'
-py.test-%{$python_bin_suffix} --ignore=_build.python3 --ignore=_build.python2 -k 'not (linkcheck or test_latex_images)' -v tests
-# $python -mpytest --ignore=_build.python3 --ignore=_build.python2 -k 'not linkcheck' -v tests
-}
 %endif
 
+%if ! %{with test}
 %files %{python_files}
 %license LICENSE
 %doc AUTHORS CHANGES README.rst
-%if ! %{with test}
 %python_alternative %{_bindir}/sphinx-apidoc
 %python_alternative %{_bindir}/sphinx-autogen
 %python_alternative %{_bindir}/sphinx-build
 %python_alternative %{_bindir}/sphinx-quickstart
 %{python_sitelib}/sphinx/
-%if %{with latex}
 %exclude %{python_sitelib}/sphinx/texinputs/
-%endif
 %{python_sitelib}/Sphinx-%{version}-py*.egg-info
 %dir %{python_sitelib}/sphinxcontrib
 
-# Requirements are not available on SLES
-%if %{with latex}
 %files %{python_files latex}
 %license LICENSE
 %doc AUTHORS
 %{python_sitelib}/sphinx/texinputs/
 %endif
-%endif
 
 %if %{with test}
 %files -n python-Sphinx-doc-man
 %license LICENSE
 %doc AUTHORS
-%{_mandir}/man1/sphinx-all-*.1%{?ext_man}
-%{_mandir}/man1/sphinx-apidoc-*.1%{?ext_man}
-%{_mandir}/man1/sphinx-build-*.1%{?ext_man}
-%{_mandir}/man1/sphinx-quickstart-*.1%{?ext_man}
 %{_mandir}/man1/sphinx-all.1%{?ext_man}
 %{_mandir}/man1/sphinx-apidoc.1%{?ext_man}
 %{_mandir}/man1/sphinx-build.1%{?ext_man}
@@ -338,7 +300,6 @@ py.test-%{$python_bin_suffix} --ignore=_build.python3 --ignore=_build.python2 -k
 %doc AUTHORS
 %dir %{_docdir}/python-Sphinx/
 %{_docdir}/python-Sphinx/html/
-
 %endif
 
 %changelog