From 34a31ff61c20f27b5cc7db760b5d7726a60067ae Mon Sep 17 00:00:00 2001
From: Alex Richert <alexander.richert@noaa.gov>
Date: Fri, 24 Oct 2025 09:45:10 -0700
Subject: [PATCH 1/3] update repos/builtin/ pointer for testing
 (AlexanderRichert-NOAA)

---
 .gitmodules   | 4 ++--
 repos/builtin | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 068339c16..222bd41aa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,5 +10,5 @@
   branch = v1.3.0
 [submodule "repos/builtin"]
   path = repos/builtin
-  url = https://github.com/jcsda/spack-packages
-  branch = spack-stack-dev
+  url = https://github.com/AlexanderRichert-NOAA/spack-packages
+  branch = misc_nceplibs_oct25
diff --git a/repos/builtin b/repos/builtin
index 55263acb2..979f90a1e 160000
--- a/repos/builtin
+++ b/repos/builtin
@@ -1 +1 @@
-Subproject commit 55263acb26d3f017d28b4f5619f2ec09b058bb53
+Subproject commit 979f90a1eff499cf48ab025a66e438608e2681b6

From 0b95cd2f1d5ccabef6d0b1dc8f503ff736622fbc Mon Sep 17 00:00:00 2001
From: Alex Richert <alexander.richert@noaa.gov>
Date: Fri, 24 Oct 2025 09:53:59 -0700
Subject: [PATCH 2/3] defaults to scotch@7.0.10, prod-util@2.1.2, g2tmpl@1.17.0

---
 configs/common/packages.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
index a4da216bd..6b2e30b75 100644
--- a/configs/common/packages.yaml
+++ b/configs/common/packages.yaml
@@ -122,7 +122,7 @@ packages:
       - '@2.1.0'
     g2tmpl:
       require:
-      - '@1.13.0'
+      - '@1.17.0'
     # This version builds with Intel oneAPI compilers, newer/older versions don't
     gdal:
       require:
@@ -278,7 +278,7 @@ packages:
       - +pic
     prod-util:
       require:
-      - '@2.1.1'
+      - '@2.1.2'
     proj:
       require:
       - ~tiff
@@ -386,8 +386,8 @@ packages:
       - '@5'
     scotch:
       require:
-      - '@7.0.4'
-      - +mpi+metis~shared~threads~mpi_thread+noarch+esmumps
+      - '@7.0.10'
+      - +mpi+metis~shared~threads~mpi_thread+noarch+esmumps+fortran determinism=FIXED_SEED
     sfcio:
       require:
       - '@1.4.2'

From e3e6e3a98eb7015e3325106b0eda56a1ce63f6a0 Mon Sep 17 00:00:00 2001
From: Alex Richert <alexander.richert@noaa.gov>
Date: Mon, 27 Oct 2025 09:13:52 -0700
Subject: [PATCH 3/3] revert/update spack repo submodule

---
 .gitmodules   | 4 ++--
 repos/builtin | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 222bd41aa..068339c16 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,5 +10,5 @@
   branch = v1.3.0
 [submodule "repos/builtin"]
   path = repos/builtin
-  url = https://github.com/AlexanderRichert-NOAA/spack-packages
-  branch = misc_nceplibs_oct25
+  url = https://github.com/jcsda/spack-packages
+  branch = spack-stack-dev
diff --git a/repos/builtin b/repos/builtin
index 979f90a1e..3ad59cbb5 160000
--- a/repos/builtin
+++ b/repos/builtin
@@ -1 +1 @@
-Subproject commit 979f90a1eff499cf48ab025a66e438608e2681b6
+Subproject commit 3ad59cbb58e7973b5d8e8f2091896ee8dc70ab89