Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

[skip changelog]

.gitignore

@@ -1 +1,2 @@
 /sphinxcontrib-qthelp-*.tar.gz
+/sphinxcontrib_qthelp-*.tar.gz

14.patch

@@ -1,82 +0,0 @@
-From 40f9dc8921486b7fd8ac84964f1e45103b540b81 Mon Sep 17 00:00:00 2001
-From: MeggyCal <MeggyCal@users.noreply.github.com>
-Date: Wed, 1 Jun 2022 10:35:11 +0200
-Subject: [PATCH] Fix tests with Sphinx 5.0
-
----
- tests/test_qthelp.py | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/tests/test_qthelp.py b/tests/test_qthelp.py
-index fd83241..4c5f77d 100644
---- a/tests/test_qthelp.py
-+++ b/tests/test_qthelp.py
-@@ -17,7 +17,7 @@
- def test_qthelp_basic(app, status, warning):
-     app.builder.build_all()
- 
--    qhp = (app.outdir / 'Python.qhp').text()
-+    qhp = (app.outdir / 'Python.qhp').read_text()
-     assert '<customFilter name="Python ">' in qhp
-     assert '<filterAttribute>Python</filterAttribute>' in qhp
-     assert '<filterAttribute></filterAttribute>' in qhp
-@@ -26,7 +26,7 @@ def test_qthelp_basic(app, status, warning):
-     assert '<file>index.html</file>' in qhp
-     assert '<file>_static/basic.css</file>' in qhp
- 
--    qhcp = (app.outdir / 'Python.qhcp').text()
-+    qhcp = (app.outdir / 'Python.qhcp').read_text()
-     assert '<title>Python  documentation</title>' in qhcp
-     assert '<homePage>qthelp://org.sphinx.python/doc/index.html</homePage>' in qhcp
-     assert '<startPage>qthelp://org.sphinx.python/doc/index.html</startPage>' in qhcp
-@@ -91,10 +91,10 @@ def test_qthelp_namespace(app, status, warning):
-     # default namespace
-     app.builder.build_all()
- 
--    qhp = (app.outdir / 'Python.qhp').text()
-+    qhp = (app.outdir / 'Python.qhp').read_text()
-     assert '<namespace>org.sphinx.python</namespace>' in qhp
- 
--    qhcp = (app.outdir / 'Python.qhcp').text()
-+    qhcp = (app.outdir / 'Python.qhcp').read_text()
-     assert '<homePage>qthelp://org.sphinx.python/doc/index.html</homePage>' in qhcp
-     assert '<startPage>qthelp://org.sphinx.python/doc/index.html</startPage>' in qhcp
- 
-@@ -102,10 +102,10 @@ def test_qthelp_namespace(app, status, warning):
-     app.config.qthelp_namespace = 'org.sphinx-doc.sphinx'
-     app.builder.build_all()
- 
--    qhp = (app.outdir / 'Python.qhp').text()
-+    qhp = (app.outdir / 'Python.qhp').read_text()
-     assert '<namespace>org.sphinx-doc.sphinx</namespace>' in qhp
- 
--    qhcp = (app.outdir / 'Python.qhcp').text()
-+    qhcp = (app.outdir / 'Python.qhcp').read_text()
-     assert '<homePage>qthelp://org.sphinx-doc.sphinx/doc/index.html</homePage>' in qhcp
-     assert '<startPage>qthelp://org.sphinx-doc.sphinx/doc/index.html</startPage>' in qhcp
- 
-@@ -115,10 +115,10 @@ def test_qthelp_title(app, status, warning):
-     # default title
-     app.builder.build_all()
- 
--    qhp = (app.outdir / 'Python.qhp').text()
-+    qhp = (app.outdir / 'Python.qhp').read_text()
-     assert '<section title="Python  documentation" ref="index.html">' in qhp
- 
--    qhcp = (app.outdir / 'Python.qhcp').text()
-+    qhcp = (app.outdir / 'Python.qhcp').read_text()
-     assert '<title>Python  documentation</title>' in qhcp
- 
-     # give a title
-@@ -126,9 +126,9 @@ def test_qthelp_title(app, status, warning):
-     app.config.html_short_title = 'Sphinx <b>"short"</b> title'
-     app.builder.build_all()
- 
--    qhp = (app.outdir / 'Python.qhp').text()
-+    qhp = (app.outdir / 'Python.qhp').read_text()
-     assert ('<section title="Sphinx &lt;b&gt;&#34;full&#34;&lt;/b&gt; title" ref="index.html">'
-             in qhp)
- 
--    qhcp = (app.outdir / 'Python.qhcp').text()
-+    qhcp = (app.outdir / 'Python.qhcp').read_text()
-     assert '<title>Sphinx &lt;b&gt;&#34;short&#34;&lt;/b&gt; title</title>' in qhcp

changelog

