From d9d085da108c7aa08e698e07f4114dc55333c9c9 Mon Sep 17 00:00:00 2001 From: Chris Marsh Date: Fri, 24 May 2024 01:45:20 -0600 Subject: Fix patch being applied @7 which causes an error (#44367) --- var/spack/repos/builtin/packages/proj/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/proj/package.py b/var/spack/repos/builtin/packages/proj/package.py index 9fe7774e48..0c85eb04b0 100644 --- a/var/spack/repos/builtin/packages/proj/package.py +++ b/var/spack/repos/builtin/packages/proj/package.py @@ -92,7 +92,7 @@ class Proj(CMakePackage, AutotoolsPackage): # CMake 3.19 refactored the FindTiff module interface, update older proj's # to be compatible with this "new" interface # patch replaces the TIFF_LIBRARY variable (no longer used) with TIFF_LIBRARIES - patch("proj-8.1-cmake-3.29-new-tiff-interface.patch", when="+tiff @7:9.1.0 ^cmake@3.19:") + patch("proj-8.1-cmake-3.29-new-tiff-interface.patch", when="+tiff @8:9.1.0 ^cmake@3.19:") patch("proj.cmakelists.5.0.patch", when="@5.0") patch("proj.cmakelists.5.1.patch", when="@5.1:5.2") conflicts("cmake@3.19:", when="@:7") -- cgit v1.2.3-70-g09d2