From 32f7088d5c405a569abde5521a0a3cffc6355a9c4c6fd1ef94b711a2af2af7ed Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 26 Apr 2024 13:46:16 +0000 Subject: [PATCH] Accepting request 1170271 from home:badshah400:branches:Application:Geo > Update to version 9.4.0. > Update data to 1.17. > Pass CMAKE_CXX_STANDARD=14 for builds on openSUSE >= 1650 (Tumbleweed) for compatibility with gtest >= 1.14. > Enforce gcc version 9 for openSUSE < 1650 to support -Wextra-semi compile time option. OBS-URL: https://build.opensuse.org/request/show/1170271 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/proj?expand=0&rev=82 --- proj-9.3.1.tar.gz | 3 --- proj-9.4.0.tar.gz | 3 +++ proj-data-1.16.tar.gz | 3 --- proj-data-1.17.tar.gz | 3 +++ proj.changes | 62 +++++++++++++++++++++++++++++++++++++++++++ proj.spec | 20 +++++++++----- 6 files changed, 82 insertions(+), 12 deletions(-) delete mode 100644 proj-9.3.1.tar.gz create mode 100644 proj-9.4.0.tar.gz delete mode 100644 proj-data-1.16.tar.gz create mode 100644 proj-data-1.17.tar.gz diff --git a/proj-9.3.1.tar.gz b/proj-9.3.1.tar.gz deleted file mode 100644 index 2636fb1..0000000 --- a/proj-9.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b0f919cb9e1f42f803a3e616c2b63a78e4d81ecfaed80978d570d3a5e29d10bc -size 5607136 diff --git a/proj-9.4.0.tar.gz b/proj-9.4.0.tar.gz new file mode 100644 index 0000000..75f75c3 --- /dev/null +++ b/proj-9.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3643b19b1622fe6b2e3113bdb623969f5117984b39f173b4e3fb19a8833bd216 +size 5652874 diff --git a/proj-data-1.16.tar.gz b/proj-data-1.16.tar.gz deleted file mode 100644 index 1a4c933..0000000 --- a/proj-data-1.16.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21a31840c86c23b9926bafebb847bacff8f88728779c3a9bd0f9b2edf8135a01 -size 728378993 diff --git a/proj-data-1.17.tar.gz b/proj-data-1.17.tar.gz new file mode 100644 index 0000000..b5637b0 --- /dev/null +++ b/proj-data-1.17.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a79017954c78f2b46e1619f723d2a7a573c466c15f0b4cd1e8bdefff9b2cab30 +size 730955623 diff --git a/proj.changes b/proj.changes index cfcaa20..1a2fe06 100644 --- a/proj.changes +++ b/proj.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Fri Apr 26 08:53:00 UTC 2024 - Atri Bhattacharya + +- Update to version 9.4.0: + * Add support for transformations involving coordinate epoch + changes (PointMotionOperation), specifically for Canadian + NAD83(CSRS)(gh#OSGeo/PROJ#3884) + * SSL_OPTIONS: set SSL options on Curl library + (gh#OSGeo/PROJ#3936) + * Add support for unity builds (gh#OSGeo/PROJ#3962) + * Added ability to install *.tif if present in data + (gh#OSGeo/PROJ#3970) + * createOperationsCompoundToGeog(): tune selection logic when + --grid-check known_available is specified (gh#OSGeo/PROJ#3990) + * Increase CMake minimum version from 3.9 to 3.16 + (gh#OSGeo/PROJ#3997) + * CMake: use FetchContent to get googletest-1.12.1 + (gh#OSGeo/PROJ#4006) + * CMake: Replace custom FindSqlite3 with FindSQLite3 built-in + (gh#OSGeo/PROJ#4007) + * tpeqd: use numerically stable formula for computing the + central angle from (phi_1, lam_1) to (phi_2, lam_2) + (gh#OSGeo/PROJ#4009) + * Move content of proj_experimental.h to proj.h + (gh#OSGeo/PROJ#4019) + * Add +proj=mod_krovak projection method for Modified Krovak + that applies to S-JTSK/05 in the Czech Republic + (gh#OSGeo/PROJ#4021) + * PROJString formatter optimizer: simplify pipelines doing + [Modified]Krovak (South West) <--> [Modified]Krovak (East + North) by just doing an axis swap (gh#OSGeo/PROJ#4034) + * +proj=gridshift: enhance to support grids referenced in + projected CRS, and with easting_offset/northing_offset + corrections (gh#OSGeo/PROJ#4038) + * Tune concatenated operation instanciation, reference CR2005 + geoid for Czechia and add (disabled by default) records for + Czechia S-JTSK/05 based transformations (gh#OSGeo/PROJ#4044) + * Database: update to EPSG v11.004 (gh#OSGeo/PROJ#4062) + * Bug fixes + - Fix missing symbols at link time for Windows target in + Visual Studio (gh#OSGeo/PROJ#3984) + - Improve error message in axisswap (gh#OSGeo/PROJ#3885 + - Avoid convergence errors in +proj=gridshift when using + biquadratic interpolation (gh#OSGeo/PROJ#3985) +- Update data to 1.17: + * New revisions of chartdatum norway v2023b + (gh#OSGeo/PROJ-data#112). + * Add fr_ign_RAC23.tif grid for France-Corsica NGF-IGN 1978 to + RGF93-2b (gh#OSGeo/PROJ-data#114). + * Update DVR90 to reflect recent EPSG-changes + (gh#OSGeo/PROJ-data#115). + * UI: show red polygon on 'mouse over' the list + (gh#OSGeo/PROJ-data#116). + * check_gtiff_grid.py: enhance to support grids referenced in + projected… (gh#OSGeo/PROJ-data#117). + * Add Czech geoid model CR-2005 (gh#OSGeo/PROJ-data#119). + * Add converter script (only) for Czechia table_yx_3_v1710.dat + grid (gh#OSGeo/PROJ-data#118). + * Add Portuguese geoid model GeodPT08 (gh#OSGeo/PROJ-data#120). +- Pass CMAKE_CXX_STANDARD=14 for builds on openSUSE >= 1650 + (Tumbleweed) for compatibility with gtest >= 1.14. + ------------------------------------------------------------------- Fri Mar 1 09:21:33 UTC 2024 - Martin Pluskal diff --git a/proj.spec b/proj.spec index ae0d89c..965ef70 100644 --- a/proj.spec +++ b/proj.spec @@ -16,18 +16,19 @@ # -%define data_version 1.16 +%define data_version 1.17 %define sover 25 %define libname lib%{name}%{sover} Name: proj -Version: 9.3.1 +Version: 9.4.0 Release: 0 Summary: Cartographic projection software License: MIT URL: https://proj.org/ -Source0: https://download.osgeo.org/proj/%{name}-%{version}.tar.gz -Source1: https://download.osgeo.org/%{name}/%{name}-data-%{data_version}.tar.gz -BuildRequires: cmake +# Download from GitHub, osgeo.org appears to be slow and flaky at the moment +Source0: https://github.com/OSGeo/PROJ/releases/download/%{version}/%{name}-%{version}.tar.gz +Source1: https://github.com/OSGeo/PROJ-data/releases/download/%{data_version}.0/%{name}-data-%{data_version}.tar.gz +BuildRequires: cmake >= 3.16 BuildRequires: gcc-c++ BuildRequires: pkgconfig >= 0.9.0 BuildRequires: sqlite3 @@ -115,7 +116,12 @@ License: MIT %autosetup %build -%cmake +# c++14 needed to build tests using gtest >= 1.14 +%cmake \ +%if 0%{?suse_version} >= 1650 + -DCMAKE_CXX_STANDARD=14 \ +%endif + %{nil} %cmake_build %install @@ -163,6 +169,8 @@ rm -rf %{buildroot}%{_datadir}/doc/${name} %{_datadir}/%{name}/ITRF2008 %{_datadir}/%{name}/ITRF2014 %{_datadir}/%{name}/README.DATA +%{_datadir}/%{name}/cz_cuzk_CR-2005.tif +%{_datadir}/%{name}/cz_cuzk_README.txt %{_datadir}/%{name}/deformation_model.schema.json %{_datadir}/%{name}/nad.lst %{_datadir}/%{name}/nad27