From 3cc2d916380adbeea94ac9a9511e3b1e03cf0278 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Tue, 16 Feb 2021 16:25:17 +0100 Subject: [PATCH] cdo: update PROJ dependency constraints (#21700) --- var/spack/repos/builtin/packages/cdo/package.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/cdo/package.py b/var/spack/repos/builtin/packages/cdo/package.py index 7a98f81112..16f2b84a0a 100644 --- a/var/spack/repos/builtin/packages/cdo/package.py +++ b/var/spack/repos/builtin/packages/cdo/package.py @@ -20,8 +20,7 @@ class Cdo(AutotoolsPackage): version('1.9.10', sha256='cc39c89bbb481d7b3945a06c56a8492047235f46ac363c4f0d980fccdde6677e', url='https://code.mpimet.mpg.de/attachments/download/24638/cdo-1.9.10.tar.gz') version('1.9.9', sha256='959b5b58f495d521a7fd1daa84644888ec87d6a0df43f22ad950d17aee5ba98d', url='https://code.mpimet.mpg.de/attachments/download/23323/cdo-1.9.9.tar.gz') version('1.9.8', sha256='f2660ac6f8bf3fa071cf2a3a196b3ec75ad007deb3a782455e80f28680c5252a', url='https://code.mpimet.mpg.de/attachments/download/20826/cdo-1.9.8.tar.gz') - version('1.9.7.1', sha256='3771952e065bcf935d43e492707370ed2a0ecb59a06bea24f9ab69d77943962c', - url='https://code.mpimet.mpg.de/attachments/download/20124/cdo-1.9.7.1.tar.gz') + version('1.9.7.1', sha256='3771952e065bcf935d43e492707370ed2a0ecb59a06bea24f9ab69d77943962c', url='https://code.mpimet.mpg.de/attachments/download/20124/cdo-1.9.7.1.tar.gz') version('1.9.6', sha256='b31474c94548d21393758caa33f35cf7f423d5dfc84562ad80a2bdcb725b5585', url='https://code.mpimet.mpg.de/attachments/download/19299/cdo-1.9.6.tar.gz') version('1.9.5', sha256='48ed65cc5b436753c8e7f9eadd8aa97376698ce230ceafed2a4350a5b1a27148', url='https://code.mpimet.mpg.de/attachments/download/18264/cdo-1.9.5.tar.gz') version('1.9.4', sha256='3d1c0fd3f7d38c5d3d88139ca1546c9d24e1b1ff752a794a4194dfe624695def', url='https://code.mpimet.mpg.de/attachments/download/17374/cdo-1.9.4.tar.gz') @@ -68,7 +67,9 @@ class Cdo(AutotoolsPackage): depends_on('udunits', when='+udunits2') depends_on('libxml2', when='+libxml2') - depends_on('proj@:5', when='+proj') + depends_on('proj@:5', when='@:1.9.6+proj') + depends_on('proj@:7', when='@1.9.7+proj') + depends_on('proj@5:', when='@1.9.8:+proj') depends_on('curl', when='+curl') depends_on('fftw@3:', when='+fftw3') depends_on('magics', when='+magics')