From 87d24f69a3f3efd9f9f50c1e2d1fb3f4d3bcbf91b2d8f0543fff285326a812df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 30 Sep 2020 08:39:08 +0000 Subject: [PATCH 1/2] - Do not provide xdg namespace as there is python-xdg package now OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyxdg?expand=0&rev=25 --- python-pyxdg.changes | 5 +++++ python-pyxdg.spec | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/python-pyxdg.changes b/python-pyxdg.changes index d28ffb6..f0f1f50 100644 --- a/python-pyxdg.changes +++ b/python-pyxdg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 30 08:38:48 UTC 2020 - Tomáš Chvátal + +- Do not provide xdg namespace as there is python-xdg package now + ------------------------------------------------------------------- Thu Jul 16 12:13:19 UTC 2020 - Matej Cepl diff --git a/python-pyxdg.spec b/python-pyxdg.spec index 1dfd292..f79d07d 100644 --- a/python-pyxdg.spec +++ b/python-pyxdg.spec @@ -35,13 +35,7 @@ BuildRequires: python-rpm-macros BuildRequires: shared-mime-info Requires: hicolor-icon-theme Requires: shared-mime-info -Provides: python-xdg = %{version} -Obsoletes: python-xdg < %{version} BuildArch: noarch -%ifpython2 -Obsoletes: %{oldpython}-xdg < %{version} -Provides: %{oldpython}-xdg = %{version} -%endif %python_subpackages %description From 3849b67da237aed07000fe54e66c754fd8c0715d2a7cb686570248d22e1d8524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 5 Oct 2020 12:47:38 +0000 Subject: [PATCH 2/2] - Also conflict with the python-xdg as we provide same namespace OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyxdg?expand=0&rev=26 --- python-pyxdg.changes | 5 +++++ python-pyxdg.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/python-pyxdg.changes b/python-pyxdg.changes index f0f1f50..ee77850 100644 --- a/python-pyxdg.changes +++ b/python-pyxdg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 5 12:47:20 UTC 2020 - Tomáš Chvátal + +- Also conflict with the python-xdg as we provide same namespace + ------------------------------------------------------------------- Wed Sep 30 08:38:48 UTC 2020 - Tomáš Chvátal diff --git a/python-pyxdg.spec b/python-pyxdg.spec index f79d07d..2739111 100644 --- a/python-pyxdg.spec +++ b/python-pyxdg.spec @@ -35,6 +35,7 @@ BuildRequires: python-rpm-macros BuildRequires: shared-mime-info Requires: hicolor-icon-theme Requires: shared-mime-info +Conflicts: python-xdg BuildArch: noarch %python_subpackages