Dirk Stoecker 2019-07-10 09:23:13 +00:00 committed by Git OBS Bridge
parent 14f05c3503
commit 0f707a2bfe
2 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jul 9 15:14:16 UTC 2019 - Aaron Puchert <aaronpuchert@alice-dsl.net>
- Adapt GRASS_PREFIX7 to changes in grass.
- Remove unused clang dependency.
- Disable LTO for now because static library doesn't link.
-------------------------------------------------------------------
Sat Jul 6 20:47:20 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -53,7 +53,6 @@ BuildRequires: libQt5Sql5-postgresql
BuildRequires: libQt5Sql5-sqlite
BuildRequires: libqscintilla_qt5-devel
BuildRequires: libspatialindex-devel
BuildRequires: llvm-clang
BuildRequires: ocl-icd-devel
BuildRequires: opencl-cpp-headers
BuildRequires: otb-devel
@ -190,6 +189,8 @@ sed -i 's,^#!%{_bindir}/env python$,#!%{_bindir}/python3,g' src/plugins/grass/sc
sed -i 's,^#!%{_bindir}/env python3$,#!%{_bindir}/python3,g' src/plugins/grass/scripts/*.py
%build
%define _lto_cflags %{nil}
export CFLAGS="%{optflags}"
export QTDIR=%{_prefix}
export PATH=$PATH:$QTDIR/bin
@ -207,7 +208,7 @@ export PATH=$PATH:$QTDIR/bin
%if %{with grass}
-DWITH_GRASS=TRUE \
-DWITH_GRASS7=TRUE \
-DGRASS_PREFIX7=%{_libdir}/grass76\
-DGRASS_PREFIX7=%{_libdir}/grass76 \
%endif
-DWITH_QSPATIALITE=TRUE \
-DWITH_SERVER=TRUE \