From 1410f4840b29466ddc1ef1c4463c03ad10c7d30b049efd7629a783056ce6cf73 Mon Sep 17 00:00:00 2001 From: Bruno Friedmann Date: Fri, 1 Mar 2024 08:09:26 +0000 Subject: [PATCH 1/2] Accepting request 1153752 from home:dimstar:Factory - BuildRequire proj-devel instead of the long deprecated name libproj-devel. OBS-URL: https://build.opensuse.org/request/show/1153752 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/PDAL?expand=0&rev=36 --- PDAL.changes | 6 ++++++ PDAL.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/PDAL.changes b/PDAL.changes index 1bae9b6..1d4e9a3 100644 --- a/PDAL.changes +++ b/PDAL.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 1 07:33:55 UTC 2024 - Dominique Leuenberger + +- BuildRequire proj-devel instead of the long deprecated name + libproj-devel. + ------------------------------------------------------------------- Tue Oct 3 07:29:11 UTC 2023 - Guillaume GARDET diff --git a/PDAL.spec b/PDAL.spec index b6885a6..e11485c 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -1,7 +1,7 @@ # # spec file for package PDAL # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2021 Friedmann Bruno, Ioda-Net Sàrl, Charmoille, Switzerland. # # All modifications and additions to the file contributed by third parties @@ -58,7 +58,7 @@ BuildRequires: libboost_program_options-devel BuildRequires: libgdal-devel BuildRequires: libgeos-devel BuildRequires: libopenssl-devel >= 1.1 -BuildRequires: libproj-devel +BuildRequires: proj-devel # Needed to have proj.db for tests BuildRequires: libpsl5 BuildRequires: libspatialindex-devel From a9a1ae5013906e0b0bb8495b05f834fa16040c87fbf56ac87b38b084d2814b34 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 1 Mar 2024 12:52:49 +0000 Subject: [PATCH 2/2] Accepting request 1153885 from home:pluskalm:branches:Application:Geo - Fix building on Leap OBS-URL: https://build.opensuse.org/request/show/1153885 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/PDAL?expand=0&rev=37 --- PDAL.changes | 5 +++++ PDAL.spec | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/PDAL.changes b/PDAL.changes index 1d4e9a3..cfb3182 100644 --- a/PDAL.changes +++ b/PDAL.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 1 10:53:46 UTC 2024 - Martin Pluskal + +- Fix building on Leap + ------------------------------------------------------------------- Fri Mar 1 07:33:55 UTC 2024 - Dominique Leuenberger diff --git a/PDAL.spec b/PDAL.spec index e11485c..e17cc30 100644 --- a/PDAL.spec +++ b/PDAL.spec @@ -45,7 +45,6 @@ BuildRequires: curl-devel BuildRequires: eigen3-devel BuildRequires: fdupes BuildRequires: freeglut-devel -BuildRequires: gcc-c++ BuildRequires: gdal BuildRequires: geotiff-devel BuildRequires: gtest @@ -95,6 +94,11 @@ Provides: bundled(PoissonRecon) Provides: bundled(nanoflann) # https://github.com/nlohmann/json bundled in vendor/nlohmann Provides: bundled(nlohmann) +%if 0%{?suse_version} < 1550 +BuildRequires: gcc12-c++ +%else +BuildRequires: gcc-c++ >= 11 +%endif %description PDAL is a C++ BSD library for translating and manipulating point cloud data. @@ -179,6 +183,9 @@ find ./doc/ -type f -iname "*.ai" -delete # boo#1194109 and upstream https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102059 %define _lto_cflags %{nil} %endif +%if 0%{?suse_version} < 1550 +export CXX=g++-12 +%endif %cmake \ -DCMAKE_VERBOSE_MAKEFILE=ON \