diff --git a/python-Sphinx.changes b/python-Sphinx.changes index a5d2733..a8c8912 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17daa3cc911e790dbecde3f25ddc83fbb34eda206cc62a5e421618fbcd47818d -size 143695 +oid sha256:c5797b8f897dd3aca5cb81b63f2c089c71ca6892ef122b6090b63fdf44992593 +size 143874 diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 777d9b2..fcd6dd1 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -16,8 +16,7 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define oldpython python +%{?!python_module:%define python_module() python3-%{**}} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -test @@ -55,6 +54,7 @@ Requires: python-Pygments >= 2.1 Requires: python-alabaster >= 0.7 Requires: python-docutils >= 0.12 Requires: python-imagesize +Requires: python-packaging Requires: python-requests >= 2.5.0 Requires: python-setuptools Requires: python-snowballstemmer >= 1.1 @@ -66,6 +66,9 @@ Requires: python-sphinxcontrib-jsmath Requires: python-sphinxcontrib-qthelp >= 1.0.2 Requires: python-sphinxcontrib-serializinghtml >= 1.1.5 Requires: python-sphinxcontrib-websupport +%if 0%{?python_version_nodots} < 310 +Requires: python-importlib-metadata >= 4.4 +%endif Requires(post): update-alternatives Requires(postun):update-alternatives Recommends: python-SQLAlchemy >= 0.9 @@ -80,7 +83,7 @@ BuildRequires: %{python_module html5lib} BuildRequires: %{python_module pytest} BuildRequires: %{python_module sphinxcontrib-websupport} BuildRequires: %{python_module testsuite} -BuildRequires: %{python_module typed-ast} +BuildRequires: (python3-typed-ast if python3-base < 3.8) BuildRequires: ImageMagick BuildRequires: graphviz # For PNG format