Accepting request 785000 from home:bruno_friedmann:branches:Application:Geo

- Renew spec file, remove obsolete SUSE openSUSE versions
- Remove specific line in cmake about python3 (build failed with
  new 3.8 version in Factory

OBS-URL: https://build.opensuse.org/request/show/785000
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/PDAL?expand=0&rev=15
This commit is contained in:
Martin Pluskal 2020-03-14 14:27:36 +00:00 committed by Git OBS Bridge
parent 0f87342b78
commit 8bd34050ef
2 changed files with 18 additions and 20 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Mar 14 13:19:03 UTC 2020 - Bruno Friedmann <bruno@ioda-net.ch>
- Renew spec file, remove obsolete SUSE openSUSE versions
- Remove specific line in cmake about python3 (build failed with
new 3.8 version in Factory
-------------------------------------------------------------------
Tue Sep 17 07:35:50 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package PDAL
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2019 Friedmann Bruno, Ioda-Net Sàrl, Charmoille, Switzerland.
#
# All modifications and additions to the file contributed by third parties
@ -40,18 +40,23 @@ BuildRequires: freeglut-devel
BuildRequires: gcc-c++
BuildRequires: gdal
BuildRequires: geotiff-devel
BuildRequires: gtest
BuildRequires: jsoncpp-devel
# We need 3.1.1+ for 1.6
BuildRequires: laszip-devel
BuildRequires: gtest
BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_headers-devel
BuildRequires: libboost_program_options-devel
BuildRequires: libgdal-devel
BuildRequires: libgeos-devel
BuildRequires: libproj-devel
BuildRequires: libspatialindex-devel
BuildRequires: libopenssl-devel >= 1.1
BuildRequires: libproj-devel
BuildRequires: libpsl5
BuildRequires: libspatialindex-devel
BuildRequires: libtiff-devel
BuildRequires: libxml2-devel
BuildRequires: pkgconfig
BuildRequires: postgresql-devel
BuildRequires: python3
# We don't have it yet
# BuildRequires: pointcloud-devel
@ -77,18 +82,6 @@ BuildRequires: pkgconfig(libpq)
Requires: lib%{name}%{soname} = %{version}
Recommends: bash-completion
Provides: pdal = %{version}
# Override the problem of libpsl5 in tumbleweed
%if 0%{?suse_version} >= 1330
BuildRequires: libpsl5
%endif
%if 0%{?suse_version} > 1325
BuildRequires: libboost_filesystem-devel
BuildRequires: libboost_headers-devel
BuildRequires: libboost_program_options-devel
%else
BuildRequires: boost-devel
%endif
BuildRequires: postgresql-devel
%if 0%{?sle_version} >= 150000 && 0%{?sle_version} <= 150100 && 0%{?is_opensuse}
%else
BuildRequires: postgresql-server-devel
@ -200,8 +193,6 @@ find ./doc/ -type f -iname "*.ai" -delete
-DGEOTIFF_INCLUDE_DIR=%{_includedir}/libgeotiff \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_PLUGIN_PYTHON=ON \
-DPYTHON_EXECUTABLE=%{_bindir}/python%{py3_ver} \
-DPYTHON_INCLUDE_DIR=%{_includedir}/python%{py3_ver}m \
-DNUMPY_INCLUDE_DIR=%{_libdir}/python%{py3_ver}/site-packages/numpy \
-DBUILD_PLUGIN_HEXBIN=OFF \
-DBUILD_PLUGIN_ICEBRIDGE=OFF \
@ -229,7 +220,7 @@ find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print
# Not finished yet too many syntax error with python3
# WIP with upstream
#%check
#%%check
#pushd build
#export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:${LD_LIBRARY_PATH}
#export PDAL_DRIVER_PATH=%{buildroot}/%{_libdir}:${PDAL_DRIVER_PATH}