From b16e4969610a82ba3f39e25beff05e6b93d81ef1d6808f9283466856a98a3a50 Mon Sep 17 00:00:00 2001 From: Benjamin Greiner Date: Mon, 5 Oct 2020 19:00:59 +0000 Subject: [PATCH] Accepting request 839338 from home:bnavigator:branches:KDE:Qt5 - Fix openSUSE:Leap:15.1:Update failure: Qt3DAnimation is only built for Qt >= 5.10 OBS-URL: https://build.opensuse.org/request/show/839338 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-qt3d-qt5?expand=0&rev=14 --- python-qt3d-qt5.changes | 6 ++++++ python-qt3d-qt5.spec | 13 +++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/python-qt3d-qt5.changes b/python-qt3d-qt5.changes index 68995a1..6926a50 100644 --- a/python-qt3d-qt5.changes +++ b/python-qt3d-qt5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 26 18:09:37 UTC 2020 - Benjamin Greiner + +- Fix openSUSE:Leap:15.1:Update failure: Qt3DAnimation is only + built for Qt >= 5.10 + ------------------------------------------------------------------- Mon Sep 14 15:53:23 UTC 2020 - Benjamin Greiner diff --git a/python-qt3d-qt5.spec b/python-qt3d-qt5.spec index f7954d7..c974632 100644 --- a/python-qt3d-qt5.spec +++ b/python-qt3d-qt5.spec @@ -16,6 +16,14 @@ # +# This definition is for projects which include the PyQt5 packages in recent +# versions but use default (old) Qt libraries e.g. from Leap, which does not +# have Qt >= 5.10. In that case, no Qt3DAnimation module will be built per +# sip %%If directives in the sip/Qt3DAnimation/*.sip files +%if %{pkg_vcmp libQt53DAnimation-devel >= 5.10} +%define have_qt3danimation 1 +%endif + %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-qt3d-qt5 Version: 5.15.1 @@ -85,6 +93,7 @@ cp -r sip build_%{$python_bin_suffix} %build %{python_expand pushd build_%{$python_bin_suffix} $python configure.py \ + -w \ --no-dist-info \ --no-stubs \ --qmake=%{_bindir}/qmake-qt5 @@ -106,7 +115,7 @@ cp -r examples %{buildroot}%{_docdir}/%{name} %license LICENSE %doc NEWS README %dir %{python_sitearch}/PyQt5/ -%{python_sitearch}/PyQt5/Qt3DAnimation.so +%{?have_qt3danimation:%{python_sitearch}/PyQt5/Qt3DAnimation.so} %{python_sitearch}/PyQt5/Qt3DCore.so %{python_sitearch}/PyQt5/Qt3DExtras.so %{python_sitearch}/PyQt5/Qt3DInput.so @@ -121,7 +130,7 @@ cp -r examples %{buildroot}%{_docdir}/%{name} %files -n %{name}-sip %license LICENSE -%{_datadir}/sip/PyQt5/Qt3DAnimation/ +%{?have_qt3danimation:%{_datadir}/sip/PyQt5/Qt3DAnimation/} %{_datadir}/sip/PyQt5/Qt3DCore/ %{_datadir}/sip/PyQt5/Qt3DExtras/ %{_datadir}/sip/PyQt5/Qt3DInput/