diff --git a/qgis.changes b/qgis.changes index 6e772ee..eb016bc 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 3 12:18:11 UTC 2023 - Guillaume GARDET + +- Add support for grass 8.x + ------------------------------------------------------------------- Sat Jan 28 16:05:59 UTC 2023 - Dirk Müller diff --git a/qgis.spec b/qgis.spec index fc81089..353ca11 100644 --- a/qgis.spec +++ b/qgis.spec @@ -214,10 +214,13 @@ export PATH=$PATH:$QTDIR/bin %if %{with grass} -DWITH_GRASS=TRUE \ -DWITH_GRASS7=TRUE \ + -DWITH_GRASS8=TRUE \ %if 0%{?suse_version} > 1500 -DGRASS_PREFIX7=`cat %{_sysconfdir}/GRASSDIR` \ + -DGRASS_PREFIX8=`cat %{_sysconfdir}/GRASSDIR` \ %else -DGRASS_PREFIX7=%{_libdir}/grass78 \ + -DGRASS_PREFIX8=%{_libdir}/grass82 \ %endif %endif -DWITH_QSPATIALITE=TRUE \ @@ -295,11 +298,11 @@ popd %dir %{_libdir}/qgis/ %{_libdir}/qgis/* %if %{with grass} -%exclude %{_libdir}/libqgisgrass7.so -%exclude %{_libdir}/libqgisgrass7.so.* -%exclude %{_libdir}/qgis/libplugin_grass7.so -%exclude %{_libdir}/qgis/libprovider_grass7.so -%exclude %{_libdir}/qgis/libprovider_grassraster7.so +%exclude %{_libdir}/libqgisgrass?.so +%exclude %{_libdir}/libqgisgrass?.so.* +%exclude %{_libdir}/qgis/libplugin_grass?.so +%exclude %{_libdir}/qgis/libprovider_grass?.so +%exclude %{_libdir}/qgis/libprovider_grassraster?.so %exclude %{_libdir}/qgis/grass %endif %exclude %{_datadir}/qgis/%{sampledir} @@ -311,11 +314,11 @@ popd %if %{with grass} %files plugin-grass -%{_libdir}/qgis/libplugin_grass7.so -%{_libdir}/qgis/libprovider_grass7.so -%{_libdir}/qgis/libprovider_grassraster7.so -%{_libdir}/libqgisgrass7.so -%{_libdir}/libqgisgrass7.so.* +%{_libdir}/qgis/libplugin_grass?.so +%{_libdir}/qgis/libprovider_grass?.so +%{_libdir}/qgis/libprovider_grassraster?.so +%{_libdir}/libqgisgrass?.so +%{_libdir}/libqgisgrass?.so.* %defattr(755,root,root) %{_libdir}/qgis/grass %endif