Merge branch 'SPHINX_4'

diff --combined sphinx-pdg.spec
index 8695c1560c78adfc7a18b63e878b5e3d990d8016,899ea72411b6ba74edc7422c5e26138952ef1bfc..aeb4c7b65a9cd21b902a5d3a0e57038100950eec
--- 1/sphinx-pdg.spec
--- 2/sphinx-pdg.spec
+++ b/sphinx-pdg.spec
@@@ -19,20 -19,21 +19,21 @@@ Group:             Development/Languages/Pytho
  Source0:      https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz
  # Source0-md5:        ed63e60d798d212c1afdecf8acda690e
  Patch0:               float-ver.patch
- Patch2:               Sphinx-docutils.patch
+ Patch1:               Sphinx-docutils.patch
  URL:          http://www.sphinx-doc.org/
  %if %{with tests} && %(locale -a | grep -q '^C\.utf8$'; echo $?)
  BuildRequires:        glibc-localedb-all
  %endif
  BuildRequires:        python3-babel >= 1.3
- BuildRequires:        python3-devel >= 1:3.5
- BuildRequires:        python3-modules >= 1:3.5
+ BuildRequires:        python3-devel >= 1:3.6
+ BuildRequires:        python3-modules >= 1:3.6
  BuildRequires:        python3-setuptools >= 1:7.0
  %if %{with tests}
  BuildRequires:        python3-Cython
  BuildRequires:        python3-alabaster >= 0.7
  BuildRequires:        python3-alabaster < 0.8
- BuildRequires:        python3-docutils >= 0.12
+ BuildRequires:        python3-docutils >= 0.14
+ BuildRequires:        python3-docutils < 0.19
  # for lint only (mypy)
  #BuildRequires:       python3-docutils-stubs
  # for lint, not run by pytest
@@@ -41,9 -42,12 +42,12 @@@ BuildRequires:      python3-html5li
  # for lint
  #BuildRequires:       python3-isort
  BuildRequires:        python3-imagesize
+ %if "%{_ver_lt '%{py3_ver}' '3.10'}" == "1"
+ BuildRequires:        python3-importlib_metadata >= 4.4
+ %endif
  BuildRequires:        python3-jinja2 >= 2.3
  # for lint only, not run by pytest
- #BuildRequires:       python3-mypy >= 0.800
+ #BuildRequires:       python3-mypy >= 0.931
  BuildRequires:        python3-packaging
  BuildRequires:        python3-pygments >= 2.0
  BuildRequires:        python3-pytest >= 3.0
@@@ -55,28 -59,28 +59,35 @@@ BuildRequires:     python3-snowballstemmer 
  BuildRequires:        python3-sphinxcontrib-applehelp
  BuildRequires:        python3-sphinxcontrib-devhelp
  BuildRequires:        python3-sphinxcontrib-jsmath
- BuildRequires:        python3-sphinxcontrib-htmlhelp
- BuildRequires:        python3-sphinxcontrib-serializinghtml
+ BuildRequires:        python3-sphinxcontrib-htmlhelp >= 2.0.0
+ BuildRequires:        python3-sphinxcontrib-serializinghtml >= 1.1.5
  BuildRequires:        python3-sphinxcontrib-qthelp
 -%if "%{_ver_lt '%{py3_ver}' '3.8'}" == "1"
 -BuildRequires:        python3-typed_ast
 -%endif
  %endif
  %if %{with doc}
- BuildRequires:        python3-docutils
 +BuildRequires:        python3-alabaster >= 0.7
 +BuildRequires:        python3-alabaster < 0.8
+ BuildRequires:        python3-docutils >= 0.14
+ BuildRequires:        python3-docutils < 0.19
 +BuildRequires:        python3-imagesize
+ %if "%{_ver_lt '%{py3_ver}' '3.10'}" == "1"
+ BuildRequires:        python3-importlib_metadata >= 4.4
+ %endif
 +BuildRequires:        python3-jinja2 >= 2.3
 +BuildRequires:        python3-packaging
 +BuildRequires:        python3-pygments
 +BuildRequires:        python3-requests >= 2.5.0
  BuildRequires:        python3-sphinxcontrib-applehelp
  BuildRequires:        python3-sphinxcontrib-devhelp
- BuildRequires:        python3-sphinxcontrib-htmlhelp
+ BuildRequires:        python3-sphinxcontrib-htmlhelp >= 2.0.0
  BuildRequires:        python3-sphinxcontrib-qthelp
- BuildRequires:        python3-sphinxcontrib-serializinghtml
+ BuildRequires:        python3-sphinxcontrib-serializinghtml >= 1.1.5
  BuildRequires:        python3-sphinxcontrib-websupport
++%if "%{_ver_lt '%{py3_ver}' '3.8'}" == "1"
++BuildRequires:        python3-typed_ast
++%endif
  %endif
  BuildRequires:        rpm-pythonprov
- BuildRequires:        rpmbuild(macros) >= 1.714
+ BuildRequires:        rpmbuild(macros) >= 1.749
  BuildRequires:        sed >= 4.0
  %if %{with tests}
  # for test_build_latex.py (disabled now)
@@@ -110,9 -114,10 +121,10 @@@ Summary: Sphinx Python documentation ge
  Summary(pl.UTF-8):    Sphinx - narzędzie do tworzenia dokumentacji dla Pythona (moduły Pythona 3.x)
  Group:                Development/Languages/Python
  Requires:     python3-alabaster >= 0.7
- Requires:     python3-docutils >= 0.12
+ Requires:     python3-docutils >= 0.14
  Requires:     python3-modules >= 1:3.5
  Requires:     python3-devel-tools
+ Conflicts:    python3-sphinxcontrib-asyncio < 0.3.0
  Conflicts:    sphinx-pdg-3 < 1.0.7-2
  
  %description -n python3-Sphinx
@@@ -141,7 -146,7 +153,7 @@@ Dokumentacja do generatora dokumentacj
  %prep
  %setup -q -n Sphinx-%{version}
  %patch0 -p1
- %patch2 -p1
+ %patch1 -p1
  
  # needs python-babel with at least de,en,ja locales installed
  %{__rm} tests/test_util_i18n.py