Accepting request 753770 from Application:Geo

OBS-URL: https://build.opensuse.org/request/show/753770
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qgis?expand=0&rev=6

qgis.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Dec  2 17:21:33 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
+
+- Autoconfigure grass directory
+
+-------------------------------------------------------------------
+Sun Dec 01 18:00:00 UTC 2019 - Angelos Tzotsos <tzotsos@opensuse.org>
+
+- Use GRASS 7.8.x
+- Remove OTB build requirement
+
 -------------------------------------------------------------------
 Sat Nov 16 08:27:59 UTC 2019 - Andreas Schwab <schwab@suse.de>
 

qgis.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package qgis
 #
-# Copyright (c) 2019 SUSE LLC
+# 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
@@ -17,7 +17,6 @@
 
 
 %bcond_without grass
-%bcond_with    otb
 
 Name:           qgis
 Version:        3.10.0
@@ -54,9 +53,6 @@ BuildRequires:  libqscintilla_qt5-devel
 BuildRequires:  libspatialindex-devel
 BuildRequires:  ocl-icd-devel
 BuildRequires:  opencl-cpp-headers
-%if %{with otb}
-BuildRequires:  otb-devel
-%endif
 BuildRequires:  pkgconfig
 BuildRequires:  poppler-tools
 BuildRequires:  python-qscintilla-qt5-sip
@@ -204,7 +200,7 @@ export PATH=$PATH:$QTDIR/bin
 %if %{with grass}
   -DWITH_GRASS=TRUE \
   -DWITH_GRASS7=TRUE \
-  -DGRASS_PREFIX7=%{_libdir}/grass76 \
+  -DGRASS_PREFIX7=`cat %{_sysconfdir}/GRASSDIR` \
 %endif
   -DWITH_QSPATIALITE=TRUE \
   -DWITH_SERVER=TRUE \