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

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

Browse Source 
- Add a manual fix for PDALConfig.cmake where the 
  @PDAL_CONFIG_LIBRARY_DIRS@ is wrongly expanded.

- update to 2.1.0 version
  release note at https://github.com/PDAL/PDAL/releases
  + Disable removed plugin SQLITE
  + Disable independant plugin python3
- Packaging
  + Fix postgresql(-server)-devel package requirement
  + spec cleanup

  new 3.8 version in Factory
- Remove FindLASzip-cmake.patch with new laszip 3.2.2

OBS-URL: https://build.opensuse.org/request/show/815573
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/PDAL?expand=0&rev=17
This commit is contained in:
Martin Pluskal 2020-06-18 08:13:11 +00:00 committed by Git OBS Bridge
parent 14660f60d2
commit c855a85540
6 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PDAL-2.0.1-src.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d1e2d5bf031345ed585e340a3bc01100a53955ce0f885c4dfb0345bd2a0fe40a
size 93604360

1
PDAL-2.0.1-src.tar.bz2.md5
View File

@ -1 +0,0 @@
c68974a7e7f3d4c4c6a57fc28bc9cc71 PDAL-2.0.1-src.tar.bz2

3
PDAL-2.1.0-src.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f7f8b1c1f1571da774d4030836dab2f9e6896f14a1591ae8da1f893c66abd339
size 96534018

1
PDAL-2.1.0-src.tar.bz2.md5 Normal file
View File

@ -0,0 +1 @@
76259fd2488a90b02ece2f8579198aeb PDAL-2.1.0-src.tar.bz2

21
PDAL.changes
View File

