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
This commit is contained in:
Martin Pluskal
2017-06-06 16:04:15 +00:00
committed by Git OBS Bridge
parent bd51cc8485
commit 5251935e31
7 changed files with 27 additions and 129 deletions

View File

@@ -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