diff --git a/01.patch b/01.patch deleted file mode 100644 index d6e7064..0000000 --- a/01.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/apps/CMakeLists.txt w/apps/CMakeLists.txt -index a6c6943..566ae82 100644 ---- i/apps/CMakeLists.txt -+++ w/apps/CMakeLists.txt -@@ -87,7 +87,7 @@ if(UNIX OR APPLE) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pdal.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/pdal.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pdal.pc -- DESTINATION "${CMAKE_INSTALL_PREFIX}/${PDAL_LIB_INSTALL_DIR}/pkgconfig/" -+ DESTINATION "${PDAL_LIB_INSTALL_DIR}/pkgconfig/" - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) - - # Autoconf compatibility variables to use the same script source. diff --git a/PDAL-1.2.0+git.1456409216.0884085.tar.xz b/PDAL-1.2.0+git.1456409216.0884085.tar.xz deleted file mode 100644 index fb76d7a..0000000 --- a/PDAL-1.2.0+git.1456409216.0884085.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84af9ab7646d51a9d369f50284d08bb01d46d4712a87c77bf7c9987d534f5008 -size 34604316 diff --git a/PDAL-1.2.0.tar.xz b/PDAL-1.2.0.tar.xz new file mode 100644 index 0000000..894790e --- /dev/null +++ b/PDAL-1.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7fda8216068f7995942602763dcb510d3ddce8656aba7eb2a96deab9532d080 +size 51232440 diff --git a/PDAL.changes b/PDAL.changes index 5a2546e..acb14f1 100644 --- a/PDAL.changes +++ b/PDAL.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Apr 24 14:02:39 UTC 2016 - bruno@ioda-net.ch + +- Update to version 1.2.0 + see https://github.com/PDAL/PDAL/releases/tag/1.2.0/Changelog +- Fix missing Provide lowercase name +- Remove 01.patch merged upstream + ------------------------------------------------------------------- Thu Feb 25 14:53:51 UTC 2016 - bruno@ioda-net.ch diff --git a/PDAL.spec b/PDAL.spec index d035092..53736bf 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -1,8 +1,8 @@ # # spec file for package PDAL # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2014 Friedmann Bruno, Ioda-Net Sàrl, Charmoille, Switzerland. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 Friedmann Bruno, Ioda-Net Sàrl, Charmoille, Switzerland. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,17 @@ # #@TODO: plugins PCL LASZIP P2G -# python breathe -# +# python breathe for doc +# python3 # Ask upstream to clarify seems sofull_version is build version -%define soname 1 -%define sovers 1 -%define sofull_version 2.0.0 +%define soname 2 +%define sovers 2 +%define sofull_version 3.0.0 +%define lname pdal Name: PDAL -Version: 1.2.0+git.1456409216.0884085 +Version: 1.2.0 Release: 0 Summary: Point Data Abstraction Library. GDAL for point cloud data #@todo verify with upstream if not BSD-3 @@ -35,8 +36,8 @@ Group: Productivity/Graphics/CAD Url: http://www.pdal.io/ # We use git master on upstream recommandation until next March 2016 release # use osc service dr -Source: http://download.osgeo.org/pdal/%{name}-%{version}.tar.xz -Patch0: 01.patch +Source: %{name}-%{version}.tar.xz +#Source: http://download.osgeo.org/pdal/%%{name}-%%{version}-src.tar.bz2 # Override the problem of libpsl5 in tumbleweed %if 0%{?suse_version} >= 1330 BuildRequires: libpsl5 @@ -69,18 +70,18 @@ BuildRequires: libpq5 >= 9.1 # BuildRequires: pointcloud-devel # BuildRequires: libpqxx-devel BuildRequires: python-Sphinx -# Doesn't exist on obs BuildRequires: python-breathe +# For doc but only in TW +#BuildRequires: python-sphinxcontrib-breathe BuildRequires: python-devel BuildRequires: python-docutils BuildRequires: python-numpy-devel BuildRequires: python3-Sphinx -# Doesn't exist on obs BuildRequires: python-breathe +# Doesn't exist on obs BuildRequires: python3-breathe BuildRequires: python3-devel BuildRequires: python3-docutils BuildRequires: python3-numpy-devel BuildRequires: zlib-devel -Provides: libPDAL = %{version} -Requires: libpdal%{soname} = %{version} +Requires: lib%{name}%{soname} = %{version} Recommends: bash-completion BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -105,7 +106,8 @@ https://www.pdal.io This package provides tools & utilities using PDAL library libpdal %package -n lib%{name}%{soname} -Summary: Point Data Abstraction Library. GDAL for point cloud data +Provides: lib%{lname}%{soname} +Summary: Point Data Abstraction Library. GDAL for point cloud data %description -n lib%{name}%{soname} PDAL is a C++ BSD library for translating and manipulating point cloud data. @@ -143,6 +145,7 @@ Requires: boost-devel Requires: cmake Requires: zlib-devel Provides: lib%{name}%{soname}-devel = %{version} +Provides: lib%{lname}%{soname}-devel = %{version} Provides: lib%{name}-devel %description -n %{name}-devel @@ -153,18 +156,18 @@ develop applications using PDAL. Summary: Documentation, examples and demos for PDAL Group: Productivity/Graphics/CAD Requires: %{name} = %{version} +BuildArch: noarch %description -n %{name}-doc This package provides the documentation and sources of examples and data demos of PDAL algorithms. %prep -%setup -q -n PDAL-%{version} -%patch0 -p1 +%setup -q -n %{name}-%{version} #Cleanup spurious perms in documentation find ./doc/ -type f -exec chmod -v 0644 {} \; - +find ./doc/ -type f -iname "*.orig" -delete %build %if 0%{?suse_version} == 1310 @@ -186,10 +189,12 @@ export CXXFLAGS="%{optflags} -fPIE -pie" -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DCMAKE_SKIP_RPAH=ON \ -DENABLE_CTEST=ON \ + -DWITH_COMPLETION=ON \ + -DWITH_APPS=ON \ -DWITH_TESTS=ON \ -DWITH_ICONV=ON \ -DBUILD_PLUGIN_PCL=OFF \ - -DWITH_LASZIP=OFF \ + -DWITH_LASZIP=ON \ -DWITH_GEOTIFF=ON \ -DGEOTIFF_INCLUDE_DIR=%{_includedir}/libgeotiff \ -DWITH_LAZPERF=OFF \ @@ -214,9 +219,9 @@ export CXXFLAGS="%{optflags} -fPIE -pie" make VERBOSE=1 %{?_smp_mflags} # Make documentation once fixed upstream -# cd doc # make doxygen html man pdf +# Make the python part %check make %{?_smp_mflags} test @@ -225,14 +230,17 @@ make %{?_smp_mflags} test pushd build make DESTDIR=%{buildroot} install %{?_smp_mflags} popd +# Fix location of bash-completion script to be system wide mkdir -p %{buildroot}%{_datadir}/bash_completion/completions/ -cp -v scripts/bash-completion/pdal %{buildroot}%{_datadir}/bash_completion/completions/pdal +mv -v %{buildroot}%{_prefix}%{_sysconfdir}/bash_completion.d/pdal %{buildroot}%{_datadir}/bash_completion/completions/pdal +rm -rfv %{buildroot}%{_prefix}%{_sysconfdir} #No .la lib find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print %if 0%{?suse_version} %fdupes %{buildroot} +%fdupes doc %endif %post -n lib%{name}%{soname} -p /sbin/ldconfig @@ -252,7 +260,6 @@ find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print %{_libdir}/libpdal_base.so.%{sofull_version} %{_libdir}/libpdal_plang.so.%{sofull_version} # Plugins exist with their -%{_libdir}/libpdal_plugin_filter_attribute.so.%{sofull_version} %{_libdir}/libpdal_plugin_filter_predicate.so.%{sofull_version} %{_libdir}/libpdal_plugin_filter_programmable.so.%{sofull_version} %{_libdir}/libpdal_plugin_reader_sqlite.so.%{sofull_version} @@ -270,8 +277,6 @@ find %{buildroot} -type f -name "*.la" -o -name "*.a" -delete -print %{_libdir}/libpdal_base.so %{_libdir}/libpdal_plang.so.%{sovers} %{_libdir}/libpdal_plang.so -%{_libdir}/libpdal_plugin_filter_attribute.so -%{_libdir}/libpdal_plugin_filter_attribute.so.%{sovers} %{_libdir}/libpdal_plugin_filter_predicate.so %{_libdir}/libpdal_plugin_filter_predicate.so.%{sovers} %{_libdir}/libpdal_plugin_filter_programmable.so diff --git a/_service b/_service index 9dac69d..74fb193 100644 --- a/_service +++ b/_service @@ -3,11 +3,11 @@ git://github.com/PDAL/pdal.git git .git + + 1.2.0 PDAL enable @@ -19,4 +19,3 @@ PDAL - diff --git a/_servicedata b/_servicedata index bf3c0fc..d74af4a 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/PDAL/pdal.git - 0884085967888a7cd344604c35c9666351243c62 \ No newline at end of file + c93c7c7f361fa6098528f865e3b5a38043b968d4 \ No newline at end of file