@ -1,9 +1,26 @@
-------------------------------------------------------------------
Wed Jun 17 13:49:44 UTC 2020 - Bruno Friedmann <bruno@ioda-net.ch>
- Add a manual fix for PDALConfig.cmake where the
@PDAL_CONFIG_LIBRARY_DIRS@ is wrongly expanded.
-------------------------------------------------------------------
Fri Apr 10 16:29:56 UTC 2020 - Bruno Friedmann <bruno@ioda-net.ch>
- update to 2.1.0 version
release note at https://github.com/PDAL/PDAL/releases
+ Disable removed plugin SQLITE
+ Disable independant plugin python3
- Packaging
+ Fix postgresql(-server)-devel package requirement
+ spec cleanup
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Mar 14 13:19:03 UTC 2020 - Bruno Friedmann <bruno@ioda-net.ch> Sat Mar 14 13:19:03 UTC 2020 - Bruno Friedmann <bruno@ioda-net.ch>
- Renew spec file, remove obsolete SUSE openSUSE versions - Renew spec file, remove obsolete SUSE openSUSE versions
- Remove specific line in cmake about python3 (build failed with - Remove specific line in cmake about python3 (build failed with
new 3.8 version in Factory new 3.8 version in Factory
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 17 07:35:50 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de> Tue Sep 17 07:35:50 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
@ -20,7 +37,7 @@ Mon Jul 8 15:45:21 UTC 2019 - Dirk Stoecker <opensuse@dstoecker.de>
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 20 09:30:33 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch> Wed Feb 20 09:30:33 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>
- Remove FindLASzip-cmake.patch with new laszip 3.2.2 - Remove FindLASzip-cmake.patch with new laszip 3.2.2
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 18 17:57:26 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch> Mon Feb 18 17:57:26 UTC 2019 - Bruno Friedmann <bruno@ioda-net.ch>

51
PDAL.spec
View File

@ -17,11 +17,11 @@
# #
%define soname 10 %define soname 11
%define sovers 10 %define sovers 11
%define lname pdal %define lname pdal
Name: PDAL Name: PDAL
Version: 2.0.1 Version: 2.1.0
Release: 0 Release: 0
Summary: Point Data Abstraction Library. GDAL for point cloud data Summary: Point Data Abstraction Library. GDAL for point cloud data
License: BSD-3-Clause License: BSD-3-Clause
@ -51,24 +51,23 @@ BuildRequires: libgdal-devel
BuildRequires: libgeos-devel BuildRequires: libgeos-devel
BuildRequires: libopenssl-devel >= 1.1 BuildRequires: libopenssl-devel >= 1.1
BuildRequires: libproj-devel BuildRequires: libproj-devel
# Needed to have proj.db for tests
BuildRequires: proj
BuildRequires: libpsl5 BuildRequires: libpsl5
BuildRequires: libspatialindex-devel BuildRequires: libspatialindex-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: postgresql-devel BuildRequires: postgresql-devel
BuildRequires: python3
# We don't have it yet # We don't have it yet
# BuildRequires: pointcloud-devel # BuildRequires: pointcloud-devel
# Python extension will be build separately.
BuildRequires: python3-Cython
BuildRequires: python3-devel
BuildRequires: python3-numpy-devel
BuildRequires: python3-setuptools
BuildRequires: sqlite3-devel
BuildRequires: xz-devel BuildRequires: xz-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: libzstd-devel
BuildRequires: libunwind-devel
BuildRequires: pkgconfig(libpq) BuildRequires: pkgconfig(libpq)
BuildRequires: sqlite3-devel
BuildRequires: python3-devel
# Needed for documentation but we don't build it. # Needed for documentation but we don't build it.
# BuildRequires: dblatex # BuildRequires: dblatex
# BuildRequires: doxygen # BuildRequires: doxygen
@ -82,8 +81,7 @@ BuildRequires: pkgconfig(libpq)
Requires: lib%{name}%{soname} = %{version} Requires: lib%{name}%{soname} = %{version}
Recommends: bash-completion Recommends: bash-completion
Provides: pdal = %{version} Provides: pdal = %{version}
%if 0%{?sle_version} >= 150000 && 0%{?sle_version} <= 150300 && 0%{?is_opensuse} %if 0%{?suse_version} >= 1520 && 0%{?is_opensuse} == 1
%else
BuildRequires: postgresql-server-devel BuildRequires: postgresql-server-devel
%endif %endif
@ -183,22 +181,22 @@ find ./doc/ -type f -iname "*.ai" -delete
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \
-DLIB_INSTALL_DIR=%{_libdir} \ -DLIB_INSTALL_DIR=%{_libdir} \
-DINCLUDE_INSTALL_DIR=%{_includedir} \ -DINCLUDE_INSTALL_DIR=%{_includedir} \
-DENABLE_CTEST=OFF \ -DENABLE_CTEST=ON \
-Dgtest_build_tests=OFF \ -Dgtest_build_tests=OFF \
-DWITH_TESTS=OFF \ -DWITH_TESTS=ON \
-DWITH_COMPLETION=ON \ -DWITH_COMPLETION=ON \
-DWITH_LASZIP=ON \ -DWITH_LASZIP=ON \
-DWITH_LZMA=ON \ -DWITH_LZMA=ON \
-DLASZIP_INCLUDE_DIR=%{_includedir} \ -DLASZIP_INCLUDE_DIR=%{_includedir} \
-DGEOTIFF_INCLUDE_DIR=%{_includedir}/libgeotiff \ -DGEOTIFF_INCLUDE_DIR=%{_includedir}/libgeotiff \
-DBUILD_SHARED_LIBS=ON \ -DBUILD_SHARED_LIBS=ON \
-DBUILD_PLUGIN_PYTHON=ON \
-DNUMPY_INCLUDE_DIR=%{_libdir}/python%{py3_ver}/site-packages/numpy \ -DNUMPY_INCLUDE_DIR=%{_libdir}/python%{py3_ver}/site-packages/numpy \
-DBUILD_PLUGIN_PYTHON=ON \
-DBUILD_PLUGIN_SQLITE=ON \
-DBUILD_PLUGIN_HEXBIN=OFF \ -DBUILD_PLUGIN_HEXBIN=OFF \
-DBUILD_PLUGIN_ICEBRIDGE=OFF \ -DBUILD_PLUGIN_ICEBRIDGE=OFF \
-DBUILD_PLUGIN_NITF=OFF \ -DBUILD_PLUGIN_NITF=OFF \
-DBUILD_PLUGIN_PGPOINTCLOUD=ON \ -DBUILD_PLUGIN_PGPOINTCLOUD=ON \
-DBUILD_PLUGIN_SQLITE=ON \
-DBUILD_PLUGIN_GREYHOUND=OFF \ -DBUILD_PLUGIN_GREYHOUND=OFF \
-DBUILD_PLUGIN_PCL=OFF \ -DBUILD_PLUGIN_PCL=OFF \
.. ..
@ -218,12 +216,15 @@ find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print
%fdupes doc %fdupes doc
%endif %endif
# Not finished yet too many syntax error with python3 # Strange the @PDAL_CONFIG_LIBRARY_DIRS@ is wrongly expanded /usr//usr/lib64/ in PDALConfig.cmake
# WIP with upstream sed -i 's,/usr//usr/lib64,%{_libdir},g' %{buildroot}/%{_libdir}/cmake/PDAL/PDALConfig.cmake
# WIP pgpointcloud test need a complete running pg server
#%%check #%%check
#pushd build #pushd build
#export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:${LD_LIBRARY_PATH} #export LD_LIBRARY_PATH=%%{buildroot}/%%{_libdir}:${LD_LIBRARY_PATH}
#export PDAL_DRIVER_PATH=%{buildroot}/%{_libdir}:${PDAL_DRIVER_PATH} #export PDAL_DRIVER_PATH=%%{buildroot}/%%{_libdir}:${PDAL_DRIVER_PATH}
#export GDAL_DATA=/usr/share/gdal/ #export GDAL_DATA=/usr/share/gdal/
#ctest -V #ctest -V
#popd #popd
@ -246,11 +247,7 @@ find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print
%doc AUTHORS.txt README.md RELEASENOTES.txt %doc AUTHORS.txt README.md RELEASENOTES.txt
%{_libdir}/libpdal_base.so.%{sovers} %{_libdir}/libpdal_base.so.%{sovers}
# Plugins # Plugins
%{_libdir}/libpdal_plugin_filter_python.so.%{sovers}
%{_libdir}/libpdal_plugin_kernel_fauxplugin.so.%{sovers} %{_libdir}/libpdal_plugin_kernel_fauxplugin.so.%{sovers}
%{_libdir}/libpdal_plugin_reader_numpy.so.%{sovers}
%{_libdir}/libpdal_plugin_reader_sqlite.so.%{sovers}
%{_libdir}/libpdal_plugin_writer_sqlite.so.%{sovers}
%{_libdir}/libpdal_plugin_reader_pgpointcloud.so.%{sovers} %{_libdir}/libpdal_plugin_reader_pgpointcloud.so.%{sovers}
%{_libdir}/libpdal_plugin_writer_pgpointcloud.so.%{sovers} %{_libdir}/libpdal_plugin_writer_pgpointcloud.so.%{sovers}
%{_libdir}/libpdal_util.so.%{sovers} %{_libdir}/libpdal_util.so.%{sovers}
@ -261,13 +258,9 @@ find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print
%doc AUTHORS.txt README.md CONTRIBUTING.md %doc AUTHORS.txt README.md CONTRIBUTING.md
%{_includedir}/pdal %{_includedir}/pdal
# old compatibility link # old compatibility link
%exclude %{_libdir}/libpdal_*.so.9 %exclude %{_libdir}/libpdal_*.so.10
%{_libdir}/libpdal_base.so %{_libdir}/libpdal_base.so
%{_libdir}/libpdal_plugin_filter_python.so
%{_libdir}/libpdal_plugin_kernel_fauxplugin.so %{_libdir}/libpdal_plugin_kernel_fauxplugin.so
%{_libdir}/libpdal_plugin_reader_numpy.so
%{_libdir}/libpdal_plugin_reader_sqlite.so
%{_libdir}/libpdal_plugin_writer_sqlite.so
%{_libdir}/libpdal_plugin_reader_pgpointcloud.so %{_libdir}/libpdal_plugin_reader_pgpointcloud.so
%{_libdir}/libpdal_plugin_writer_pgpointcloud.so %{_libdir}/libpdal_plugin_writer_pgpointcloud.so
%{_libdir}/libpdal_util.so %{_libdir}/libpdal_util.so