From 5251935e319a4f9b71fe672590a007bf9029909fa645767c28c460ea1a58ae3e Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 6 Jun 2017 16:04:15 +0000 Subject: [PATCH] Accepting request 501446 from home:bruno_friedmann:branches:Application:Geo - Update to version 1.5.0 Visit https://github.com/PDAL/PDAL/releases/tag/1.5.0 for all improvements done since 1.4 - Remove patch c2cf2d.patch merged upstream - Adjust sofull_version to 5.1.0 soname to 5 and sovers to 4 - Use the lastest patch c2cf2d.patch in place of cfb888a04897f9704d5bdfaf4d2979e9ff303aab.patch with use of short commit tag. OBS-URL: https://build.opensuse.org/request/show/501446 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/PDAL?expand=0&rev=5 --- PDAL-1.4.0-src.tar.bz2 | 3 - PDAL-1.4.0-src.tar.bz2.md5 | 1 - PDAL-1.5.0-src.tar.bz2 | 3 + PDAL-1.5.0-src.tar.bz2.md5 | 1 + PDAL.changes | 16 +++ PDAL.spec | 31 ++---- ...88a04897f9704d5bdfaf4d2979e9ff303aab.patch | 101 ------------------ 7 files changed, 27 insertions(+), 129 deletions(-) delete mode 100644 PDAL-1.4.0-src.tar.bz2 delete mode 100644 PDAL-1.4.0-src.tar.bz2.md5 create mode 100644 PDAL-1.5.0-src.tar.bz2 create mode 100644 PDAL-1.5.0-src.tar.bz2.md5 delete mode 100644 cfb888a04897f9704d5bdfaf4d2979e9ff303aab.patch diff --git a/PDAL-1.4.0-src.tar.bz2 b/PDAL-1.4.0-src.tar.bz2 deleted file mode 100644 index 5719ba9..0000000 --- a/PDAL-1.4.0-src.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d563792c26eed83750259e474f52146bc6fdaaa9ac6e2269c05f023b57d89563 -size 62749292 diff --git a/PDAL-1.4.0-src.tar.bz2.md5 b/PDAL-1.4.0-src.tar.bz2.md5 deleted file mode 100644 index 09df8c6..0000000 --- a/PDAL-1.4.0-src.tar.bz2.md5 +++ /dev/null @@ -1 +0,0 @@ -8e767028e41a9da25561dfe25e60a542 PDAL-1.4.0-src.tar.bz2 diff --git a/PDAL-1.5.0-src.tar.bz2 b/PDAL-1.5.0-src.tar.bz2 new file mode 100644 index 0000000..555c22a --- /dev/null +++ b/PDAL-1.5.0-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d86c83aa87669c0a084833449b294db3a32a15aab6d7f8215e7eac7695a0518c +size 58884629 diff --git a/PDAL-1.5.0-src.tar.bz2.md5 b/PDAL-1.5.0-src.tar.bz2.md5 new file mode 100644 index 0000000..1ab4ae4 --- /dev/null +++ b/PDAL-1.5.0-src.tar.bz2.md5 @@ -0,0 +1 @@ +bda90d15e84e36684836212ebbca09f2 PDAL-1.5.0-src.tar.bz2 diff --git a/PDAL.changes b/PDAL.changes index dbf0aae..cddf978 100644 --- a/PDAL.changes +++ b/PDAL.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed May 31 06:24:07 UTC 2017 - bruno@ioda-net.ch + +- Update to version 1.5.0 + Visit https://github.com/PDAL/PDAL/releases/tag/1.5.0 for all + improvements done since 1.4 +- Remove patch c2cf2d.patch merged upstream +- Adjust sofull_version to 5.1.0 soname to 5 and sovers to 4 + +------------------------------------------------------------------- +Fri Mar 10 12:51:53 UTC 2017 - bruno@ioda-net.ch + +- Use the lastest patch c2cf2d.patch in place of + cfb888a04897f9704d5bdfaf4d2979e9ff303aab.patch + with use of short commit tag. + ------------------------------------------------------------------- Wed Mar 8 14:51:03 UTC 2017 - bruno@ioda-net.ch diff --git a/PDAL.spec b/PDAL.spec index d37e08e..6728b2e 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -23,24 +23,22 @@ # Mandatory : build -doc appart (too much texlive used otherwise) # Ask upstream to clarify seems sofull_version is build version -%define soname 4 +%define soname 5 %define sovers 4 -%define sofull_version 5.0.0 +%define sofull_version 5.1.0 %define lname pdal Name: PDAL -Version: 1.4.0 +Version: 1.5.0 Release: 0 Summary: Point Data Abstraction Library. GDAL for point cloud data -#@todo verify with upstream if not BSD-3 +#@TODO verify with upstream if not BSD-3 License: BSD-2-Clause Group: Productivity/Graphics/CAD Url: http://www.pdal.io/ Source0: http://download.osgeo.org/pdal/%{name}-%{version}-src.tar.bz2 Source1: http://download.osgeo.org/pdal/%{name}-%{version}-src.tar.bz2.md5 # Source2: https://www.pdal.io/PDAL.pdf -# Upstream issue#1503 has hardcoded /usr/include/laszip/laszip.hpp -Patch0: https://github.com/PDAL/PDAL/commit/cfb888a04897f9704d5bdfaf4d2979e9ff303aab.patch # Override the problem of libpsl5 in tumbleweed %if 0%{?suse_version} >= 1330 BuildRequires: libpsl5 @@ -100,6 +98,8 @@ BuildRequires: zlib-devel # For doc but only in TW # BuildRequires: python-sphinxcontrib-breathe # Doesn't exist on obs BuildRequires: python3-breathe +BuildRequires: libibumad-devel +BuildRequires: libibverbs-devel Requires: lib%{name}%{soname} = %{version} Recommends: bash-completion @@ -183,7 +183,6 @@ PDAL algorithms. %prep %setup -q -n %{name}-%{version}-src -%patch0 -p1 #Cleanup spurious perms in documentation find ./doc/ -type f -exec chmod -v 0644 {} \; @@ -191,13 +190,6 @@ find ./doc/ -type f -iname "*.orig" -o -iname ".gitignore" -delete find ./doc/ -type f -iname "*.ai" -delete %build -%if 0%{?suse_version} == 1310 -# Make things more secure, but only on 13.1 (by default on 13.2+) -export LDFLAGS="-Wl,-z,relro,-z,now -pie" -export CFLAGS="%{optflags} -fPIE -pie" -export CXXFLAGS="%{optflags} -fPIE -pie" -%endif - %cmake \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \ @@ -224,27 +216,18 @@ export CXXFLAGS="%{optflags} -fPIE -pie" -DBUILD_PLUGIN_PCL=OFF \ .. - make VERBOSE=1 %{?_smp_mflags} # Make documentation once fixed upstream # make doxygen html man pdf -# Make the python part should be build in a dedicated .spec -# It need pdal-config to work -# pushd ../python -# python setup.py build -# popd +# Python part should be build from pypi in own .spec %install pushd build make DESTDIR=%{buildroot} install %{?_smp_mflags} popd -# pushd ../python -# python setup.py install -# popd - #No .la lib find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print diff --git a/cfb888a04897f9704d5bdfaf4d2979e9ff303aab.patch b/cfb888a04897f9704d5bdfaf4d2979e9ff303aab.patch deleted file mode 100644 index 94fc6d2..0000000 --- a/cfb888a04897f9704d5bdfaf4d2979e9ff303aab.patch +++ /dev/null @@ -1,101 +0,0 @@ -From cfb888a04897f9704d5bdfaf4d2979e9ff303aab Mon Sep 17 00:00:00 2001 -From: Andrew Bell -Date: Mon, 6 Mar 2017 15:41:20 -0600 -Subject: [PATCH] Allow laszip to be found in laszip subdirectory or not. Close - #1503 - ---- - cmake/modules/FindLASzip.cmake | 24 ++++++++++++++++++------ - io/LasZipPoint.hpp | 6 +++--- - pdal/pdal_config.cpp | 2 +- - tools/lasdump/Dumper.cpp | 4 ++-- - 4 files changed, 24 insertions(+), 12 deletions(-) - -diff --git a/cmake/modules/FindLASzip.cmake b/cmake/modules/FindLASzip.cmake -index 38d32c1..27c8352 100644 ---- a/cmake/modules/FindLASzip.cmake -+++ b/cmake/modules/FindLASzip.cmake -@@ -37,12 +37,23 @@ ENDIF() - - - FIND_PATH(LASZIP_INCLUDE_DIR -- laszip/laszip.hpp -+ laszip.hpp - PATHS -- /usr/include -- /usr/local/include -- /tmp/lasjunk/include -- ${OSGEO4W_ROOT_DIR}/include) -+ /usr/include/laszip -+ /usr/local/include/laszip -+ ${OSGEO4W_ROOT_DIR}/include/laszip) -+ -+if (NOT LASZIP_INCLUDE_DIR) -+ FIND_PATH(LASZIP_INCLUDE_DIR -+ laszip/laszip.hpp -+ PATHS -+ /usr/include -+ /usr/local/include -+ ${OSGEO4W_ROOT_DIR}/include) -+ if (LASZIP_INCLUDE_DIR) -+ set(LASZIP_INCLUDE_DIR ${LASZIP_INCLUDE_DIR}/laszip) -+ endif() -+endif() - - SET(LASZIP_NAMES ${OSGEO4W_IMPORT_LIBRARY} laszip) - -@@ -57,7 +68,8 @@ FIND_LIBRARY(LASZIP_LIBRARY - IF(LASZIP_INCLUDE_DIR) - SET(LASZIP_VERSION 0) - -- SET(LASZIP_VERSION_H "${LASZIP_INCLUDE_DIR}/laszip/laszip.hpp") -+ message(STATUS "*** ${LASZIP_INCLUDE_DIR} ***") -+ SET(LASZIP_VERSION_H "${LASZIP_INCLUDE_DIR}/laszip.hpp") - FILE(READ ${LASZIP_VERSION_H} LASZIP_VERSION_H_CONTENTS) - - IF (DEFINED LASZIP_VERSION_H_CONTENTS) -diff --git a/io/LasZipPoint.hpp b/io/LasZipPoint.hpp -index abe6eea..57c049b 100644 ---- a/io/LasZipPoint.hpp -+++ b/io/LasZipPoint.hpp -@@ -37,9 +37,9 @@ - #include - - #ifdef PDAL_HAVE_LASZIP --#include --#include --#include -+#include -+#include -+#include - #endif - - namespace pdal -diff --git a/pdal/pdal_config.cpp b/pdal/pdal_config.cpp -index ca45025..2703ebc 100644 ---- a/pdal/pdal_config.cpp -+++ b/pdal/pdal_config.cpp -@@ -61,7 +61,7 @@ - #endif - - #ifdef PDAL_HAVE_LASZIP --#include -+#include - #endif - - #include -diff --git a/tools/lasdump/Dumper.cpp b/tools/lasdump/Dumper.cpp -index b4ccb33..d126c2f 100644 ---- a/tools/lasdump/Dumper.cpp -+++ b/tools/lasdump/Dumper.cpp -@@ -32,8 +32,8 @@ - * OF SUCH DAMAGE. - ****************************************************************************/ - --#include --#include -+#include -+#include - - #include -