From c9c24c94e0e569b3ca3ed95273dcd3c0eadee8e503a0022ccabf1879ba0c9128 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 25 May 2023 15:55:48 +0000 Subject: [PATCH 1/2] osc copypac from project:home:dirkmueller:acdc:as_python3_module package:python-marshmallow revision:8, using keep-link, using expand OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-marshmallow?expand=0&rev=45 --- python-marshmallow.changes | 5 +++++ python-marshmallow.spec | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/python-marshmallow.changes b/python-marshmallow.changes index 19e3ab8..ca0edd3 100644 --- a/python-marshmallow.changes +++ b/python-marshmallow.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Apr 23 23:12:16 UTC 2023 - Matej Cepl + +- Switch documentation to be within the main package. + ------------------------------------------------------------------- Fri Apr 21 12:28:05 UTC 2023 - Dirk Müller diff --git a/python-marshmallow.spec b/python-marshmallow.spec index 602ef44..412ce12 100644 --- a/python-marshmallow.spec +++ b/python-marshmallow.spec @@ -57,18 +57,20 @@ BuildRequires: %{python_module simplejson} # /SECTION %python_subpackages +%description +marshmallow is an ORM/ODM/framework-agnostic library for converting complex +datatypes, such as objects, to and from native Python datatypes. + +%if 0%{?suse_version} > 1500 %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}-doc HTML Documentation and examples for %{name}. +%endif %prep %setup -q -n marshmallow-%{version} @@ -91,7 +93,9 @@ rm -r docs/_build/html/.buildinfo docs/_build/html/.doctrees %license LICENSE NOTICE %{python_sitelib}/* +%if 0%{?suse_version} > 1500 %files -n %{name}-doc +%endif %doc examples docs/_build/html/ %changelog From 5488fd21086f608dad623ad09a36cf9e898ea0676823f28f0dc36db45892e1ca Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 25 May 2023 15:56:16 +0000 Subject: [PATCH 2/2] - Switch documentation to be within the main package on SLE15 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-marshmallow?expand=0&rev=46 --- python-marshmallow.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-marshmallow.changes b/python-marshmallow.changes index ca0edd3..6fafa87 100644 --- a/python-marshmallow.changes +++ b/python-marshmallow.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Sun Apr 23 23:12:16 UTC 2023 - Matej Cepl -- Switch documentation to be within the main package. +- Switch documentation to be within the main package on SLE15 ------------------------------------------------------------------- Fri Apr 21 12:28:05 UTC 2023 - Dirk Müller