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

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

Browse Source 
- Define %make_build for openSUSE_Leap_42.3 

- Packaging:
  + spec-clean -m (date,url,license)
  + use make_build standard macro
  + remove merged patch f717a4c.patch
  + Adjust sofull_version 7.0.2 soname,sovers to 6
  + Fix sed shebang for python3
  + Added new reader numpy to filelist
- Updated to 1.7.2 upstream bugfix release
  - See changelog https://github.com/PDAL/PDAL/releases/tag/1.7.2
- Major release 1.7.1
  - See numerous changes at
    https://github.com/PDAL/PDAL/releases/tag/1.7.1

OBS-URL: https://build.opensuse.org/request/show/616140
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/PDAL?expand=0&rev=8
This commit is contained in:
Martin Pluskal 2018-06-12 09:31:44 +00:00 committed by Git OBS Bridge
parent 5b5fd6d674
commit f4f20e21ab
6 changed files with 65 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PDAL-1.6.0-src.tar.gz
View File

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

1
PDAL-1.6.0-src.tar.gz.md5
View File

@ -1 +0,0 @@
MD5 (PDAL-1.6.0-src.tar.gz) = 4e801b06e2bde2316782fcdd1be4422f

3
PDAL-1.7.2-src.tar.gz Normal file
View File

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

1
PDAL-1.7.2-src.tar.gz.md5 Normal file
View File

@ -0,0 +1 @@
a89710005fd54e6d2436955e2e542838 PDAL-1.7.2RC3-src.tar.gz

21
PDAL.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Mon Jun 11 12:47:56 UTC 2018 - bruno@ioda-net.ch
- Define %make_build for openSUSE_Leap_42.3
-------------------------------------------------------------------
Fri Jun 1 19:35:14 UTC 2018 - bruno@ioda-net.ch
- Packaging:
+ spec-clean -m (date,url,license)
+ use make_build standard macro
+ remove merged patch f717a4c.patch
+ Adjust sofull_version 7.0.2 soname,sovers to 6
+ Fix sed shebang for python3
+ Added new reader numpy to filelist
- Updated to 1.7.2 upstream bugfix release
- See changelog https://github.com/PDAL/PDAL/releases/tag/1.7.2
- Major release 1.7.1
- See numerous changes at
https://github.com/PDAL/PDAL/releases/tag/1.7.1
-------------------------------------------------------------------
Sat Mar 17 13:45:07 UTC 2018 - aaronpuchert@alice-dsl.net

66
PDAL.spec
View File

