From 6603965d4de33d8c93be101c74965c5874caca7d19f229bd827d56f7ee84b6fe Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Fri, 12 Apr 2019 08:12:52 +0000
Subject: [PATCH] Accepting request 693655 from
 home:mcepl:branches:devel:languages:python

- Conflict python-xmldiff (unversioned)

OBS-URL: https://build.opensuse.org/request/show/693655
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-xmldiff?expand=0&rev=7
---
 python-xmldiff.changes | 5 +++++
 python-xmldiff.spec    | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/python-xmldiff.changes b/python-xmldiff.changes
index 0aa83d5..6a1a3f7 100644
--- a/python-xmldiff.changes
+++ b/python-xmldiff.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr 12 08:11:46 UTC 2019 - Matej Cepl <mcepl@suse.com>
+
+- Conflict python-xmldiff (unversioned)
+
 -------------------------------------------------------------------
 Wed Apr 10 08:01:52 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/python-xmldiff.spec b/python-xmldiff.spec
index 5a86c7e..4be84e7 100644
--- a/python-xmldiff.spec
+++ b/python-xmldiff.spec
@@ -16,6 +16,7 @@
 #
 
 
+%define oldpython python
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-xmldiff
 Version:        2.3
@@ -37,6 +38,7 @@ Requires:       python-lxml >= 3.1.0
 Requires:       python-setuptools
 Requires:       python-six
 BuildArch:      noarch
+Conflicts:      %{oldpython}-xmldiff < %{version}
 
 %python_subpackages