- 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 86 additions and 63 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,8 @@
 /Sphinx-2.1.2.tar.gz
 /Sphinx-2.2.0.tar.gz
 /Sphinx-2.2.2.tar.gz
+/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
@@ -15,11 +18,13 @@
 %bcond_without imagemagick_tests
 %endif

+# During texlive updates, sometimes the latex environment is unstable
+%bcond_without latex_tests

 %global upstream_name Sphinx

 Name:       python-sphinx
-%global     general_version 2.2.2
+%global     general_version 3.4.3
 #global     prerel ...
 %global     upstream_version %{general_version}%{?prerel}
 Version:    %{general_version}%{?prerel:~%{prerel}}
@@ -42,26 +47,12 @@ Patch1:     sphinx-test_theming.diff

 BuildArch:     noarch

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

 %if %{with websupport}
-BuildRequires: python3-sphinxcontrib-websupport
+BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport
 %endif

 # for fixes
@@ -69,13 +60,9 @@ BuildRequires: dos2unix

 %if %{with tests}
 # tests import _testcapi
-BuildRequires: python3-test
-
-BuildRequires: python3-html5lib
-BuildRequires: python3-mock
-BuildRequires: python3-pytest
-BuildRequires: python3-snowballstemmer
+BuildRequires: python%{python3_pkgversion}-test

+BuildRequires: gcc
 BuildRequires: gettext
 BuildRequires: graphviz
 BuildRequires: texinfo
@@ -84,6 +71,7 @@ BuildRequires: texinfo
 BuildRequires: ImageMagick
 %endif

+%if %{with latex_tests}
 BuildRequires: texlive-collection-fontsrecommended
 BuildRequires: texlive-collection-latex
 BuildRequires: texlive-dvipng
@@ -114,6 +102,7 @@ BuildRequires: tex(upquote.sty)
 BuildRequires: tex(utf8x.def)
 BuildRequires: tex(wrapfig.sty)
 %endif
+%endif


 %description
@@ -145,28 +134,18 @@ the Python docs:
      snippets and inclusion of appropriately formatted docstrings.


-%package -n python3-sphinx
+%package -n python%{python3_pkgversion}-sphinx
 Summary:       Python documentation generator

 Recommends:    graphviz
 Recommends:    ImageMagick
-%{?python_provide:%python_provide python3-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:     python3-sphinxcontrib-napoleon < 0.3.0
-Provides:      python3-sphinxcontrib-napoleon = %{epoch}:%{version}-%{release}
-Conflicts:     python2-Sphinx < 1:2
-Conflicts:     python2-sphinx < 1:2
-Provides:      python(Sphinx) = %{epoch}:%{version}-%{release}
-
-%description -n python3-sphinx
+%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
 consisting of multiple reStructuredText sources), written by Georg
@@ -195,10 +174,10 @@ the Python docs:
      snippets and inclusion of appropriately formatted docstrings.


-%package -n python3-sphinx-latex
-Summary:       LaTeX builder dependencies for python3-sphinx
+%package -n python%{python3_pkgversion}-sphinx-latex
+Summary:       LaTeX builder dependencies for python%{python3_pkgversion}-sphinx

-Requires:      python3-sphinx = %{epoch}:%{version}-%{release}
+Requires:      python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
 Requires:      texlive-collection-fontsrecommended
 Requires:      texlive-collection-latex
 Requires:      texlive-dvipng
@@ -229,13 +208,10 @@ Requires:      tex(upquote.sty)
 Requires:      tex(utf8x.def)
 Requires:      tex(wrapfig.sty)

-%{?python_provide:%python_provide python3-sphinx-latex}
+# No files in this package, automatic provides don't work:
+%py_provides   python%{python3_pkgversion}-sphinx-latex

-# Remove in F33
-Obsoletes:     python-sphinx-latex < 1:2
-Provides:      python-sphinx-latex = %{epoch}:%{version}-%{release}
-
-%description  -n python3-sphinx-latex
+%description  -n python%{python3_pkgversion}-sphinx-latex
 Sphinx is a tool that makes it easy to create intelligent and
 beautiful documentation for Python projects (or other documents
 consisting of multiple reStructuredText sources), written by Georg
@@ -250,7 +226,7 @@ builder.
 %package doc
 Summary:       Documentation for %{name}
 License:       BSD
-Recommends:    python3-sphinx = %{epoch}:%{version}-%{release}
+Recommends:    python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}

 %description doc
 Sphinx is a tool that makes it easy to create intelligent and
@@ -273,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
@@ -288,14 +273,12 @@ popd


 %install
