From 5295e0cfc2620f98601539948da7146b6bce2b0bea120a273e278a73ca5689c9 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 3 Dec 2019 07:44:00 +0000 Subject: [PATCH] Accepting request 753039 from Application:Geo:Staging - Use GRASS 7.8.x - Remove OTB build requirement OBS-URL: https://build.opensuse.org/request/show/753039 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=284 --- qgis.changes | 6 ++++++ qgis.spec | 8 ++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/qgis.changes b/qgis.changes index bf17a44..c328450 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Dec 01 18:00:00 UTC 2019 - Angelos Tzotsos + +- Use GRASS 7.8.x +- Remove OTB build requirement + ------------------------------------------------------------------- Sat Nov 16 08:27:59 UTC 2019 - Andreas Schwab diff --git a/qgis.spec b/qgis.spec index 72ebf1a..b26569c 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ # # spec file for package qgis # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # 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=%{_libdir}/grass78 \ %endif -DWITH_QSPATIALITE=TRUE \ -DWITH_SERVER=TRUE \