From 4c323e49bfa934d7103c2390ba3c313ef3d5bd93 Mon Sep 17 00:00:00 2001 From: Elizabeth Fischer Date: Mon, 4 May 2020 20:44:54 -0400 Subject: libspatialite: Update for proj@6 (#16173) * libspatialite * flake8 * Added proper version constrain * Update var/spack/repos/builtin/packages/libspatialite/package.py Co-Authored-By: Adam J. Stewart * Update var/spack/repos/builtin/packages/libspatialite/package.py Co-authored-by: Adam J. Stewart Co-authored-by: Elizabeth Fischer Co-authored-by: Adam J. Stewart --- .../repos/builtin/packages/libspatialite/package.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/libspatialite/package.py b/var/spack/repos/builtin/packages/libspatialite/package.py index 45fe1f6109..2eb9b9df2f 100644 --- a/var/spack/repos/builtin/packages/libspatialite/package.py +++ b/var/spack/repos/builtin/packages/libspatialite/package.py @@ -3,6 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) +import os from spack import * @@ -13,12 +14,25 @@ class Libspatialite(AutotoolsPackage): homepage = "http://www.gaia-gis.it" url = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-4.3.0a.tar.gz" - version('4.3.0a', sha256='88900030a4762904a7880273f292e5e8ca6b15b7c6c3fb88ffa9e67ee8a5a499') + # Must download manually from: + # https://www.gaia-gis.it/fossil/libspatialite/info/c7f67038bf06d98d + # For instructions on the file:// below.. + # https://github.com/spack/spack/issues/2489 + version('5.0.0.2.c7f67038bf', + sha256='f8100f71b769c7db066c6f938af6b00e920e4b90ac14c00a4f3ed7171565caab', + url="file://%s/SpatiaLite-c7f67038bf.tar.gz" % os.getcwd()) + + version('5.0.0-beta0', sha256='caacf5378a5cfab9b8e98bb361e2b592e714e21f5c152b795df80d0ab1da1c42') + version('4.3.0a', preferred=True, + sha256='88900030a4762904a7880273f292e5e8ca6b15b7c6c3fb88ffa9e67ee8a5a499') version('3.0.1', sha256='4983d6584069fd5ff0cfcccccee1015088dab2db177c0dc7050ce8306b68f8e6') depends_on('pkgconfig', type='build') depends_on('sqlite+rtree') - depends_on('proj@:5') + depends_on('proj@:5', when='@:4.999.999') + # PROJ.6 is OK w/ newer versions + # https://www.gaia-gis.it/fossil/libspatialite/wiki?name=PROJ.6 + depends_on('proj') depends_on('geos') depends_on('freexl') depends_on('iconv') -- cgit v1.2.3-60-g2f50