From 8d2ca38c86f7a272d95208e8f4fd1893dab00bc3f868b0cf794025809e5cc429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 17 May 2019 22:01:38 +0000
Subject: [PATCH] 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
---
 python-jsondiff.changes | 9 +++++++++
 python-jsondiff.spec    | 3 ---
 2 files changed, 9 insertions(+), 3 deletions(-)

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 <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>
 
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