rpm/qgis
SHA256
1
0
Fork 0
forked from pool/qgis
Code Pull Requests Activity

Accepting request 753039 from Application:Geo:Staging

Browse Source 
- 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
This commit is contained in:
Dirk Stoecker 2019-12-03 07:44:00 +00:00 committed by Git OBS Bridge
parent 74bc647502
commit 5295e0cfc2
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qgis.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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> Sat Nov 16 08:27:59 UTC 2019 - Andreas Schwab <schwab@suse.de>

8
qgis.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package qgis # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,6 @@
%bcond_without grass %bcond_without grass
%bcond_with otb
Name: qgis Name: qgis
Version: 3.10.0 Version: 3.10.0
@ -54,9 +53,6 @@ BuildRequires: libqscintilla_qt5-devel
BuildRequires: libspatialindex-devel BuildRequires: libspatialindex-devel
BuildRequires: ocl-icd-devel BuildRequires: ocl-icd-devel
BuildRequires: opencl-cpp-headers BuildRequires: opencl-cpp-headers
%if %{with otb}
BuildRequires: otb-devel
%endif
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: poppler-tools BuildRequires: poppler-tools
BuildRequires: python-qscintilla-qt5-sip BuildRequires: python-qscintilla-qt5-sip
@ -204,7 +200,7 @@ export PATH=$PATH:$QTDIR/bin
%if %{with grass} %if %{with grass}
-DWITH_GRASS=TRUE \ -DWITH_GRASS=TRUE \
-DWITH_GRASS7=TRUE \ -DWITH_GRASS7=TRUE \
-DGRASS_PREFIX7=%{_libdir}/grass76 \ -DGRASS_PREFIX7=%{_libdir}/grass78 \
%endif %endif
-DWITH_QSPATIALITE=TRUE \ -DWITH_QSPATIALITE=TRUE \
-DWITH_SERVER=TRUE \ -DWITH_SERVER=TRUE \