diff --git a/PDAL-2.0.1-src.tar.bz2 b/PDAL-2.0.1-src.tar.bz2 deleted file mode 100644 index 19f518a..0000000 --- a/PDAL-2.0.1-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1e2d5bf031345ed585e340a3bc01100a53955ce0f885c4dfb0345bd2a0fe40a -size 93604360 diff --git a/PDAL-2.0.1-src.tar.bz2.md5 b/PDAL-2.0.1-src.tar.bz2.md5 deleted file mode 100644 index 85996ff..0000000 --- a/PDAL-2.0.1-src.tar.bz2.md5 +++ /dev/null @@ -1 +0,0 @@ -c68974a7e7f3d4c4c6a57fc28bc9cc71 PDAL-2.0.1-src.tar.bz2 diff --git a/PDAL-2.1.0-src.tar.bz2 b/PDAL-2.1.0-src.tar.bz2 new file mode 100644 index 0000000..9210ca1 --- /dev/null +++ b/PDAL-2.1.0-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7f8b1c1f1571da774d4030836dab2f9e6896f14a1591ae8da1f893c66abd339 +size 96534018 diff --git a/PDAL-2.1.0-src.tar.bz2.md5 b/PDAL-2.1.0-src.tar.bz2.md5 new file mode 100644 index 0000000..6c5b11b --- /dev/null +++ b/PDAL-2.1.0-src.tar.bz2.md5 @@ -0,0 +1 @@ +76259fd2488a90b02ece2f8579198aeb PDAL-2.1.0-src.tar.bz2 diff --git a/PDAL.changes b/PDAL.changes index 7950529..c928e44 100644 --- a/PDAL.changes +++ b/PDAL.changes @@ -1,9 +1,26 @@ +------------------------------------------------------------------- +Wed Jun 17 13:49:44 UTC 2020 - Bruno Friedmann + +- 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 + +- 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 - Renew spec file, remove obsolete SUSE openSUSE versions - 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 @@ -20,7 +37,7 @@ Mon Jul 8 15:45:21 UTC 2019 - Dirk Stoecker ------------------------------------------------------------------- Wed Feb 20 09:30:33 UTC 2019 - Bruno Friedmann -- 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 diff --git a/PDAL.spec b/PDAL.spec index 1050377..5cfaefd 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -17,11 +17,11 @@ # -%define soname 10 -%define sovers 10 +%define soname 11 +%define sovers 11 %define lname pdal Name: PDAL -Version: 2.0.1 +Version: 2.1.0 Release: 0 Summary: Point Data Abstraction Library. GDAL for point cloud data License: BSD-3-Clause @@ -51,24 +51,23 @@ BuildRequires: libgdal-devel BuildRequires: libgeos-devel BuildRequires: libopenssl-devel >= 1.1 BuildRequires: libproj-devel +# Needed to have proj.db for tests +BuildRequires: proj 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 -# 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: zlib-devel +BuildRequires: libzstd-devel +BuildRequires: libunwind-devel BuildRequires: pkgconfig(libpq) +BuildRequires: sqlite3-devel +BuildRequires: python3-devel # Needed for documentation but we don't build it. # BuildRequires: dblatex # BuildRequires: doxygen @@ -82,8 +81,7 @@ BuildRequires: pkgconfig(libpq) Requires: lib%{name}%{soname} = %{version} Recommends: bash-completion Provides: pdal = %{version} -%if 0%{?sle_version} >= 150000 && 0%{?sle_version} <= 150300 && 0%{?is_opensuse} -%else +%if 0%{?suse_version} >= 1520 && 0%{?is_opensuse} == 1 BuildRequires: postgresql-server-devel %endif @@ -183,22 +181,22 @@ find ./doc/ -type f -iname "*.ai" -delete -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \ -DLIB_INSTALL_DIR=%{_libdir} \ -DINCLUDE_INSTALL_DIR=%{_includedir} \ - -DENABLE_CTEST=OFF \ + -DENABLE_CTEST=ON \ -Dgtest_build_tests=OFF \ - -DWITH_TESTS=OFF \ + -DWITH_TESTS=ON \ -DWITH_COMPLETION=ON \ -DWITH_LASZIP=ON \ -DWITH_LZMA=ON \ -DLASZIP_INCLUDE_DIR=%{_includedir} \ -DGEOTIFF_INCLUDE_DIR=%{_includedir}/libgeotiff \ -DBUILD_SHARED_LIBS=ON \ - -DBUILD_PLUGIN_PYTHON=ON \ -DNUMPY_INCLUDE_DIR=%{_libdir}/python%{py3_ver}/site-packages/numpy \ + -DBUILD_PLUGIN_PYTHON=ON \ + -DBUILD_PLUGIN_SQLITE=ON \ -DBUILD_PLUGIN_HEXBIN=OFF \ -DBUILD_PLUGIN_ICEBRIDGE=OFF \ -DBUILD_PLUGIN_NITF=OFF \ -DBUILD_PLUGIN_PGPOINTCLOUD=ON \ - -DBUILD_PLUGIN_SQLITE=ON \ -DBUILD_PLUGIN_GREYHOUND=OFF \ -DBUILD_PLUGIN_PCL=OFF \ .. @@ -218,12 +216,15 @@ find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print %fdupes doc %endif -# Not finished yet too many syntax error with python3 -# WIP with upstream +# Strange the @PDAL_CONFIG_LIBRARY_DIRS@ is wrongly expanded /usr//usr/lib64/ in PDALConfig.cmake +sed -i 's,/usr//usr/lib64,%{_libdir},g' %{buildroot}/%{_libdir}/cmake/PDAL/PDALConfig.cmake + + +# WIP pgpointcloud test need a complete running pg server #%%check #pushd build -#export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:${LD_LIBRARY_PATH} -#export PDAL_DRIVER_PATH=%{buildroot}/%{_libdir}:${PDAL_DRIVER_PATH} +#export LD_LIBRARY_PATH=%%{buildroot}/%%{_libdir}:${LD_LIBRARY_PATH} +#export PDAL_DRIVER_PATH=%%{buildroot}/%%{_libdir}:${PDAL_DRIVER_PATH} #export GDAL_DATA=/usr/share/gdal/ #ctest -V #popd @@ -246,11 +247,7 @@ find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print %doc AUTHORS.txt README.md RELEASENOTES.txt %{_libdir}/libpdal_base.so.%{sovers} # Plugins -%{_libdir}/libpdal_plugin_filter_python.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_writer_pgpointcloud.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 %{_includedir}/pdal # old compatibility link -%exclude %{_libdir}/libpdal_*.so.9 +%exclude %{_libdir}/libpdal_*.so.10 %{_libdir}/libpdal_base.so -%{_libdir}/libpdal_plugin_filter_python.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_writer_pgpointcloud.so %{_libdir}/libpdal_util.so