From 033d4a9214e6eb7af1838ca0a7e81a5e38a15e3ba91e3351c386ac9429328487 Mon Sep 17 00:00:00 2001 From: Nicolas Rochard Date: Tue, 3 Dec 2019 19:19:24 +0000 Subject: [PATCH] Accepting request 753193 from home:dstoecker:branches:Application:Geo - Autoconfigure grass directory OBS-URL: https://build.opensuse.org/request/show/753193 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=285 --- qgis.changes | 5 +++++ qgis.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/qgis.changes b/qgis.changes index c328450..3a00369 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 2 17:21:33 UTC 2019 - Dirk Stoecker + +- Autoconfigure grass directory + ------------------------------------------------------------------- Sun Dec 01 18:00:00 UTC 2019 - Angelos Tzotsos diff --git a/qgis.spec b/qgis.spec index b26569c..d380e01 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ # # spec file for package qgis # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -200,7 +200,7 @@ export PATH=$PATH:$QTDIR/bin %if %{with grass} -DWITH_GRASS=TRUE \ -DWITH_GRASS7=TRUE \ - -DGRASS_PREFIX7=%{_libdir}/grass78 \ + -DGRASS_PREFIX7=`cat %{_sysconfdir}/GRASSDIR` \ %endif -DWITH_QSPATIALITE=TRUE \ -DWITH_SERVER=TRUE \