From 0df4bbc15111186f374c17ac8b73bc6bef344787fddd6f9de60302f74b819f95 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Sat, 27 Feb 2021 11:04:40 +0000 Subject: [PATCH] Accepting request 875592 from home:bnavigator:pyqt - Don't conflict with newer sip-devel packages. They use completely different namespaces. OBS-URL: https://build.opensuse.org/request/show/875592 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-sip4?expand=0&rev=8 --- python-sip4.changes | 6 ++++++ python-sip4.spec | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/python-sip4.changes b/python-sip4.changes index b3edfde..be924e2 100644 --- a/python-sip4.changes +++ b/python-sip4.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 27 11:03:17 UTC 2021 - Benjamin Greiner + +- Don't conflict with newer sip-devel packages. They use completely + different namespaces. + ------------------------------------------------------------------- Fri Feb 26 18:47:32 UTC 2021 - Ben Greiner diff --git a/python-sip4.spec b/python-sip4.spec index ebd5a5f..4914d18 100644 --- a/python-sip4.spec +++ b/python-sip4.spec @@ -88,8 +88,6 @@ Provides: python-%{mname}-bin = %{version}-%{release} Provides: python-%{mname}-devel = %{version}-%{release} Obsoletes: python-%{mname}-bin < %{version}-%{release} Obsoletes: python-%{mname}-devel < %{version}-%{release} -Conflicts: python-%{mname}-impl -Provides: python-%{mname}-impl = %{version}-%{release} %ifpython2 Provides: %{oldpython}-%{mname}-bin = %{version}-%{release} Provides: %{oldpython}-%{mname}-devel = %{version}-%{release}