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 + +- 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 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