SHA256
1
0
forked from pool/python-sip4

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
This commit is contained in:
Benjamin Greiner 2020-11-16 14:49:31 +00:00 committed by Git OBS Bridge
parent b193757c96
commit 92d7574ea8
2 changed files with 10 additions and 1 deletions

View File

@ -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> Sun Oct 25 22:44:01 UTC 2020 - Benjamin Greiner <code@bnavigator.de>

View File

@ -58,6 +58,9 @@ Obsoletes: python-%{mname} < %{version}-%{release}
Provides: %{oldpython}-%{mname} = %{version}-%{release} Provides: %{oldpython}-%{mname} = %{version}-%{release}
Obsoletes: %{oldpython}-%{mname} < %{version}-%{release} Obsoletes: %{oldpython}-%{mname} < %{version}-%{release}
%endif %endif
%if %{with pyqt_modules}
Conflicts: python-qt5-sip
%endif
%python_subpackages %python_subpackages
%description %description
@ -275,6 +278,6 @@ mkdir -p %{buildroot}%{_datadir}/sip
%files -n python-%{pname}-common %files -n python-%{pname}-common
%license LICENSE* %license LICENSE*
%{_rpmconfigdir}/macros.d/macros.python_all-sip4 %{_rpmconfigdir}/macros.d/macros.python_all-sip4
%{_datadir}/sip/ %dir %{_datadir}/sip/
%changelog %changelog