From 0b895ee9dd0ebde8d5de5fd078d12aedeafab3914b49c8dc820d00363cc15fa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 May 2019 22:01:31 +0000 Subject: [PATCH] Accepting request 703805 from home:swulf:branches:devel:languages:python Removing conflict with jsondiff OBS-URL: https://build.opensuse.org/request/show/703805 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jsonpatch?expand=0&rev=33 --- python-jsonpatch.changes | 8 ++++++++ python-jsonpatch.spec | 15 +++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/python-jsonpatch.changes b/python-jsonpatch.changes index 80b0e23..1f43c07 100644 --- a/python-jsonpatch.changes +++ b/python-jsonpatch.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri May 17 21:32:45 UTC 2019 - Scott Wulf + +- Removing conflict with jsondiff + * Reasoning: + - moto requires cfn-lint and jsondiff + - cfn-lint requires jsonpatch + ------------------------------------------------------------------- Tue Dec 4 12:49:36 UTC 2018 - Matej Cepl diff --git a/python-jsonpatch.spec b/python-jsonpatch.spec index 7aff789..119a308 100644 --- a/python-jsonpatch.spec +++ b/python-jsonpatch.spec @@ -1,7 +1,7 @@ # # spec file for package python-jsonpatch # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,9 +31,6 @@ BuildRequires: python-rpm-macros Requires: python-jsonpointer >= 1.9 Requires(post): update-alternatives Requires(preun): update-alternatives -# provides jsondiff binary too -Conflicts: python2-jsondiff -Conflicts: python3-jsondiff BuildArch: noarch %python_subpackages @@ -50,24 +47,22 @@ Python module to apply JSON-Patches (according to RFC 6902). %python_install # Prepare for update-alternatives usage -for p in jsonpatch jsondiff ; do - %python_clone -a %{buildroot}%{_bindir}/$p -done +%python_clone -a %{buildroot}%{_bindir}/jsonpatch +rm %{buildroot}%{_bindir}/jsondiff %check %python_exec tests.py %post -%python_install_alternative jsonpatch jsondiff +%python_install_alternative jsonpatch %preun -%python_uninstall_alternative jsonpatch jsondiff +%python_uninstall_alternative jsonpatch %files %{python_files} %license COPYING %doc AUTHORS README.md %python_alternative %{_bindir}/jsonpatch -%python_alternative %{_bindir}/jsondiff %{python_sitelib}/* %changelog