diff --git a/python-qt5.spec b/python-qt5.spec index 3b628b2..f9c92e1 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -20,7 +20,7 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 Version: 5.8.1 -Release: 2%{?dist} +Release: 3%{?dist} # all BSD, except for GPLv2+ dbus bindings and examples License: BSD and GPLv2+ @@ -78,8 +78,7 @@ BuildRequires: python3-dbus Obsoletes: python-qt5 < 5.5.1-10 %endif -Requires: %{name}-rpm-macros = %{version}-%{release} -Requires: dbus-python +Requires: %{name}-base%{?_isa} = %{version}-%{release} BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} @@ -96,6 +95,13 @@ Provides: python2-qt5%{?_isa} = %{version}-%{release} %description PyQt5 is Python bindings for Qt5. +%package base +Summary: Python bindings for Qt5 base +Requires: %{name}-rpm-macros = %{version}-%{release} +Requires: dbus-python +Obsoletes: python-qt5 < 5.5.1-10 +%description base + %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -126,9 +132,19 @@ Obsoletes: python3-qt5 < 5.5.1-10 %endif Provides: python3-PyQt5 = %{version}-%{release} Provides: python3-PyQt5%{?_isa} = %{version}-%{release} +Requires: python3-qt5-base%{?_isa} = %{version}-%{release} +%description -n python3-qt5 +%{summary}. + +%package -n python3-qt5-base +Summary: Python 3 bindings for Qt5 base +%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +%{?_sip_api:Requires: python3-sip-api(%{_sip_api_major}) >= %{_sip_api}} +Provides: python3-PyQt5-base = %{version}-%{release} +Provides: python3-PyQt5-base%{?_isa} = %{version}-%{release} Requires: %{name}-rpm-macros = %{version}-%{release} Requires: python3-dbus -%description -n python3-qt5 +%description -n python3-qt5-base %{summary}. %package -n python3-qt5-devel @@ -282,45 +298,26 @@ sed -i \ %if 0%{?with_python2} %files -%doc NEWS README -%license LICENSE -%{python2_dbus_dir}/pyqt5.so %{_qt5_plugindir}/PyQt5/ -%dir %{python2_sitearch}/PyQt5/ -%{python2_sitearch}/PyQt5/__init__.py* %{python2_sitearch}/PyQt5/Enginio.so -%{python2_sitearch}/PyQt5/Qt.so %{python2_sitearch}/PyQt5/QtBluetooth.so -%{python2_sitearch}/PyQt5/QtCore.so -%{python2_sitearch}/PyQt5/QtDBus.so %{python2_sitearch}/PyQt5/QtDesigner.so -%{python2_sitearch}/PyQt5/QtGui.so %{python2_sitearch}/PyQt5/QtHelp.so %{python2_sitearch}/PyQt5/QtLocation.so %{python2_sitearch}/PyQt5/QtMultimedia.so %{python2_sitearch}/PyQt5/QtMultimediaWidgets.so -%{python2_sitearch}/PyQt5/QtNetwork.so %{python2_sitearch}/PyQt5/QtNfc.so -%{python2_sitearch}/PyQt5/QtOpenGL.so %{python2_sitearch}/PyQt5/QtPositioning.so -%{python2_sitearch}/PyQt5/QtPrintSupport.so %{python2_sitearch}/PyQt5/QtQml.so %{python2_sitearch}/PyQt5/QtQuick.so %{python2_sitearch}/PyQt5/QtQuickWidgets.so %{python2_sitearch}/PyQt5/QtSensors.so %{python2_sitearch}/PyQt5/QtSerialPort.so -%{python2_sitearch}/PyQt5/QtSql.so %{python2_sitearch}/PyQt5/QtSvg.so -%{python2_sitearch}/PyQt5/QtTest.so %{python2_sitearch}/PyQt5/QtWebChannel.so %{python2_sitearch}/PyQt5/QtWebSockets.so -%{python2_sitearch}/PyQt5/QtWidgets.so %{python2_sitearch}/PyQt5/QtX11Extras.so -%{python2_sitearch}/PyQt5/QtXml.so %{python2_sitearch}/PyQt5/QtXmlPatterns.so -%{python2_sitearch}/PyQt5/_QOpenGLFunctions_2_0.so -%{python2_sitearch}/PyQt5/_QOpenGLFunctions_2_1.so -%{python2_sitearch}/PyQt5/_QOpenGLFunctions_4_1_Core.so %{python2_sitearch}/PyQt5/uic/ %{_qt5_plugindir}/designer/libpyqt5.so # *was* in -devel @@ -332,6 +329,27 @@ sed -i \ %{python2_sitearch}/PyQt5/pyrcc.so %{python2_sitearch}/PyQt5/pyrcc_main.py* +%files base +%doc NEWS README +%license LICENSE +%{python2_dbus_dir}/pyqt5.so +%dir %{python2_sitearch}/PyQt5/ +%{python2_sitearch}/PyQt5/__init__.py* +%{python2_sitearch}/PyQt5/Qt.so +%{python2_sitearch}/PyQt5/QtCore.so +%{python2_sitearch}/PyQt5/QtDBus.so +%{python2_sitearch}/PyQt5/QtGui.so +%{python2_sitearch}/PyQt5/QtNetwork.so +%{python2_sitearch}/PyQt5/QtOpenGL.so +%{python2_sitearch}/PyQt5/QtPrintSupport.so +%{python2_sitearch}/PyQt5/QtSql.so +%{python2_sitearch}/PyQt5/QtTest.so +%{python2_sitearch}/PyQt5/QtWidgets.so +%{python2_sitearch}/PyQt5/QtXml.so +%{python2_sitearch}/PyQt5/_QOpenGLFunctions_2_0.so +%{python2_sitearch}/PyQt5/_QOpenGLFunctions_2_1.so +%{python2_sitearch}/PyQt5/_QOpenGLFunctions_4_1_Core.so + %if 0%{?webengine} %files webengine %{python2_sitearch}/PyQt5/QtWebEngine.* @@ -354,45 +372,25 @@ sed -i \ %if 0%{?with_python3} %files -n python3-qt5 -%doc NEWS README -%license LICENSE -%{python3_dbus_dir}/pyqt5.so -%dir %{python3_sitearch}/PyQt5/ -%{python3_sitearch}/PyQt5/__pycache__/ -%{python3_sitearch}/PyQt5/__init__.py* %{python3_sitearch}/PyQt5/Enginio.* -%{python3_sitearch}/PyQt5/Qt.* %{python3_sitearch}/PyQt5/QtBluetooth.* -%{python3_sitearch}/PyQt5/QtCore.* -%{python3_sitearch}/PyQt5/QtDBus.* %{python3_sitearch}/PyQt5/QtDesigner.* -%{python3_sitearch}/PyQt5/QtGui.* %{python3_sitearch}/PyQt5/QtHelp.* %{python3_sitearch}/PyQt5/QtLocation.* %{python3_sitearch}/PyQt5/QtMultimedia.* %{python3_sitearch}/PyQt5/QtMultimediaWidgets.* -%{python3_sitearch}/PyQt5/QtNetwork.* %{python3_sitearch}/PyQt5/QtNfc.* -%{python3_sitearch}/PyQt5/QtOpenGL.* %{python3_sitearch}/PyQt5/QtPositioning.* -%{python3_sitearch}/PyQt5/QtPrintSupport.* %{python3_sitearch}/PyQt5/QtQml.* %{python3_sitearch}/PyQt5/QtQuick.* %{python3_sitearch}/PyQt5/QtQuickWidgets.* %{python3_sitearch}/PyQt5/QtSensors.* %{python3_sitearch}/PyQt5/QtSerialPort.* -%{python3_sitearch}/PyQt5/QtSql.* %{python3_sitearch}/PyQt5/QtSvg.* -%{python3_sitearch}/PyQt5/QtTest.* %{python3_sitearch}/PyQt5/QtWebChannel.* %{python3_sitearch}/PyQt5/QtWebSockets.* -%{python3_sitearch}/PyQt5/QtWidgets.* %{python3_sitearch}/PyQt5/QtX11Extras.* -%{python3_sitearch}/PyQt5/QtXml.* %{python3_sitearch}/PyQt5/QtXmlPatterns.* -%{python3_sitearch}/PyQt5/_QOpenGLFunctions_2_0.* -%{python3_sitearch}/PyQt5/_QOpenGLFunctions_2_1.* -%{python3_sitearch}/PyQt5/_QOpenGLFunctions_4_1_Core.* %{python3_sitearch}/PyQt5/uic/ # *was* in python3-qt5-devel %{_bindir}/pylupdate5 @@ -403,6 +401,28 @@ sed -i \ %{python3_sitearch}/PyQt5/pyrcc.so %{python3_sitearch}/PyQt5/pyrcc_main.py* +%files -n python3-qt5-base +%doc NEWS README +%license LICENSE +%{python3_dbus_dir}/pyqt5.so +%dir %{python3_sitearch}/PyQt5/ +%{python3_sitearch}/PyQt5/__pycache__/ +%{python3_sitearch}/PyQt5/__init__.py* +%{python3_sitearch}/PyQt5/Qt.* +%{python3_sitearch}/PyQt5/QtCore.* +%{python3_sitearch}/PyQt5/QtDBus.* +%{python3_sitearch}/PyQt5/QtGui.* +%{python3_sitearch}/PyQt5/QtNetwork.* +%{python3_sitearch}/PyQt5/QtOpenGL.* +%{python3_sitearch}/PyQt5/QtPrintSupport.* +%{python3_sitearch}/PyQt5/QtSql.* +%{python3_sitearch}/PyQt5/QtTest.* +%{python3_sitearch}/PyQt5/QtWidgets.* +%{python3_sitearch}/PyQt5/QtXml.* +%{python3_sitearch}/PyQt5/_QOpenGLFunctions_2_0.* +%{python3_sitearch}/PyQt5/_QOpenGLFunctions_2_1.* +%{python3_sitearch}/PyQt5/_QOpenGLFunctions_4_1_Core.* + %if 0%{?webengine} %files -n python3-qt5-webengine %{python3_sitearch}/PyQt5/QtWebEngine.* @@ -431,6 +451,10 @@ sed -i \ %changelog +* Wed Mar 29 2017 Thomas Woerner - 5.8.1-3 +- New base sub package to provide QtBase only (RHBZ#1394626) +- New requirement from the main package to the base sub package + * Tue Mar 28 2017 Rex Dieter - 5.8.1-2 - add missing -webengine/-webkit descriptions - better python3-qt5-devel description