From f0a8786fbc45bcd313a7b04357518051283bf832af3e8a98eb66edec5b9cd18e Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 21 Feb 2019 08:58:28 +0000 Subject: [PATCH] Accepting request 677636 from home:bruno_friedmann:branches:Application:Geo - Update to 3.2.9 version + Decompression bug for PRDF 8 or 10 when the scanner channel and the NIR field are populated. + 3.2.8 **NOTE: The version number is 3.2.8 to be brought in line with the patch version number present in LAStools, which had been incremented without being kept in sync with the laszip.org version. We regret the error. bug fixes since 3.2.2: + 7 November 2018 upped to 3.2 r8 for identical legacy and extended flags check + 20 October 2018 upped to 3.2 r7 for rare bug in LASinterval::merge_intervals() + 5 October 2018 upped to 3.2 r6 for corrected 'is_empty' return value + 28 September 2018 upped to 3.2 r5 for fix in extended classification writing + 3.2.2 + A version number was not properly incremented to 3.2.1, necessitating a new release to eliminate confusion. + 3.2.1 + Library SOVERSIONing for libtool to 8.0.0 #36 + Update NEWS and ChangeLog + Library version inadvertently had major version in name (only relevant on windows) + Now building on AppVeyor and Travis + 3.2.0 + Fix install of laszip_api_version.h #30 + Add V4 read methods - Packaging + minimal spec-cleaner (date/url) + trailing space in changes OBS-URL: https://build.opensuse.org/request/show/677636 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/laszip?expand=0&rev=8 --- 0bf1c60.patch | 27 ----------------------- laszip-src-3.1.1.tar.gz | 3 --- laszip-src-3.1.1.tar.gz.md5 | 1 - laszip-src-3.2.9.tar.gz | 3 +++ laszip-src-3.2.9.tar.gz.md5 | 1 + laszip.changes | 44 +++++++++++++++++++++++++++++++++---- laszip.spec | 17 ++++++-------- 7 files changed, 51 insertions(+), 45 deletions(-) delete mode 100644 0bf1c60.patch delete mode 100644 laszip-src-3.1.1.tar.gz delete mode 100644 laszip-src-3.1.1.tar.gz.md5 create mode 100644 laszip-src-3.2.9.tar.gz create mode 100644 laszip-src-3.2.9.tar.gz.md5 diff --git a/0bf1c60.patch b/0bf1c60.patch deleted file mode 100644 index 4e08b54..0000000 --- a/0bf1c60.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d781bf50da33d1789cce3a17777d91e279d0a289 Mon Sep 17 00:00:00 2001 -From: Pete Gadomski -Date: Thu, 19 Oct 2017 17:06:55 +0000 -Subject: [PATCH] Load .so dll on non-apple - -This platform checking is...dubious...but this was the Minimum Required -To Work on a debian system. ---- - dll/laszip_api.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/dll/laszip_api.c b/dll/laszip_api.c -index 007e080..83c09bf 100644 ---- a/dll/laszip_api.c -+++ b/dll/laszip_api.c -@@ -958,8 +958,10 @@ laszip_I32 laszip_load_dll() - // Load DLL file - #ifdef _WIN32 - laszip_HINSTANCE = LoadLibrary(TEXT("LASzip.dll")); --#else -+#elif __APPLE__ - laszip_HINSTANCE = LoadLibrary("liblaszip.dylib", RTLD_NOW); -+#else -+ laszip_HINSTANCE = LoadLibrary("liblaszip.so", RTLD_NOW); - #endif - if (laszip_HINSTANCE == NULL) { - return 1; diff --git a/laszip-src-3.1.1.tar.gz b/laszip-src-3.1.1.tar.gz deleted file mode 100644 index 19eec85..0000000 --- a/laszip-src-3.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53307e39072318b0175787cf0ed445de12efe0d6b4ccae66829a9a475f3aca19 -size 190735 diff --git a/laszip-src-3.1.1.tar.gz.md5 b/laszip-src-3.1.1.tar.gz.md5 deleted file mode 100644 index d483a30..0000000 --- a/laszip-src-3.1.1.tar.gz.md5 +++ /dev/null @@ -1 +0,0 @@ -MD5 (laszip-src-3.1.1.tar.gz) = d31fc8b1fc070336a1825beb32595153 diff --git a/laszip-src-3.2.9.tar.gz b/laszip-src-3.2.9.tar.gz new file mode 100644 index 0000000..8413188 --- /dev/null +++ b/laszip-src-3.2.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1cc9ea5adfcad43b9c8afbaff20bcd573a85c90dd83d5c8e17e4ff8d8d4548e +size 218578 diff --git a/laszip-src-3.2.9.tar.gz.md5 b/laszip-src-3.2.9.tar.gz.md5 new file mode 100644 index 0000000..fce3bbe --- /dev/null +++ b/laszip-src-3.2.9.tar.gz.md5 @@ -0,0 +1 @@ +MD5 (laszip-src-3.2.9.tar.gz) = 178a79737788e099b70a70c10c61b01e diff --git a/laszip.changes b/laszip.changes index b1a4264..1b7d44b 100644 --- a/laszip.changes +++ b/laszip.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Tue Feb 19 06:51:01 UTC 2019 - Bruno Friedmann + +- Update to 3.2.9 version + + Decompression bug for PRDF 8 or 10 when the scanner channel + and the NIR field are populated. + + 3.2.8 **NOTE: The version number is 3.2.8 to be brought in line + with the patch version number present in LAStools, which had + been incremented without being kept in sync with the laszip.org + version. We regret the error. + bug fixes since 3.2.2: + + 7 November 2018 upped to 3.2 r8 for identical legacy and + extended flags check + + 20 October 2018 upped to 3.2 r7 for rare bug in + LASinterval::merge_intervals() + + 5 October 2018 upped to 3.2 r6 for corrected 'is_empty' + return value + + 28 September 2018 upped to 3.2 r5 for fix in extended + classification writing + + 3.2.2 + + A version number was not properly incremented to 3.2.1, + necessitating a new release to eliminate confusion. + + 3.2.1 + + Library SOVERSIONing for libtool to 8.0.0 #36 + + Update NEWS and ChangeLog + + Library version inadvertently had major version in name + (only relevant on windows) + + Now building on AppVeyor and Travis + + 3.2.0 + + Fix install of laszip_api_version.h #30 + + Add V4 read methods +- Packaging + + minimal spec-cleaner (date/url) + trailing space in changes + + remove merged upstream 0bf1c60.patch + + adjust path of laszip_api_version.h to /usr/include/laszip + ------------------------------------------------------------------- Wed Jan 24 07:15:06 UTC 2018 - bruno@ioda-net.ch @@ -11,7 +47,7 @@ Wed Jan 24 07:15:06 UTC 2018 - bruno@ioda-net.ch + move to cmake build following upstream + Added 0bf1c60.patch fixing .so loading -- Update to 3.1.1 version. +- Update to 3.1.1 version. + sover change from 6 to 3 + 3.1.0 introduce support for LAZ 1.4 + New "dll" API replace previous API @@ -34,7 +70,7 @@ Thu Feb 12 20:37:23 UTC 2015 - mpluskal@suse.com * remove dependency on own lib (at it is generated automatically) * do not use excessive %defines as this is not necessary * move test to separate package - * remove %check section as it is not checking anything, just + * remove %check section as it is not checking anything, just building test. - Use autoreconf to prevent random build failures @@ -44,11 +80,11 @@ Fri Aug 22 14:29:18 UTC 2014 - bruno@ioda-net.ch - Added security compil flag for >13.1 - spec clean - rename package to without caps -- make lib using share lib policy +- make lib using share lib policy ------------------------------------------------------------------- Thu Aug 21 14:00:54 UTC 2014 - bruno@ioda-net.ch - First packaging for obs, LASzip is needed to have full support - of compressed las into other software + of compressed las into other software diff --git a/laszip.spec b/laszip.spec index 67ac5ad..56f76af 100644 --- a/laszip.spec +++ b/laszip.spec @@ -1,8 +1,8 @@ # # spec file for package laszip # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2014 Ioda-Net Sàrl, Charmoille, Switzerland. Bruno Friedmann (tigerfoot) +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 Bruno Friedmann, 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 @@ -13,24 +13,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # # -%define sover 3 +%define sover 8 Name: laszip -Version: 3.1.1 +Version: 3.2.9 Release: 0 Summary: Compression library supporting ASPRS LAS format data -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Url: http://www.laszip.org/ Source0: https://github.com/LASzip/LASzip/releases/download/%{version}/laszip-src-%{version}.tar.gz Source1: https://github.com/LASzip/LASzip/releases/download/%{version}/laszip-src-%{version}.tar.gz.md5 -# Upstream [PATCH] Load .so dll on non-apple -Patch0: https://github.com/LASzip/LASzip/commit/0bf1c60.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -82,7 +80,6 @@ data. %prep %setup -q -n laszip-src-%{version} -%patch0 -p1 %build # laszip need dlopen,dlsym,dlclose @@ -114,8 +111,8 @@ rm -rf %{buildroot}/usr/lib/debug/ %files devel %defattr(-,root,root) %doc ChangeLog AUTHORS COPYING -%{_includedir}/%{name}_api_version.h %dir %{_includedir}/%{name} +%{_includedir}/%{name}/%{name}_api_version.h %{_includedir}/%{name}/%{name}_api.h %{_libdir}/lib%{name}.so %{_libdir}/lib%{name}_api.so