- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
Update to 3.4.3
2021-01-27 13:30:25 +00:00 · 2021-01-19 12:47:35 +00:00 · 2021-01-08 20:01:30 +00:00 · 2020-12-08 11:07:38 +01:00 · 2020-11-24 21:00:32 +01:00 · 2020-11-24 21:00:32 +01:00
3 changed files with 45 additions and 44 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,5 @@
 /Sphinx-3.1.1.tar.gz
 /Sphinx-3.1.2.tar.gz
 /Sphinx-3.2.1.tar.gz
+/Sphinx-3.3.1.tar.gz
+/Sphinx-3.4.3.tar.gz
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -4,6 +4,9 @@
 # Also, we don't have all the tests requirements
 %bcond_without tests

+# Unset -s on python shebang to allow RPM-installed sphinx to be used
+# with user-installed modules (#1903763)
+%global py3_shebang_flags %nil

 # No internet in Koji
 %bcond_with internet
@@ -21,11 +24,11 @@
 %global upstream_name Sphinx

 Name:       python-sphinx
-%global     general_version 3.2.1
+%global     general_version 3.4.3
 #global     prerel ...
 %global     upstream_version %{general_version}%{?prerel}
 Version:    %{general_version}%{?prerel:~%{prerel}}
-Release:    1%{?dist}
+Release:    2%{?dist}
 Epoch:      1
 Summary:    Python documentation generator

@@ -44,23 +47,9 @@ Patch1:     sphinx-test_theming.diff

 BuildArch:     noarch

+BuildRequires: make
 BuildRequires: python%{python3_pkgversion}-devel
-BuildRequires: python%{python3_pkgversion}-setuptools
-
-BuildRequires: python%{python3_pkgversion}-babel
-BuildRequires: python%{python3_pkgversion}-docutils
-BuildRequires: python%{python3_pkgversion}-imagesize
-BuildRequires: python%{python3_pkgversion}-jinja2
-BuildRequires: python%{python3_pkgversion}-packaging
-BuildRequires: python%{python3_pkgversion}-pygments
-BuildRequires: python%{python3_pkgversion}-requests
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-applehelp
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-devhelp
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-htmlhelp
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-jsmath
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-qthelp
-BuildRequires: python%{python3_pkgversion}-sphinxcontrib-serializinghtml
-BuildRequires: python%{python3_pkgversion}-sphinx-theme-alabaster
+BuildRequires: pyproject-rpm-macros

 %if %{with websupport}
 BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport
@@ -73,11 +62,7 @@ BuildRequires: dos2unix
 # tests import _testcapi
 BuildRequires: python%{python3_pkgversion}-test

-BuildRequires: python%{python3_pkgversion}-html5lib
-BuildRequires: python%{python3_pkgversion}-mock
-BuildRequires: python%{python3_pkgversion}-pytest
-BuildRequires: python%{python3_pkgversion}-snowballstemmer
-
+BuildRequires: gcc
 BuildRequires: gettext
 BuildRequires: graphviz
 BuildRequires: texinfo
@@ -154,22 +139,12 @@ Summary:       Python documentation generator

 Recommends:    graphviz
 Recommends:    ImageMagick
-%{?python_provide:%python_provide python%{python3_pkgversion}-sphinx}

 # Bundled JavaScript
-Provides:      bundled(jquery) = 3.2.1
+Provides:      bundled(jquery) = 3.5.1
 Provides:      bundled(underscore) = 1.3.1
 Provides:      bundled(css3-mediaqueries) = 1.0

