From 74bc647502a0da27bf1efb962f5dcf1157b23a31d1c756437790ad5530e25986 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Fri, 22 Nov 2019 18:59:10 +0000 Subject: [PATCH] Accepting request 750319 from home:Andreas_Schwab:Factory - Use %_lib OBS-URL: https://build.opensuse.org/request/show/750319 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=282 --- qgis.changes | 5 +++++ qgis.spec | 12 +++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/qgis.changes b/qgis.changes index da5fe2d..bf17a44 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Nov 16 08:27:59 UTC 2019 - Andreas Schwab + +- Use %_lib + ------------------------------------------------------------------- Thu Nov 14 17:19:11 UTC 2019 - Dirk Stoecker diff --git a/qgis.spec b/qgis.spec index 43d7524..72ebf1a 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 LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -197,14 +197,8 @@ export CFLAGS="%{optflags}" export QTDIR=%{_prefix} export PATH=$PATH:$QTDIR/bin -%ifarch x86_64 aarch64 ppc64 ppc64le -%define lib lib64 -%else -%define lib lib -%endif - %cmake \ - -DQGIS_LIB_SUBDIR=%{lib} \ + -DQGIS_LIB_SUBDIR=%{_lib} \ -DWITH_3D=TRUE \ -DWITH_BINDINGS=TRUE \ %if %{with grass} @@ -218,7 +212,7 @@ export PATH=$PATH:$QTDIR/bin -DWITH_POSTGRESQL=TRUE \ -DPOSTGRES_LIBRARY=%{_libdir}/libpq.so \ -DPOSTGRES_INCLUDE_DIR=%{_includedir}/pgsql \ - -DQGIS_PLUGIN_SUBDIR=%{lib}/qgis \ + -DQGIS_PLUGIN_SUBDIR=%{_lib}/qgis \ -DQGIS_MANUAL_SUBDIR=share/man \ -DQWT_INCLUDE_DIR=%{_includedir}/qt5/qwt6 \ -DQCA_INCLUDE_DIR=%{_includedir}/qt5/Qca-qt5/QtCrypto \