From 078f75b62874813d05682ff48d3167f99377f08bb7d706e91a956bb96ac36786 Mon Sep 17 00:00:00 2001
From: Todd R <toddrme2178@gmail.com>
Date: Thu, 14 Sep 2017 00:18:33 +0000
Subject: [PATCH] Accepting request 525958 from
 home:TheBlackCat:branches:devel:languages:python

- Fix python-magic conflicts

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

diff --git a/python-python-magic.changes b/python-python-magic.changes
index 8346072..193266d 100644
--- a/python-python-magic.changes
+++ b/python-python-magic.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 14 00:17:15 UTC 2017 - toddrme2178@gmail.com
+
+- Fix python-magic conflicts
+
 -------------------------------------------------------------------
 Thu Sep  7 20:06:52 UTC 2017 - toddrme2178@gmail.com
 
diff --git a/python-python-magic.spec b/python-python-magic.spec
index 73e673e..9f0bd5a 100644
--- a/python-python-magic.spec
+++ b/python-python-magic.spec
@@ -18,6 +18,7 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %bcond_with     test
+%define         oldpython python
 Name:           python-python-magic
 Version:        0.4.13
 Release:        0
@@ -39,6 +40,9 @@ Requires:       file
 # https://github.com/ahupp/python-magic/issues/33
 # https://github.com/ahupp/python-magic/issues/57
 Conflicts:      python-magic
+%ifpython2
+Conflicts:      %{oldpython}-magic
+%endif
 BuildArch:      noarch
 
 %python_subpackages