use sip6 in fedora 35 and above

qgis · Nov 18, 2021 · 3db2f97 · 3db2f97
1 parent c80ec66
commit 3db2f97
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/rpm/qgis.spec.template b/rpm/qgis.spec.template
@@ -109,7 +109,12 @@ BuildRequires:  python3-PyYAML
 BuildRequires:  python3-qscintilla-qt5
 BuildRequires:  python3-qscintilla-qt5-devel
 BuildRequires:  python3-qt5-devel
+%if 0%{?fedora} >= 35
+BuildRequires:  sip6
+BuildRequires:  PyQt-builder
+%else
 BuildRequires:  python3-sip-devel
+%endif
 
 # Qca stuff
 BuildRequires:  qca-qt5-devel
@@ -311,7 +316,7 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL*
 %{_datadir}/%{name}/resources/
 %{_datadir}/%{name}/svg/
 %exclude %{_libdir}/libqgisgrass*.so.*
-%exclude %{_libdir}/%{name}/plugins/libgrassplugin*.so
+%exclude %{_libdir}/%{name}/plugins/libplugin_grass*.so
 %exclude %{_libdir}/%{name}/plugins/libprovider_grassraster*.so
 %exclude %{_libdir}/%{name}/plugins/libprovider_grass*.so
 %exclude %{_libdir}/%{name}/server/
@@ -325,7 +330,7 @@ rm -f %{buildroot}%{_datadir}/%{name}/doc/INSTALL*
 
 %files grass
 %{_libdir}/lib%{name}grass*.so.*
-%{_libdir}/%{name}/plugins/libgrassplugin*.so
+%{_libdir}/%{name}/plugins/libplugin_grass*.so
 %{_libdir}/%{name}/plugins/libprovider_grassraster*.so
 %{_libdir}/%{name}/plugins/libprovider_grass*.so
 %{_libdir}/%{name}/grass/