diff --git a/rpm/qgis.spec.template b/rpm/qgis.spec.template index 4e62db3f4d6..1cd6a2bc564 100644 --- a/rpm/qgis.spec.template +++ b/rpm/qgis.spec.template @@ -92,32 +92,32 @@ BuildRequires: python3-jinja2 BuildRequires: python3-OWSLib BuildRequires: python3-psycopg2 BuildRequires: python3-pygments +BuildRequires: python3-pyqt6-devel BuildRequires: python3-PyYAML -BuildRequires: python3-qscintilla-qt5 -BuildRequires: python3-qscintilla-qt5-devel -BuildRequires: python3-qt5-devel +BuildRequires: python3-qscintilla-qt6 +BuildRequires: python3-qscintilla-qt6-devel BuildRequires: sip6 BuildRequires: PyQt-builder # Qca stuff -BuildRequires: qca-qt5-devel -BuildRequires: qca-qt5-ossl -BuildRequires: qscintilla-qt5-devel +BuildRequires: qca-qt6-devel +BuildRequires: qca-qt6-ossl +BuildRequires: qscintilla-qt6-devel -# Qt5 stuff -BuildRequires: cmake(Qt5WebEngine) -BuildRequires: qt5-qtlocation-devel -BuildRequires: qt5-qtmultimedia-devel -BuildRequires: qt5-qtsvg-devel -BuildRequires: qt5-qttools-static -BuildRequires: qt5-qtwebkit-devel -BuildRequires: qtkeychain-qt5-devel -BuildRequires: qt5-qtserialport-devel -BuildRequires: qt5-qt3d-devel -BuildRequires: qt5-qtbase-private-devel +# Qt stuff +BuildRequires: qt6-qt3d-devel +BuildRequires: qt6-qt5compat-devel +BuildRequires: qt6-qtbase-private-devel +BuildRequires: qt6-qtlocation-devel +BuildRequires: qt6-qtmultimedia-devel +BuildRequires: qt6-qtserialport-devel +BuildRequires: qt6-qtsvg-devel +BuildRequires: qt6-qttools-static +BuildRequires: qt6-qtwebengine-devel +BuildRequires: qtkeychain-qt6-devel # Qwt stuff -BuildRequires: qwt-qt5-devel +BuildRequires: qwt-qt6-devel # PDF4QT BuildRequires: pkgconfig(freetype2) @@ -130,10 +130,10 @@ BuildRequires: pkgconfig(libopenjp2) Requires: gdal # Installation of QCA plugins must be explicit -Requires: qca-qt5-ossl +Requires: qca-qt6-ossl Requires: gpsbabel Requires: PDAL -Requires: qt5-qtcharts +Requires: qt6-qtcharts # We don't want to provide private Python extension libs %global __provides_exclude_from ^(%{python3_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$ @@ -181,10 +181,10 @@ Requires: python3-OWSLib Requires: python3-packaging Requires: python3-psycopg2 Requires: python3-pygments +Requires: python3-pyqt6 Requires: python3-PyYAML -Requires: python3-qscintilla-qt5 -Requires: python3-qt5 -%{?_sip_api:Requires: python3-pyqt5-sip-api(%{_sip_api_major}) >= %{_sip_api}} +Requires: python3-qscintilla-qt6 +%{?_sip_api:Requires: python3-pyqt6-sip-api(%{_sip_api_major}) >= %{_sip_api}} %description -n python3-qgis Python integration and plug-ins for QGIS. @@ -224,6 +224,7 @@ gzip ChangeLog %build %cmake \ %{_cmake_skip_rpath} \ + -D BUILD_WITH_QT6:BOOL=TRUE \ -D QGIS_LIB_SUBDIR=%{_lib} \ -D QGIS_MANUAL_SUBDIR=/share/man \ -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \ @@ -238,6 +239,7 @@ gzip ChangeLog -D WITH_PDF4QT:BOOL=TRUE \ -D WITH_QSPATIALITE:BOOL=TRUE \ -D WITH_QTWEBENGINE:BOOL=TRUE \ + -D WITH_QTWEBKIT:BOOL=FALSE \ -D WITH_SERVER:BOOL=TRUE \ -D WITH_3D:BOOL=TRUE \ -D USE_OPENCL:BOOL=TRUE \ @@ -280,7 +282,7 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %{_libdir}/lib%{name}_3d.so.* %{_libdir}/libPdf4QtLibCore.so* %{_libdir}/%{name}/ -%{?_qt5_plugindir}/sqldrivers/libqsqlspatialite.so +%{?_qt6_plugindir}/sqldrivers/libqsqlspatialite.so %{_bindir}/%{name} %{_bindir}/%{name}_process %{_mandir}/man1/%{name}.1* @@ -304,7 +306,7 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %{_datadir}/%{name}/FindQGIS.cmake %{_includedir}/%{name}/ %{_libdir}/lib%{name}*.so -%{?_qt5_plugindir}/designer/libqgis_customwidgets.so* +%{?_qt6_plugindir}/designer/libqgis_customwidgets.so* %files grass %{_libdir}/lib%{name}grass*.so.* @@ -318,7 +320,7 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL* %{_libdir}/libqgispython.so.* %{_datadir}/%{name}/python/ %{python3_sitearch}/%{name}/ -%{python3_sitearch}/PyQt5/uic/widget-plugins/ +%{python3_sitearch}/PyQt6/uic/widget-plugins/ %exclude %{python3_sitearch}/%{name}/server/ %exclude %{python3_sitearch}/%{name}/_server.so