From 62c8337909e5f28f775abcfaf29e6fb9e5cf613c0b5cc161fdfb001b853b5530 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 29 Aug 2023 15:34:09 +0000 Subject: [PATCH 1/2] Accepting request 1106805 from home:mcalabkova:branches:devel:languages:python - Update to 2.0.4 * Drop support for Python 3.8 * Raise minimum required Sphinx version to 5.0 * Fix tests for Sphinx 7.1 and below OBS-URL: https://build.opensuse.org/request/show/1106805 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-htmlhelp?expand=0&rev=15 --- python-sphinxcontrib-htmlhelp.changes | 8 ++++++++ python-sphinxcontrib-htmlhelp.spec | 11 ++++++----- sphinxcontrib-htmlhelp-2.0.1.tar.gz | 3 --- sphinxcontrib_htmlhelp-2.0.4.tar.gz | 3 +++ 4 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 sphinxcontrib-htmlhelp-2.0.1.tar.gz create mode 100644 sphinxcontrib_htmlhelp-2.0.4.tar.gz diff --git a/python-sphinxcontrib-htmlhelp.changes b/python-sphinxcontrib-htmlhelp.changes index 49a0f44..b98c546 100644 --- a/python-sphinxcontrib-htmlhelp.changes +++ b/python-sphinxcontrib-htmlhelp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Aug 28 11:32:57 UTC 2023 - Markéta Machová + +- Update to 2.0.4 + * Drop support for Python 3.8 + * Raise minimum required Sphinx version to 5.0 + * Fix tests for Sphinx 7.1 and below + ------------------------------------------------------------------- Fri Apr 21 12:36:54 UTC 2023 - Dirk Müller diff --git a/python-sphinxcontrib-htmlhelp.spec b/python-sphinxcontrib-htmlhelp.spec index 70d4f73..d6ff21c 100644 --- a/python-sphinxcontrib-htmlhelp.spec +++ b/python-sphinxcontrib-htmlhelp.spec @@ -28,21 +28,22 @@ %endif %{?sle15_python_module_pythons} Name: python-sphinxcontrib-htmlhelp%{psuffix} -Version: 2.0.1 +Version: 2.0.4 Release: 0 Summary: Sphinx contrib extension to generate html help files License: BSD-2-Clause Group: Development/Languages/Python URL: https://github.com/sphinx-doc/sphinxcontrib-htmlhelp -Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-htmlhelp/sphinxcontrib_htmlhelp-%{version}.tar.gz +BuildRequires: %{python_module flit-core} BuildRequires: %{python_module pip} BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-Sphinx +Requires: python-Sphinx >= 5.0 BuildArch: noarch %if %{with test} -BuildRequires: %{python_module Sphinx} +BuildRequires: %{python_module Sphinx >= 5.0} BuildRequires: %{python_module html5lib} BuildRequires: %{python_module pytest} BuildRequires: %{python_module sphinxcontrib-htmlhelp >= %{version}} @@ -53,7 +54,7 @@ BuildRequires: %{python_module sphinxcontrib-htmlhelp >= %{version}} Html help generating extension. %prep -%autosetup -p1 -n sphinxcontrib-htmlhelp-%{version} +%autosetup -p1 -n sphinxcontrib_htmlhelp-%{version} %build %pyproject_wheel diff --git a/sphinxcontrib-htmlhelp-2.0.1.tar.gz b/sphinxcontrib-htmlhelp-2.0.1.tar.gz deleted file mode 100644 index 88be11e..0000000 --- a/sphinxcontrib-htmlhelp-2.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0cbdd302815330058422b98a113195c9249825d681e18f11e8b1f78a2f11efff -size 27967 diff --git a/sphinxcontrib_htmlhelp-2.0.4.tar.gz b/sphinxcontrib_htmlhelp-2.0.4.tar.gz new file mode 100644 index 0000000..f9add13 --- /dev/null +++ b/sphinxcontrib_htmlhelp-2.0.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c26a118a05b76000738429b724a0568dbde5b72391a688577da08f11891092a +size 21799 From 31fe14f295cb1bb64d02272517f97f8952d00bbac7c75340ec813bb1b0d6d183 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 29 Aug 2023 18:06:34 +0000 Subject: [PATCH 2/2] - Clean up the SPEC file OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sphinxcontrib-htmlhelp?expand=0&rev=16 --- python-sphinxcontrib-htmlhelp.changes | 5 +++++ python-sphinxcontrib-htmlhelp.spec | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/python-sphinxcontrib-htmlhelp.changes b/python-sphinxcontrib-htmlhelp.changes index b98c546..bdb157c 100644 --- a/python-sphinxcontrib-htmlhelp.changes +++ b/python-sphinxcontrib-htmlhelp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 29 18:06:26 UTC 2023 - Matej Cepl + +- Clean up the SPEC file + ------------------------------------------------------------------- Mon Aug 28 11:32:57 UTC 2023 - Markéta Machová diff --git a/python-sphinxcontrib-htmlhelp.spec b/python-sphinxcontrib-htmlhelp.spec index d6ff21c..cb2516c 100644 --- a/python-sphinxcontrib-htmlhelp.spec +++ b/python-sphinxcontrib-htmlhelp.spec @@ -16,8 +16,8 @@ # +%{?sle15_python_module_pythons} %define skip_python2 1 -%{?!python_module:%define python_module() python-%{**} python3-%{**}} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "test" %define psuffix -test @@ -26,7 +26,6 @@ %define psuffix %{nil} %bcond_with test %endif -%{?sle15_python_module_pythons} Name: python-sphinxcontrib-htmlhelp%{psuffix} Version: 2.0.4 Release: 0 @@ -34,7 +33,7 @@ Summary: Sphinx contrib extension to generate html help files License: BSD-2-Clause Group: Development/Languages/Python URL: https://github.com/sphinx-doc/sphinxcontrib-htmlhelp -Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib-htmlhelp/sphinxcontrib_htmlhelp-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/s/sphinxcontrib_htmlhelp/sphinxcontrib_htmlhelp-%{version}.tar.gz BuildRequires: %{python_module flit-core} BuildRequires: %{python_module pip} BuildRequires: %{python_module wheel} @@ -74,7 +73,9 @@ Html help generating extension. %files %{python_files} %doc README.rst CHANGES %license LICENSE -%{python_sitelib}/* +%dir %{python_sitelib}/sphinxcontrib +%{python_sitelib}/sphinxcontrib/htmlhelp +%{python_sitelib}/sphinxcontrib_htmlhelp-%{version}*-info %endif %changelog