@@ -0,0 +1,85 @@
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Nov 16 2023 Miro Hrončok <mhroncok@redhat.com> - 1.0.6-2
+- Remove a patch to drop the runtime dependency on Sphinx
+- It is no longer needed, python3-sphinx-7.2.6-2+ no longer Requires this
+
+* Thu Aug 24 2023 Karolina Surma <ksumra@redhat.com> - 1.0.6-1
+- Update to 1.0.6
+Resolves: rhbz#2230149
+
+* Thu Aug 10 2023 Karolina Surma <ksumra@redhat.com> - 1.0.3-16
+- Declare the license as an SPDX expression
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 1.0.3-14
+- Rebuilt for Python 3.12
+
+* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.0.3-13
+- Bootstrap for Python 3.12
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jul 07 2022 Karolina Surma <ksurma@redhat.com> - 1.0.3-10
+- Fix compatibility with Sphinx 5
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.0.3-9
+- Rebuilt for Python 3.11
+
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.0.3-8
+- Bootstrap for Python 3.11
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1.0.3-5
+- Rebuilt for Python 3.10
+
+* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 1.0.3-4
+- Bootstrap for Python 3.10
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 01 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.0.3-1
+- Update to 1.0.3 (#1808636)
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-8
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-7
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-4
+- Rebuilt for Python 3.8
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-3
+- Bootstrap for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Mar 01 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-1
+- Initial package

python-sphinxcontrib-qthelp.spec

@@ -1,43 +1,36 @@
+%bcond tests 1
+
 %global pypi_name sphinxcontrib-qthelp
 
-# when bootstrapping sphinx, we cannot run tests yet
-%bcond_without check
-
-Name:           python-%{pypi_name}
-Version:        1.0.3
-Release:        15%{?dist}
+Name:           python-sphinxcontrib-qthelp
+Version:        2.0.0
+Release:        %autorelease
 Summary:        Sphinx extension for QtHelp documents
-License:        BSD
+License:        BSD-2-Clause
 URL:            http://sphinx-doc.org/
-Source0:        %{pypi_source}
+Source:         %{pypi_source sphinxcontrib_qthelp}
 BuildArch:      noarch
 
-# In Sphinx 5 path.read_text() replaces path.text() - compatibility fix
-Patch:          https://github.com/sphinx-doc/sphinxcontrib-qthelp/pull/14.patch
-
 BuildRequires:  gettext
 BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-setuptools
 
-%if %{with check}
-BuildRequires:  python%{python3_pkgversion}-pytest
-BuildRequires:  python%{python3_pkgversion}-sphinx >= 1:2
-%endif
 
 %description
 sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.
 
 
-%package -n     python%{python3_pkgversion}-%{pypi_name}
+%package -n     python%{python3_pkgversion}-sphinxcontrib-qthelp
 Summary:        %{summary}
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
 
-%description -n python%{python3_pkgversion}-%{pypi_name}
+%description -n python%{python3_pkgversion}-sphinxcontrib-qthelp
 sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document.
 
 
+%generate_buildrequires
+%pyproject_buildrequires %{?with_tests: -x test, -x standalone}
+
 %prep
-%autosetup -p1 -n %{pypi_name}-%{version}
+%autosetup -p1 -n sphinxcontrib_qthelp-%{version}
 find -name '*.mo' -delete
 
 
@@ -45,11 +38,11 @@ find -name '*.mo' -delete
 for po in $(find -name '*.po'); do
   msgfmt --output-file=${po%.po}.mo ${po}
 done
-%py3_build
+%pyproject_wheel
 
 
 %install
-%py3_install
+%pyproject_install
 
 # Move language files to /usr/share
 pushd %{buildroot}%{python3_sitelib}
@@ -67,86 +60,18 @@ popd
 %find_lang sphinxcontrib.qthelp
 
 
-%if %{with check}
 %check
+%if %{with tests}
 %pytest
 %endif
 
 
-%files -n python%{python3_pkgversion}-%{pypi_name} -f sphinxcontrib.qthelp.lang
-%license LICENSE
+%files -n python%{python3_pkgversion}-sphinxcontrib-qthelp -f sphinxcontrib.qthelp.lang
+%license LICENCE.rst
 %doc README.rst
 %{python3_sitelib}/sphinxcontrib/
-%{python3_sitelib}/sphinxcontrib_qthelp-%{version}-py%{python3_version}-*.pth
-%{python3_sitelib}/sphinxcontrib_qthelp-%{version}-py%{python3_version}.egg-info/
+%{python3_sitelib}/sphinxcontrib_qthelp-%{version}.dist-info/
 
 
 %changelog
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 1.0.3-14
-- Rebuilt for Python 3.12
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1.0.3-13
-- Bootstrap for Python 3.12
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jul 07 2022 Karolina Surma <ksurma@redhat.com> - 1.0.3-10
-- Fix compatibility with Sphinx 5
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.0.3-9
-- Rebuilt for Python 3.11
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.0.3-8
-- Bootstrap for Python 3.11
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1.0.3-5
-- Rebuilt for Python 3.10
-
-* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 1.0.3-4
-- Bootstrap for Python 3.10
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jun 01 2020 Charalampos Stratakis <cstratak@redhat.com> - 1.0.3-1
-- Update to 1.0.3 (#1808636)
-
-* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-8
-- Rebuilt for Python 3.9
-
-* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-7
-- Bootstrap for Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-5
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-4
-- Rebuilt for Python 3.8
-
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-3
-- Bootstrap for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Mar 01 2019 Miro Hrončok <mhroncok@redhat.com> - 1.0.2-1
-- Initial package
+%autochangelog

sources

@@ -1 +1 @@
-SHA512 (sphinxcontrib-qthelp-1.0.3.tar.gz) = 29f77e4b3f1a4868c2a34dbd853415e5d813f482cd23b982aeed42d53acba09b896d77ba930c34cce8af043bb7d64a19acff610430e942038d95a410b6e0b5fa
+SHA512 (sphinxcontrib_qthelp-2.0.0.tar.gz) = d551559a6f0fddf61ea24ce067e28a6bb8a61dda1f62e3a2531e43c8ec8059eb819b6a37f912425832c1b0f8dc4b830614240c38abca8a04b31ebb0ded59ec4d