From a146f3934455cd48285e33d689bfd4e8301d6d73f7b10ca48ebc5dd1abe66e2b Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 3 Oct 2021 17:49:12 +0000 Subject: [PATCH 1/3] Accepting request 922605 from home:schubi2 - Use libalternatives instead of update-alternatives. OBS-URL: https://build.opensuse.org/request/show/922605 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jsonpatch?expand=0&rev=52 --- python-jsonpatch.changes | 5 +++++ python-jsonpatch.spec | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/python-jsonpatch.changes b/python-jsonpatch.changes index 70dec2b..2f0057a 100644 --- a/python-jsonpatch.changes +++ b/python-jsonpatch.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 30 13:32:40 UTC 2021 - Stefan Schubert + +- Use libalternatives instead of update-alternatives. + ------------------------------------------------------------------- Fri Sep 17 21:02:26 UTC 2021 - Matej Cepl diff --git a/python-jsonpatch.spec b/python-jsonpatch.spec index 78d4753..29cf597 100644 --- a/python-jsonpatch.spec +++ b/python-jsonpatch.spec @@ -16,6 +16,12 @@ # +%if 0%{?suse_version} > 1500 +%bcond_without libalternatives +%else +%bcond_with libalternatives +%endif + %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-jsonpatch Version: 1.32 @@ -28,9 +34,13 @@ Source: https://files.pythonhosted.org/packages/source/j/jsonpatch/jsonp BuildRequires: %{python_module jsonpointer >= 1.9} BuildRequires: %{python_module setuptools} BuildRequires: fdupes -BuildRequires: python-rpm-macros +BuildRequires: python-rpm-macros >= 20210929 +%if %{with libalternatives} +Requires: alts +%else Requires: python-jsonpointer >= 1.9 Requires(post): update-alternatives +%endif Requires(preun):update-alternatives BuildArch: noarch %python_subpackages @@ -55,6 +65,10 @@ rm %{buildroot}%{_bindir}/jsondiff %check %pyunittest -v tests +%pre +# If libalternatives is used: Removing old update-alternatives entries. +%python_libalternatives_reset_alternative jsonpatch + %post %python_install_alternative jsonpatch From 151e23b0d0c5600a18877b3c830f9dad9387b642bfd79a10f6e9ec2a4d357204 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 6 Oct 2021 07:32:33 +0000 Subject: [PATCH 2/3] Accepting request 923261 from home:schubi2 - Added BuildRequires: alts OBS-URL: https://build.opensuse.org/request/show/923261 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jsonpatch?expand=0&rev=53 --- python-jsonpatch.changes | 5 +++++ python-jsonpatch.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/python-jsonpatch.changes b/python-jsonpatch.changes index 2f0057a..ec6ca5c 100644 --- a/python-jsonpatch.changes +++ b/python-jsonpatch.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 5 14:30:43 UTC 2021 - schubi + +- Added BuildRequires: alts + ------------------------------------------------------------------- Thu Sep 30 13:32:40 UTC 2021 - Stefan Schubert diff --git a/python-jsonpatch.spec b/python-jsonpatch.spec index 29cf597..998e7df 100644 --- a/python-jsonpatch.spec +++ b/python-jsonpatch.spec @@ -37,6 +37,7 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros >= 20210929 %if %{with libalternatives} Requires: alts +BuildRequires: alts %else Requires: python-jsonpointer >= 1.9 Requires(post): update-alternatives From 44d013b00b5f35ee5d3922141cee8f3f36468b43e2210d9675017e25bbadd75d Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Tue, 12 Oct 2021 11:40:26 +0000 Subject: [PATCH 3/3] Accepting request 924814 from home:bnavigator:branches:devel:languages:python - Fix requirements OBS-URL: https://build.opensuse.org/request/show/924814 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jsonpatch?expand=0&rev=54 --- python-jsonpatch.changes | 5 +++++ python-jsonpatch.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python-jsonpatch.changes b/python-jsonpatch.changes index ec6ca5c..58790ac 100644 --- a/python-jsonpatch.changes +++ b/python-jsonpatch.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 12 08:43:55 UTC 2021 - Ben Greiner + +- Fix requirements + ------------------------------------------------------------------- Tue Oct 5 14:30:43 UTC 2021 - schubi diff --git a/python-jsonpatch.spec b/python-jsonpatch.spec index 998e7df..3afd13f 100644 --- a/python-jsonpatch.spec +++ b/python-jsonpatch.spec @@ -39,10 +39,10 @@ BuildRequires: python-rpm-macros >= 20210929 Requires: alts BuildRequires: alts %else -Requires: python-jsonpointer >= 1.9 Requires(post): update-alternatives -%endif Requires(preun):update-alternatives +%endif +Requires: python-jsonpointer >= 1.9 BuildArch: noarch %python_subpackages