From c3c50c0fa62429ad2de05d98b69b34c1244d91bdd50260550c503a3b07502a07 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 14 Nov 2022 15:50:49 +0000 Subject: [PATCH] Accepting request 1035684 from home:WernerFink:branches:devel:languages:python - Reintroduce the Conflict with python-magic back as paython-paython-magic uses the same name space but are fully different (boo#1181252) OBS-URL: https://build.opensuse.org/request/show/1035684 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-magic?expand=0&rev=23 --- python-python-magic.changes | 6 ++++++ python-python-magic.spec | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/python-python-magic.changes b/python-python-magic.changes index d9b9d80..64ca826 100644 --- a/python-python-magic.changes +++ b/python-python-magic.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 14 15:13:02 UTC 2022 - Dr. Werner Fink + +- Reintroduce the Conflict with python-magic back as paython-paython-magic + uses the same name space but are fully different (boo#1181252) + ------------------------------------------------------------------- Mon Oct 10 08:53:37 UTC 2022 - Dirk Müller diff --git a/python-python-magic.spec b/python-python-magic.spec index 38b5391..e0f16f6 100644 --- a/python-python-magic.spec +++ b/python-python-magic.spec @@ -33,10 +33,16 @@ BuildRequires: fdupes BuildRequires: file BuildRequires: python-rpm-macros Requires: file -Provides: python-magic +# python-python-magic and python-magic use the same namespace (ie. filename) +# and have a very similar functionality but are incompatible to each other. +# https://github.com/ahupp/python-magic/issues/21 +Conflicts: python-magic BuildArch: noarch %ifpython2 -Provides: %{oldpython}-magic +# python-python-magic and python-magic use the same namespace (ie. filename) +# and have a very similar functionality but are incompatible to each other. +# https://github.com/ahupp/python-magic/issues/21 +Conflicts: %{oldpython}-magic %endif %python_subpackages