From 67c9310d3fcf29870c804c36f61f41c74f4a04bd4d2c421b8d38b616a0051dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 14 May 2018 11:25:44 +0000
Subject: [PATCH] - Conflict with python-jsonpatch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-jsondiff?expand=0&rev=3
---
 python-jsondiff.changes | 5 +++++
 python-jsondiff.spec    | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/python-jsondiff.changes b/python-jsondiff.changes
index 9d5b4bb..d83c667 100644
--- a/python-jsondiff.changes
+++ b/python-jsondiff.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 14 11:25:31 UTC 2018 - tchvatal@suse.com
+
+- Conflict with python-jsonpatch
+
 -------------------------------------------------------------------
 Wed May  9 01:00:26 UTC 2018 - toddrme2178@gmail.com
 
diff --git a/python-jsondiff.spec b/python-jsondiff.spec
index 8460f0b..cdab08b 100644
--- a/python-jsondiff.spec
+++ b/python-jsondiff.spec
@@ -29,6 +29,8 @@ BuildRequires:  %{python_module nose}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+# provides the same jsondiff binary
+Conflicts:      python-jsonpatch
 Requires:       python-setuptools
 BuildArch:      noarch
 %python_subpackages
@@ -47,7 +49,7 @@ Package to show differences between JSON and JSON-like structures in Python
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
-# Tests do not run in py3 and python is not much worried about that
+# Tests do not run in py3 and upstream is not much worried about that
 #%%python_expand nosetests-%{$python_bin_suffix}
 
 %files %{python_files}