-# Remove in F33
-Obsoletes:     python-sphinx-locale < 1:2
-Provides:      python-sphinx-locale = %{epoch}:%{version}-%{release}
-Obsoletes:     python%{python3_pkgversion}-sphinxcontrib-napoleon < 0.3.0
-Provides:      python%{python3_pkgversion}-sphinxcontrib-napoleon = %{epoch}:%{version}-%{release}
-Conflicts:     python2-Sphinx < 1:2
-Conflicts:     python2-sphinx < 1:2
-Provides:      python(Sphinx) = %{epoch}:%{version}-%{release}
-
 %description -n python%{python3_pkgversion}-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
 beautiful documentation for Python projects (or other documents
@@ -233,11 +208,8 @@ Requires:      tex(upquote.sty)
 Requires:      tex(utf8x.def)
 Requires:      tex(wrapfig.sty)

-%{?python_provide:%python_provide python%{python3_pkgversion}-sphinx-latex}
-
-# Remove in F33
-Obsoletes:     python-sphinx-latex < 1:2
-Provides:      python-sphinx-latex = %{epoch}:%{version}-%{release}
+# No files in this package, automatic provides don't work:
+%py_provides   python%{python3_pkgversion}-sphinx-latex

 %description  -n python%{python3_pkgversion}-sphinx-latex
 Sphinx is a tool that makes it easy to create intelligent and
@@ -277,13 +249,22 @@ dos2unix -k ./sphinx/themes/basic/static/jquery.js
 rm tests/test_ext_imgconverter.py
 %endif

+# Don't measure coverage:
+sed -i '/pytest-cov/d' setup.py
+# Not needed on recent Pythons, https://github.com/sphinx-doc/sphinx/pull/8483
+sed -i '/typed_ast/d' setup.py
+
+
+%generate_buildrequires
+%pyproject_buildrequires %{?with_tests:-x test}
+

 %build
-%py3_build
+%pyproject_wheel

 export PYTHONPATH=$PWD
 pushd doc
-export SPHINXBUILD="%{__python3} ../sphinx/cmd/build.py"
+export SPHINXBUILD="%{python3} ../sphinx/cmd/build.py"
 make html SPHINXBUILD="$SPHINXBUILD"
 make man SPHINXBUILD="$SPHINXBUILD"
 rm -rf _build/html/.buildinfo
@@ -292,7 +273,7 @@ popd


 %install
-%py3_install
+%pyproject_install

 # For backwards compatibility. Remove with care, if at all
 for i in sphinx-{apidoc,autogen,build,quickstart}; do
@@ -366,7 +347,7 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
 %{_bindir}/sphinx-*
 %{python3_sitelib}/sphinx/
 %dir %{python3_sitelib}/sphinxcontrib/
-%{python3_sitelib}/Sphinx-%{upstream_version}-py%{python3_version}.egg-info/
+%{python3_sitelib}/Sphinx-%{upstream_version}.dist-info/
 %dir %{_datadir}/sphinx/
 %dir %{_datadir}/sphinx/locale
 %dir %{_datadir}/sphinx/locale/*
@@ -383,6 +364,24 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib


 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 19 2021 Charalampos Stratakis <cstratak@redhat.com> - 1:3.4.3-1
+- Update to 3.4.3
+- Fixes rhbz#1909494
+
+* Sat Dec 05 2020 Mattia Verga <mattia.verga@protonmail.com> - 1:3.3.1-2
+- Unset -s from python shebang
+- Fixes: rhbz#1903763
+
+* Mon Nov 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.3.1-1
+- Update to 3.3.1
+- Fixes: rhbz#1893752
+
+* Wed Oct 14 2020 Tomas Hrnciar <thrnciar@redhat.com> - 1:3.2.1-2
+- Backport commit to fix python-sphinx with python-pygments v2.7.1
+
 * Tue Aug 18 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.2.1-1
 - Update to 3.2.1
 - Remove compatibility symbolic links from /usr/libexec/
--- a/2
+++ b/2
@@ -1 +1 @@
-SHA512 (Sphinx-3.2.1.tar.gz) = 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb
+SHA512 (Sphinx-3.4.3.tar.gz) = 2e085e00c722f3aaf34552eefc3842daf5443f7b8a11afa850db1e31ad81d5ff7f579622b91f982b21708fa6379907bac4fe72d42dc05859a3f62c75298facaa
Author	SHA1	Message	Date
Fedora Release Engineering	f7572144d2	- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2021-01-27 13:30:25 +00:00
Charalampos Stratakis	4500554943	Update to 3.4.3	2021-01-19 12:47:35 +00:00
Tom Stellard	82817e3a80	Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot	2021-01-08 20:01:30 +00:00
Mattia Verga	daad1311b1	Unset -s from python shebang	2020-12-08 11:07:38 +01:00
Miro Hrončok	67bdc19f10	Convert to pyproject macros This adds an (optional) test dependency on Cython + gcc. This removes an unused dependency on mock. Not using %{pyproject_files} because the %install section is a mess.	2020-11-24 21:00:32 +01:00
Miro Hrončok	bcde98f61b	Remove old Obsoletes, Provides and Conflicts	2020-11-24 21:00:32 +01:00
Miro Hrončok	9e608a0fa5	Update to 3.3.1	2020-11-23 21:38:34 +01:00
Tomas Hrnciar	976a71363d	Backport commit to fix sphinx with latest version of pygments	2020-10-14 10:09:07 +02:00