diff --git a/python-jsondiff.changes b/python-jsondiff.changes index 6561e4a..41f2721 100644 --- a/python-jsondiff.changes +++ b/python-jsondiff.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri May 17 21:48:19 UTC 2019 - Scott Wulf + +- 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 diff --git a/python-jsondiff.spec b/python-jsondiff.spec index 43e6da4..89ddcdf 100644 --- a/python-jsondiff.spec +++ b/python-jsondiff.spec @@ -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