@ -16,20 +16,23 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
#@TODO: plugins PCL LASZIP P2G
# python breathe for doc
# python3
#@TODO: plugins PCL P2G
# Mandatory : build -doc appart (too much texlive used otherwise)
# Temporary fix for Leap 42.3
%if ! %{defined make_build}
%define make_build /usr/bin/make %{?_smp_mflags}
%endif
# Ask upstream to clarify seems sofull_version is build version
%define soname 5
%define sovers 5
%define sofull_version 6.1.0
%define soname 6
%define sovers 6
%define sofull_version 7.0.2
%define lname pdal
Name: PDAL
Version: 1.6.0
Version: 1.7.2
Release: 0
Summary: Point Data Abstraction Library. GDAL for point cloud data
License: BSD-3-Clause
@ -38,9 +41,7 @@ Url: http://www.pdal.io/
Source0: http://download.osgeo.org/pdal/%{name}-%{version}-src.tar.gz
Source1: http://download.osgeo.org/pdal/%{name}-%{version}-src.tar.gz.md5
# Source2: https://www.pdal.io/PDAL.pdf
#Upstream issue#1789 fix for jsoncpp signature
Patch0: https://github.com/PDAL/PDAL/commit/f717a4c.patch
Patch1: FindLASzip-cmake.patch
Patch0: FindLASzip-cmake.patch
# Override the problem of libpsl5 in tumbleweed
%if 0%{?suse_version} >= 1330
BuildRequires: libpsl5
@ -62,6 +63,8 @@ BuildRequires: freeglut-devel
# Needed for tests
BuildRequires: gdal
BuildRequires: gcc-c++
# For tests but don't exist for Leap 42.3
# BuildRequires: gtest
BuildRequires: libgdal-devel
BuildRequires: libgeos-devel
BuildRequires: geotiff-devel
@ -72,6 +75,7 @@ BuildRequires: libproj-devel
BuildRequires: libspatialindex-devel
BuildRequires: libtiff-devel
BuildRequires: libxml2-devel
BuildRequires: xz-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig(libpq)
# We don't have it yet
@ -95,6 +99,7 @@ BuildRequires: zlib-devel
# BuildRequires: python-sphinxcontrib-breathe
# Doesn't exist on obs BuildRequires: python3-breathe
Requires: lib%{name}%{soname} = %{version}
Provides: pdal = %{version}
Recommends: bash-completion
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -119,7 +124,8 @@ https://www.pdal.io
This package provides tools & utilities using PDAL library libpdal
%package -n lib%{name}%{soname}
Provides: lib%{lname}%{soname}
Provides: lib%{lname}%{soname}
Provides: libpdal%{soname}
Summary: Point Data Abstraction Library. GDAL for point cloud data
%description -n lib%{name}%{soname}
@ -154,12 +160,16 @@ filters.pclblock for more background.
Summary: Development files and tools for PDAL applications
Group: Development/Libraries/C and C++
Requires: lib%{name}%{soname} = %{version}
Requires: boost-devel
Requires: libboost_headers-devel
Requires: libboost_filesystem-devel
Requires: libboost_program_options-devel
Requires: cmake
Requires: zlib-devel
Requires: xz-devel
Provides: lib%{name}%{soname}-devel = %{version}
Provides: lib%{lname}%{soname}-devel = %{version}
Provides: lib%{name}-devel
Provides: libpdal-devel
%description -n %{name}-devel
This package provides the headers files and tools you may need to
@ -178,9 +188,8 @@ PDAL algorithms.
%prep
%setup -q -n %{name}-%{version}-src
%patch0 -p1
%patch1 -p1
# Fix all wrong shebang and move to python3 only
find . -type f -iname "*.py" -exec sed 's,^#!/usr/bin/env python,#/usr/bin/python3,' {} \;
find . -type f -iname "*.py" -exec sed 's,^#!/usr/bin/env python,#!/usr/bin/python3,' {} \;
#Cleanup spurious perms in documentation
find ./doc/ -type f -exec chmod -v 0644 {} \;
@ -194,10 +203,12 @@ 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=ON \
-DENABLE_CTEST=OFF \
-Dgtest_build_tests=OFF \
-DWITH_TESTS=OFF \
-DWITH_COMPLETION=ON \
-DWITH_TESTS=ON \
-DWITH_LASZIP=ON \
-DWITH_LZMA=ON \
-DLASZIP_INCLUDE_DIR=%{_includedir} \
-DGEOTIFF_INCLUDE_DIR=%{_includedir}/libgeotiff \
-DBUILD_SHARED_LIBS=ON \
@ -214,7 +225,7 @@ find ./doc/ -type f -iname "*.ai" -delete
-DBUILD_PLUGIN_PCL=OFF \
..
%make_jobs
%make_build
# Make documentation once fixed upstream
# make doxygen html man pdf
@ -229,10 +240,12 @@ find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print
%fdupes doc
%endif
# Not finished yet
#%%check
# Not finished yet too many syntax error with python3
# WIP with upstream
#%check
#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 GDAL_DATA=/usr/share/gdal/
#ctest -V
#popd
@ -243,11 +256,7 @@ find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print
%files
%defattr(-,root,root,-)
%if 0%{?leap_version} >= 420200 || 0%{?suse_version} > 1320
%license LICENSE.txt
%else
%doc LICENSE.txt
%endif
%{_bindir}/pdal
%dir %{_datadir}/bash-completion
%dir %{_datadir}/bash-completion/completions
@ -255,10 +264,12 @@ find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print
%files -n lib%{name}%{soname}
%defattr(-,root,root,-)
%doc AUTHORS.txt LICENSE.txt README.md ChangeLog
%license LICENSE.txt
%doc AUTHORS.txt README.md ChangeLog
%{_libdir}/libpdal_base.so.%{sofull_version}
# Plugins
%{_libdir}/libpdal_plugin_filter_python.so.%{sofull_version}
%{_libdir}/libpdal_plugin_reader_numpy.so.%{sofull_version}
%{_libdir}/libpdal_plugin_reader_sqlite.so.%{sofull_version}
%{_libdir}/libpdal_plugin_writer_sqlite.so.%{sofull_version}
%{_libdir}/libpdal_plugin_reader_pgpointcloud.so.%{sofull_version}
@ -268,12 +279,15 @@ find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print
%files -n %{name}-devel
%defattr(-,root,root,-)
%doc AUTHORS.txt LICENSE.txt README.md CONTRIBUTING.md
%license LICENSE.txt
%doc AUTHORS.txt README.md CONTRIBUTING.md
%{_includedir}/pdal
%{_libdir}/libpdal_base.so.%{sovers}
%{_libdir}/libpdal_base.so
%{_libdir}/libpdal_plugin_filter_python.so
%{_libdir}/libpdal_plugin_filter_python.so.%{sovers}
%{_libdir}/libpdal_plugin_reader_numpy.so
%{_libdir}/libpdal_plugin_reader_numpy.so.%{sovers}
%{_libdir}/libpdal_plugin_reader_sqlite.so
%{_libdir}/libpdal_plugin_reader_sqlite.so.%{sovers}
%{_libdir}/libpdal_plugin_writer_sqlite.so