From 11cde531ddc6e65b87e8895a7c80318d82a27ffd0f144492eba61932a4652142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 23 Apr 2018 13:16:38 +0000 Subject: [PATCH] - Conflict with python-dns-lexicon that provides same namespace OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-lexicon?expand=0&rev=4 --- python-lexicon.changes | 5 +++++ python-lexicon.spec | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/python-lexicon.changes b/python-lexicon.changes index a43d6b4..e3d3ac1 100644 --- a/python-lexicon.changes +++ b/python-lexicon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 23 13:16:19 UTC 2018 - tchvatal@suse.com + +- Conflict with python-dns-lexicon that provides same namespace + ------------------------------------------------------------------- Sun Mar 4 09:23:34 UTC 2018 - jengelh@inai.de diff --git a/python-lexicon.spec b/python-lexicon.spec index 22ad0a6..c276dd1 100644 --- a/python-lexicon.spec +++ b/python-lexicon.spec @@ -23,21 +23,22 @@ Release: 0 Summary: Python dict subclass(es) with aliasing and attribute access License: BSD-2-Clause Group: Development/Languages/Python -Url: https://github.com/bitprophet/lexicon +URL: https://github.com/bitprophet/lexicon Source: https://files.pythonhosted.org/packages/source/l/lexicon/lexicon-%{version}.tar.gz # PATCH-FIX-UPSTREAM: add_test_init.patch # fix execution of tests Patch0: https://github.com/bitprophet/lexicon/pull/10.patch#/add_test_init.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} +BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-six +# Completely different pkg but same namespece in sitelib folder +Conflicts: python-dns-lexicon +BuildArch: noarch # SECTION tests BuildRequires: %{python_module six} BuildRequires: %{python_module spec} # /SECTION tests -BuildRequires: fdupes -Requires: python-six -BuildArch: noarch - %python_subpackages %description