-%py3_install
+%pyproject_install

-# For backwards compatibility. Remove around Fedora 33 (with care)
-install -d %{buildroot}%{_libexecdir}/python3-sphinx
+# For backwards compatibility. Remove with care, if at all
 for i in sphinx-{apidoc,autogen,build,quickstart}; do
    ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version}
    ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-3
-    ln -s %{_bindir}/$i %{buildroot}%{_libexecdir}/python3-sphinx/$i
 done

 # Clean up non-python files
@@ -349,11 +332,8 @@ mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib

 %if %{with tests}
 %check
-export PYTHONPATH=%{buildroot}%{python3_sitelib}
-export PATH=%{buildroot}%{_bindir}:$PATH
-
 # Currently, all linkcheck tests and test_latex_images need internet
-%{__python3} -m pytest \
+%pytest \
 %if %{without internet}
    -k "not linkcheck and not test_latex_images" \
 %endif
@@ -361,21 +341,20 @@ export PATH=%{buildroot}%{_bindir}:$PATH
 %endif


-%files -n python3-sphinx -f sphinx.lang
+%files -n python%{python3_pkgversion}-sphinx -f sphinx.lang
 %license LICENSE
 %doc AUTHORS CHANGES EXAMPLES README.rst
 %{_bindir}/sphinx-*
 %{python3_sitelib}/sphinx/
 %dir %{python3_sitelib}/sphinxcontrib/
-%{python3_sitelib}/Sphinx-%{upstream_version}-py%{python3_version}.egg-info/
-%{_libexecdir}/python3-sphinx/
+%{python3_sitelib}/Sphinx-%{upstream_version}.dist-info/
 %dir %{_datadir}/sphinx/
 %dir %{_datadir}/sphinx/locale
 %dir %{_datadir}/sphinx/locale/*
 %{_mandir}/man1/sphinx-*


-%files -n python3-sphinx-latex
+%files -n python%{python3_pkgversion}-sphinx-latex
 # empty, this is a metapackage


@@ -385,6 +364,45 @@ export PATH=%{buildroot}%{_bindir}:$PATH


 %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/
+- Fixes rhbz#1867294
+
+* Fri Aug 07 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.1.2-1
+- Update to 3.1.2
+- Fixes rhbz#1853901
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jun 30 2020 Charalampos Stratakis <cstratak@redhat.com> - 1:3.1.1-1
+- Update to 3.1.1 (#1783776)
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-4
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-3
+- Bootstrap for Python 3.9
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

--- a/2
+++ b/2
@@ -1 +1 @@
-SHA512 (Sphinx-2.2.2.tar.gz) = 2aaed5980c6fb3bf1a8b2911bbf5d7b8a2d9356e2e9faad58e9ac93e76f76e0c5f40243774553a719dfe982e5e683821545db56142cd8e3db914e97e363124f1
+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
Miro Hrončok	5bf9c06479	Update to 3.2.1 - Remove compatibility symbolic links from /usr/libexec/ - Use %pytest	2020-08-18 13:30:22 +02:00
Frédéric Pierret (fepitre)	884ff2afc1	spec: replace hardcoded python3 Signed-off-by: Frédéric Pierret (fepitre) <frederic.pierret@qubes-os.org>	2020-08-10 15:26:10 +00:00
Miro Hrončok	1d11fd11e2	Update to 3.1.2 Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1853901	2020-08-08 02:03:30 +02:00
Fedora Release Engineering	39005de2f4	- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2020-07-29 03:58:57 +00:00
Miro Hrončok	686ccb777b	Fix e-mail address in changelog	2020-06-30 18:28:53 +02:00
Charalampos Stratakis	e4c8578188	Update to 3.1.1 (#1783776 )	2020-06-30 17:50:11 +02:00
Miro Hrončok	95033b7db0	Reenable latex tests	2020-05-28 20:46:34 +02:00
Miro Hrončok	1a1e29e5a8	Rebuilt for Python 3.9	2020-05-23 09:21:40 +02:00
Miro Hrončok	19463ebbdd	Bootstrap for Python 3.9	2020-05-22 19:20:34 +02:00
Miro Hrončok	23b5cdf21e	Backport another patch from upstream for Python 3.9 support	2020-05-20 09:58:45 +02:00
Miro Hrončok	7afb2d61aa	Skip latex tests See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/ILL6SD5U74RTVPDEK4WU743USLSQCIA3/	2020-05-20 09:58:38 +02:00
Miro Hrončok	d237e99bb9	Fix tests for Python3.9.0a5+ Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1829705	2020-05-11 13:19:44 +02:00