pool/qgis
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 750379 from Application:Geo

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/750379
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qgis?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2019-11-23 23:37:22 +00:00 committed by Git OBS Bridge
commit 8e2ffea8d1
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qgis.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Nov 16 08:27:59 UTC 2019 - Andreas Schwab <schwab@suse.de>
- Use %_lib
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 14 17:19:11 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de> Thu Nov 14 17:19:11 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>

12
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 LLC
# #
# 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
@ -197,14 +197,8 @@ export CFLAGS="%{optflags}"
export QTDIR=%{_prefix} export QTDIR=%{_prefix}
export PATH=$PATH:$QTDIR/bin export PATH=$PATH:$QTDIR/bin
%ifarch x86_64 aarch64 ppc64 ppc64le
%define lib lib64
%else
%define lib lib
%endif
%cmake \ %cmake \
-DQGIS_LIB_SUBDIR=%{lib} \ -DQGIS_LIB_SUBDIR=%{_lib} \
-DWITH_3D=TRUE \ -DWITH_3D=TRUE \
-DWITH_BINDINGS=TRUE \ -DWITH_BINDINGS=TRUE \
%if %{with grass} %if %{with grass}
@ -218,7 +212,7 @@ export PATH=$PATH:$QTDIR/bin
-DWITH_POSTGRESQL=TRUE \ -DWITH_POSTGRESQL=TRUE \
-DPOSTGRES_LIBRARY=%{_libdir}/libpq.so \ -DPOSTGRES_LIBRARY=%{_libdir}/libpq.so \
-DPOSTGRES_INCLUDE_DIR=%{_includedir}/pgsql \ -DPOSTGRES_INCLUDE_DIR=%{_includedir}/pgsql \
-DQGIS_PLUGIN_SUBDIR=%{lib}/qgis \ -DQGIS_PLUGIN_SUBDIR=%{_lib}/qgis \
-DQGIS_MANUAL_SUBDIR=share/man \ -DQGIS_MANUAL_SUBDIR=share/man \
-DQWT_INCLUDE_DIR=%{_includedir}/qt5/qwt6 \ -DQWT_INCLUDE_DIR=%{_includedir}/qt5/qwt6 \
-DQCA_INCLUDE_DIR=%{_includedir}/qt5/Qca-qt5/QtCrypto \ -DQCA_INCLUDE_DIR=%{_includedir}/qt5/Qca-qt5/QtCrypto \