Accepting request 703806 from home:swulf:branches:devel:languages:python

Removing conflict with jsonpatch

OBS-URL: https://build.opensuse.org/request/show/703806
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jsondiff?expand=0&rev=7
This commit is contained in:
Tomáš Chvátal 2019-05-17 22:01:38 +00:00 committed by Git OBS Bridge
parent 25111f3ba9
commit 8d2ca38c86
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri May 17 21:48:19 UTC 2019 - Scott Wulf <swulf@suse.com>
- Removing conflict with jsonpatch
* Reasoning:
- moto requires cfn-lint and jsondiff
- cfn-lint requires jsonpatch
-------------------------------------------------------------------
Tue May 14 22:18:30 UTC 2019 - Gary Smith <GSmith@suse.com>

View File

@ -30,9 +30,6 @@ BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-setuptools
# provides the same jsondiff binary
Conflicts: python2-jsonpatch
Conflicts: python3-jsonpatch
BuildArch: noarch
%python_subpackages