From 92d7574ea84c6b57104022ea7c8ff27d934055725f52e747840e4e6a32fa19aa Mon Sep 17 00:00:00 2001
From: Benjamin Greiner <code@bnavigator.de>
Date: Mon, 16 Nov 2020 14:49:31 +0000
Subject: [PATCH] Accepting request 848896 from home:bnavigator:sip5

- Conflict with python-qt5-sip in distros where we still provide
  the PyQt5.sip library

OBS-URL: https://build.opensuse.org/request/show/848896
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-sip4?expand=0&rev=3
---
 python-sip4.changes | 6 ++++++
 python-sip4.spec    | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/python-sip4.changes b/python-sip4.changes
index a5109ca..9376c97 100644
--- a/python-sip4.changes
+++ b/python-sip4.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov 15 23:56:01 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
+
+- Conflict with python-qt5-sip in distros where we still provide
+  the PyQt5.sip library
+
 -------------------------------------------------------------------
 Sun Oct 25 22:44:01 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
 
diff --git a/python-sip4.spec b/python-sip4.spec
index c666fbf..e9ce017 100644
--- a/python-sip4.spec
+++ b/python-sip4.spec
@@ -58,6 +58,9 @@ Obsoletes:      python-%{mname} < %{version}-%{release}
 Provides:       %{oldpython}-%{mname} = %{version}-%{release}
 Obsoletes:      %{oldpython}-%{mname} < %{version}-%{release}
 %endif
+%if %{with pyqt_modules}
+Conflicts:      python-qt5-sip
+%endif
 %python_subpackages
 
 %description
@@ -275,6 +278,6 @@ mkdir -p %{buildroot}%{_datadir}/sip
 %files -n python-%{pname}-common
 %license LICENSE*
 %{_rpmconfigdir}/macros.d/macros.python_all-sip4
-%{_datadir}/sip/
+%dir %{_datadir}/sip/
 
 %changelog