From 52e02b7d6ccab00dc88584779dd86074c8caef19 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 12 May 2019 08:36:55 -0500 Subject: [PATCH] ship designer/qml plugins for python3 (only) We can ship only one, and at least python3 won't be deprecated any time soon (in contrast to python2) --- python-qt5.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/python-qt5.spec b/python-qt5.spec index c1b71c6..491b2a5 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -37,7 +37,7 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 Version: 5.12.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3 Url: http://www.riverbankcomputing.com/software/pyqt/ @@ -278,6 +278,8 @@ pushd %{_target_platform} %{__python2} ./configure.py \ --assume-shared \ --confirm-license \ + --no-designer-plugin \ + --no-qml-plugin \ --qmake=%{_qt5_qmake} \ %{!?with_python3:--no-qsci-api}%{?with_python3:--qsci-api --qsci-api-destdir=%{_qt5_datadir}/qsci} \ --verbose \ @@ -400,7 +402,6 @@ sed -i \ %files -n python2-qt5-base %doc NEWS README %license LICENSE -%{_qt5_plugindir}/PyQt5/ %{python2_dbus_dir}/pyqt5.so %dir %{python2_sitearch}/PyQt5/ %{python2_sitearch}/PyQt5-%{version}%{?snap:.%{snap}}.dist-info @@ -462,7 +463,6 @@ sed -i \ %{python3_sitearch}/PyQt5/QtX11Extras.* %{python3_sitearch}/PyQt5/QtXmlPatterns.* %{python3_sitearch}/PyQt5/uic/ -%{_qt5_plugindir}/designer/libpyqt5.so # *was* in python3-qt5-devel %{_bindir}/pylupdate5 %{_bindir}/pyrcc5 @@ -496,6 +496,9 @@ sed -i \ %{python3_sitearch}/PyQt5/_QOpenGLFunctions_2_0.* %{python3_sitearch}/PyQt5/_QOpenGLFunctions_2_1.* %{python3_sitearch}/PyQt5/_QOpenGLFunctions_4_1_Core.* +# plugins +%{_qt5_plugindir}/PyQt5/ +%{_qt5_plugindir}/designer/libpyqt5.so %if 0%{?webengine} %files -n python%{python3_pkgversion}-qt5-webengine @@ -528,6 +531,9 @@ sed -i \ %changelog +* Sun May 12 2019 Rex Dieter - 5.12.2-3 +- ship designer/qml plugins for python3 (only) + * Fri May 10 2019 Rex Dieter - 5.12.2-2 - python2-qt5-base: move qt plugins here (#1708274)