diff --git a/.gitignore b/.gitignore index b9ae6f8..04b0ef6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /PDAL-2.1.0-src.tar.gz +/PDAL-2.2.0-src.tar.gz diff --git a/PDAL.spec b/PDAL.spec index ea4d039..3f7e402 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -1,7 +1,7 @@ Summary: Point Data Abstraction Library Name: PDAL -Version: 2.1.0 -Release: 9%{?dist} +Version: 2.2.0 +Release: 1%{?dist} # The code is licensed BSD except for: # - filters/private/csf/* and plugins/i3s/lepcc/* are ASL 2.0 # - vendor/arbiter/*, plugins/nitf/io/nitflib.h and plugins/oci/io/OciWrapper.* are Expat/MIT @@ -61,6 +61,7 @@ BuildRequires: python3-sphinx %if 0%{?fedora} # yet missing for EPEL8 BuildRequires: python3-sphinxcontrib-bibtex +BuildRequires: python3-sphinxcontrib-spelling %endif BuildRequires: python3-sphinx_rtd_theme BuildRequires: qhull-devel @@ -230,6 +231,9 @@ sphinx-build -b html . build/html %license LICENSE.txt %changelog +* Sat Oct 17 2020 Markus Neteler 2.2.0-1 +- new upstream version + * Mon Jul 27 2020 Fedora Release Engineering - 2.1.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/PDAL_unbundle.patch b/PDAL_unbundle.patch index b8b8917..5087064 100644 --- a/PDAL_unbundle.patch +++ b/PDAL_unbundle.patch @@ -1,7 +1,7 @@ -diff -rupN PDAL-2.1.0-src/CMakeLists.txt PDAL-2.1.0-src-new/CMakeLists.txt ---- PDAL-2.1.0-src/CMakeLists.txt 2020-03-20 22:18:17.000000000 +0100 -+++ PDAL-2.1.0-src-new/CMakeLists.txt 2020-05-27 11:09:43.675133404 +0200 -@@ -51,7 +51,6 @@ else() +diff -rupN PDAL-2.2.0-src/CMakeLists.txt PDAL-2.2.0-src-new/CMakeLists.txt +--- PDAL-2.2.0-src/CMakeLists.txt 2020-09-09 17:14:18.000000000 +0200 ++++ PDAL-2.2.0-src-new/CMakeLists.txt 2020-10-18 20:19:25.725455538 +0200 +@@ -67,7 +67,6 @@ else() endif() set(PDAL_LIB_NAME pdalcpp) set(PDAL_UTIL_LIB_NAME pdal_util) @@ -9,7 +9,7 @@ diff -rupN PDAL-2.1.0-src/CMakeLists.txt PDAL-2.1.0-src-new/CMakeLists.txt set(PDAL_KAZHDAN_LIB_NAME pdal_kazhdan) set(PDAL_TEST_SUPPORT_OBJS pdal_test_support) -@@ -125,6 +124,9 @@ include(${PDAL_CMAKE_DIR}/arbiter.cmake) +@@ -141,6 +140,9 @@ include(${PDAL_CMAKE_DIR}/arbiter.cmake) include(${PDAL_CMAKE_DIR}/nlohmann.cmake) include(${PDAL_CMAKE_DIR}/openssl.cmake) # Optional @@ -19,7 +19,7 @@ diff -rupN PDAL-2.1.0-src/CMakeLists.txt PDAL-2.1.0-src-new/CMakeLists.txt #------------------------------------------------------------------------------ # generate the pdal_features.hpp header #------------------------------------------------------------------------------ -@@ -163,13 +165,10 @@ endif() +@@ -179,13 +181,10 @@ endif() add_subdirectory(plugins) @@ -33,7 +33,7 @@ diff -rupN PDAL-2.1.0-src/CMakeLists.txt PDAL-2.1.0-src-new/CMakeLists.txt add_subdirectory(vendor/arbiter) add_subdirectory(vendor/kazhdan) add_subdirectory(pdal/util) -@@ -251,11 +250,10 @@ target_include_directories(${PDAL_BASE_L +@@ -267,13 +266,12 @@ target_include_directories(${PDAL_BASE_L ${ROOT_DIR} ${PROJECT_BINARY_DIR}/include ${PDAL_VENDOR_DIR} @@ -42,10 +42,12 @@ diff -rupN PDAL-2.1.0-src/CMakeLists.txt PDAL-2.1.0-src-new/CMakeLists.txt ${LIBXML2_INCLUDE_DIR} ${ZSTD_INCLUDE_DIRS} ${NLOHMANN_INCLUDE_DIR} -+ ${EIGEN_INCLUDE_DIRS} - PUBLIC ${GDAL_INCLUDE_DIR} ${LASZIP_INCLUDE_DIR} ++ ${EIGEN_INCLUDE_DIRS} + ) + target_link_libraries(${PDAL_BASE_LIB_NAME} + PRIVATE diff -rupN PDAL-2.1.0-src/pdal/util/CMakeLists.txt PDAL-2.1.0-src-new/pdal/util/CMakeLists.txt --- PDAL-2.1.0-src/pdal/util/CMakeLists.txt 2020-03-20 22:18:17.000000000 +0100 +++ PDAL-2.1.0-src-new/pdal/util/CMakeLists.txt 2020-05-27 11:10:04.732174032 +0200 @@ -201,19 +203,19 @@ diff -rupN PDAL-2.1.0-src/pdal/util/FileUtils.cpp PDAL-2.1.0-src-new/pdal/util/F } -diff -rupN PDAL-2.1.0-src/test/unit/CMakeLists.txt PDAL-2.1.0-src-new/test/unit/CMakeLists.txt ---- PDAL-2.1.0-src/test/unit/CMakeLists.txt 2020-03-20 22:18:18.000000000 +0100 -+++ PDAL-2.1.0-src-new/test/unit/CMakeLists.txt 2020-05-27 11:03:27.686421679 +0200 -@@ -32,7 +32,7 @@ PDAL_ADD_TEST(pdal_eigen_test - FILES - EigenTest.cpp +diff -rupN PDAL-2.2.0-src/test/unit/CMakeLists.txt PDAL-2.2.0-src-new/test/unit/CMakeLists.txt +--- PDAL-2.2.0-src/test/unit/CMakeLists.txt 2020-09-09 17:14:17.000000000 +0200 ++++ PDAL-2.2.0-src-new/test/unit/CMakeLists.txt 2020-10-18 20:31:38.138997875 +0200 +@@ -34,7 +34,7 @@ PDAL_ADD_TEST(pdal_eigen_test + ${PDAL_SRC_DIR}/private/MathUtils.cpp + INCLUDES - ${PDAL_VENDOR_DIR}/eigen + ${EIGEN_INCLUDE_DIRS} ) PDAL_ADD_TEST(pdal_file_utils_test FILES FileUtilsTest.cpp) PDAL_ADD_TEST(pdal_georeference_test FILES GeoreferenceTest.cpp) -@@ -41,7 +41,7 @@ PDAL_ADD_TEST(pdal_kdindex_test +@@ -43,7 +43,7 @@ PDAL_ADD_TEST(pdal_kdindex_test KDIndexTest.cpp INCLUDES ${PDAL_VENDOR_DIR} @@ -222,7 +224,7 @@ diff -rupN PDAL-2.1.0-src/test/unit/CMakeLists.txt PDAL-2.1.0-src-new/test/unit/ ) PDAL_ADD_TEST(pdal_kernel_test FILES KernelTest.cpp) PDAL_ADD_TEST(pdal_log_test FILES LogTest.cpp) -@@ -68,7 +68,7 @@ PDAL_ADD_TEST(pdal_point_view_test +@@ -70,7 +70,7 @@ PDAL_ADD_TEST(pdal_point_view_test FILES PointViewTest.cpp INCLUDES @@ -231,7 +233,7 @@ diff -rupN PDAL-2.1.0-src/test/unit/CMakeLists.txt PDAL-2.1.0-src-new/test/unit/ ) PDAL_ADD_TEST(pdal_point_table_test FILES PointTableTest.cpp) -@@ -178,13 +178,13 @@ PDAL_ADD_TEST(pdal_io_pcd_reader_test +@@ -189,13 +189,13 @@ PDAL_ADD_TEST(pdal_io_pcd_reader_test FILES io/PcdReaderTest.cpp INCLUDES @@ -247,7 +249,7 @@ diff -rupN PDAL-2.1.0-src/test/unit/CMakeLists.txt PDAL-2.1.0-src-new/test/unit/ ) PDAL_ADD_TEST(pdal_io_ply_reader_test FILES -@@ -219,7 +219,7 @@ PDAL_ADD_TEST(pdal_filters_chipper_test +@@ -231,7 +231,7 @@ PDAL_ADD_TEST(pdal_filters_chipper_test filters/ChipperTest.cpp INCLUDES ${NLOHMANN_INCLUDE_DIR} @@ -256,7 +258,7 @@ diff -rupN PDAL-2.1.0-src/test/unit/CMakeLists.txt PDAL-2.1.0-src-new/test/unit/ ) PDAL_ADD_TEST(pdal_filters_nndistance_test FILES -@@ -266,7 +266,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test +@@ -281,7 +281,7 @@ PDAL_ADD_TEST(pdal_filters_icp_test FILES filters/IcpFilterTest.cpp INCLUDES @@ -265,7 +267,16 @@ diff -rupN PDAL-2.1.0-src/test/unit/CMakeLists.txt PDAL-2.1.0-src-new/test/unit/ ) PDAL_ADD_TEST(pdal_filters_info_test FILES filters/InfoFilterTest.cpp) PDAL_ADD_TEST(pdal_filters_neighborclassifier_test FILES filters/NeighborClassifierFilterTest.cpp) -@@ -305,7 +305,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test +@@ -301,7 +301,7 @@ PDAL_ADD_TEST(pdal_filters_planefit_test + FILES + filters/PlaneFitFilterTest.cpp + INCLUDES +- ${PDAL_VENDOR_DIR}/eigen) ++ ${EIGEN_INCLUDE_DIRS}) + PDAL_ADD_TEST(pdal_filters_pmf_test FILES filters/PMFFilterTest.cpp) + PDAL_ADD_TEST(pdal_filters_reprojection_test FILES + filters/ReprojectionFilterTest.cpp) +@@ -326,7 +326,7 @@ PDAL_ADD_TEST(pdal_filters_splitter_test FILES filters/SplitterTest.cpp INCLUDES diff --git a/sources b/sources index 4d286ee..4e4756e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PDAL-2.1.0-src.tar.gz) = 273e43bc02039ef56e22d6496d74c645c947dec7961024f419232b3f70ad5de030d5ee9fb74f44649016da67ff39179b06fa0d85f17a3b7db5fcce3cd0e35ac5 +SHA512 (PDAL-2.2.0-src.tar.gz) = c54770973de714473bf6cfe6a69e2c880d516abcf71cce755495304093acb41471b4264cb84f11973a482f3de80a8922d7d8b54994fb91c6b012a6894a8bdac5