From c5a961c4be74476e2ca568cba59401b2a69f2952f4cdfa32342a0144f522cecc Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 15 Mar 2023 14:57:08 +0000 Subject: [PATCH 1/3] Accepting request 1072136 from home:dirkmueller:acdc - We want "modern" Sphinx on SLE-15, not the 3.6-based one. OBS-URL: https://build.opensuse.org/request/show/1072136 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-marshmallow?expand=0&rev=39 --- python-marshmallow.changes | 5 +++++ python-marshmallow.spec | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/python-marshmallow.changes b/python-marshmallow.changes index cc6f049..532953e 100644 --- a/python-marshmallow.changes +++ b/python-marshmallow.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 15 14:54:45 UTC 2023 - Matej Cepl + +- We want "modern" Sphinx on SLE-15, not the 3.6-based one. + ------------------------------------------------------------------- Fri Dec 2 20:31:35 UTC 2022 - Yogalakshmi Arunachalam diff --git a/python-marshmallow.spec b/python-marshmallow.spec index ab79d8a..fc05671 100644 --- a/python-marshmallow.spec +++ b/python-marshmallow.spec @@ -1,7 +1,7 @@ # # spec file for package python-marshmallow # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,10 +37,17 @@ Suggests: python-python-dateutil Suggests: python-simplejson BuildArch: noarch # SECTION doc build requirements +%if 0%{?suse_version} == 1500 && %{?sle_version} >= 150400 +BuildRequires: %{python_module Sphinx} +BuildRequires: %{python_module alabaster} +BuildRequires: %{python_module sphinx-issues} +BuildRequires: %{python_module sphinx-version-warning} +%else BuildRequires: python3-Sphinx BuildRequires: python3-alabaster BuildRequires: python3-sphinx-issues BuildRequires: python3-sphinx-version-warning +%endif # /SECTION # SECTION test requirements BuildRequires: %{python_module pytest} @@ -66,7 +73,7 @@ HTML Documentation and examples for %{name}. %build %python_build -sphinx-build-%{python3_bin_suffix} docs/ docs/_build/html +sphinx-build docs/ docs/_build/html rm -r docs/_build/html/.buildinfo docs/_build/html/.doctrees %install From fea037dfb0a2c724d8d64579610db1e42fa0239441f69aec7b1839bf2ca77edf Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 15 Mar 2023 17:51:40 +0000 Subject: [PATCH 2/3] Add missing 0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-marshmallow?expand=0&rev=40 --- python-marshmallow.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-marshmallow.spec b/python-marshmallow.spec index fc05671..b121db2 100644 --- a/python-marshmallow.spec +++ b/python-marshmallow.spec @@ -37,7 +37,7 @@ Suggests: python-python-dateutil Suggests: python-simplejson BuildArch: noarch # SECTION doc build requirements -%if 0%{?suse_version} == 1500 && %{?sle_version} >= 150400 +%if 0%{?suse_version} == 1500 && 0%{?sle_version} >= 150400 BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module alabaster} BuildRequires: %{python_module sphinx-issues} From 08cf57840c51e9569eabf228b6701acbf04316f95b1e9695a7d4cc8a23917aee Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 16 Mar 2023 08:47:43 +0000 Subject: [PATCH 3/3] - rename docs subpackage to the more common doc name OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-marshmallow?expand=0&rev=41 --- python-marshmallow.changes | 5 +++++ python-marshmallow.spec | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/python-marshmallow.changes b/python-marshmallow.changes index 532953e..d7d5a35 100644 --- a/python-marshmallow.changes +++ b/python-marshmallow.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 16 08:45:51 UTC 2023 - Dirk Müller + +- rename docs subpackage to the more common doc name + ------------------------------------------------------------------- Wed Mar 15 14:54:45 UTC 2023 - Matej Cepl diff --git a/python-marshmallow.spec b/python-marshmallow.spec index b121db2..db93125 100644 --- a/python-marshmallow.spec +++ b/python-marshmallow.spec @@ -16,8 +16,7 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define skip_python2 1 +%{?!python_module:%define python_module() python3-%{**}} Name: python-marshmallow Version: 3.19.0 Release: 0 @@ -29,10 +28,11 @@ Source: https://files.pythonhosted.org/packages/source/m/marshmallow/mar # https://github.com/humitos/sphinx-version-warning/issues/22 Patch0: python-marshmallow-no-version-warning.patch BuildRequires: %{python_module autodocsumm} +BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -Suggests: %{name}-docs +Suggests: %{name}-doc Suggests: python-python-dateutil Suggests: python-simplejson BuildArch: noarch @@ -56,15 +56,17 @@ BuildRequires: %{python_module simplejson} # /SECTION %python_subpackages -%package -n %{name}-docs +%package -n %{name}-doc Summary: Documentation files for %{name} Group: Documentation/Other +Provides: %{name}-docs = %{version} +Obsoletes: %{name}-docs < %{version} %description marshmallow is an ORM/ODM/framework-agnostic library for converting complex datatypes, such as objects, to and from native Python datatypes. -%description -n %{name}-docs +%description -n %{name}-doc HTML Documentation and examples for %{name}. %prep @@ -88,7 +90,7 @@ rm -r docs/_build/html/.buildinfo docs/_build/html/.doctrees %license LICENSE NOTICE %{python_sitelib}/* -%files -n %{name}-docs +%files -n %{name}-doc %doc examples docs/_build/html/ %changelog