From e8c2a1085a3f4d5ff82d907b6036a8001f1dd44b Mon Sep 17 00:00:00 2001 From: Olivier Cessenat Date: Fri, 19 Feb 2021 15:57:35 +0100 Subject: proj: adding recent DATA and recent release up to 7.2.1 (#21804) --- var/spack/repos/builtin/packages/proj/package.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py index 33cb67d692..a0a8f336c4 100644 --- a/var/spack/repos/builtin/packages/proj/package.py +++ b/var/spack/repos/builtin/packages/proj/package.py @@ -13,13 +13,15 @@ class Proj(AutotoolsPackage): transformations.""" homepage = "https://proj.org/" - url = "https://download.osgeo.org/proj/proj-7.1.0.tar.gz" + url = "https://download.osgeo.org/proj/proj-7.2.1.tar.gz" maintainers = ['adamjstewart'] # Version 6 removes projects.h, while version 7 removes proj_api.h. # Many packages that depend on proj do not yet support the newer API. # See https://github.com/OSGeo/PROJ/wiki/proj.h-adoption-status + version('7.2.1', sha256='b384f42e5fb9c6d01fe5fa4d31da2e91329668863a684f97be5d4760dbbf0a14') + version('7.2.0', sha256='2957798e5fe295ff96a2af1889d0428e486363d210889422f76dd744f7885763') version('7.1.0', sha256='876151e2279346f6bdbc63bd59790b48733496a957bccd5e51b640fdd26eaa8d') version('7.0.1', sha256='a7026d39c9c80d51565cfc4b33d22631c11e491004e19020b3ff5a0791e1779f') version('7.0.0', sha256='ee0e14c1bd2f9429b1a28999240304c0342ed739ebaea3d4ff44c585b1097be8') @@ -42,12 +44,26 @@ class Proj(AutotoolsPackage): # https://github.com/OSGeo/PROJ#distribution-files-and-format # https://github.com/OSGeo/PROJ-data + resource( + name='proj-data', + url='https://download.osgeo.org/proj/proj-data-1.4.tar.gz', + sha256='76960d34d635aa127058ce654d89ea0eff91e2e4f2036482e677af5a88669b08', + placement='nad', + when='@7.2.1:', + ) + resource( + name='proj-data', + url='https://download.osgeo.org/proj/proj-data-1.3.tar.gz', + sha256='0faa3e5ca6d816c907868c1ab2523668ccad27c6c4af9c7b00df9e4c3eb84398', + placement='nad', + when='@7.2.0', + ) resource( name='proj-data', url='https://download.osgeo.org/proj/proj-data-1.1.tar.gz', sha256='df7c57e60f9e1d5bcc724f1def71d2a7cd33bd83c28f4b4bb71dbb2d8849c84a', placement='nad', - when='@7:', + when='@7:7.1', ) # https://github.com/OSGeo/PROJ#distribution-files-and-format -- cgit v1.2.3-70-g09d2