spack.yaml: Modified the other requirements to use the @git.TAG=VERSI…

…ON syntax

spack.yaml

@@ -11,22 +11,20 @@ spack:
     # the usual '@git.DATE' format.
     mom5:
       require:
-        - '@access-esm1.5'
+        - '@git.access-esm1.5_2024.05.24=access-esm1.5'
     cice4:
       require:
-        - '@git.2024.05.21'
+        - '@git.2024.05.21=access-esm1.5'
     um7:
       require:
-        - '@git.2024.05.21'
-
+        - '@git.2024.05.21=7.3'
     # Lower-level ACCESS-NRI dependencies
     gcom4:
       require:
-        - '@git.2024.05.28'
+        - '@git.2024.05.28=access-esm1.5'
     oasis3-mct:
       require:
-        - '@access-esm1.5'
-
+        - '@git.access-esm1.5_2024.05.24=access-esm1.5'
     # Other dependencies
     openmpi:
       require:
@@ -66,10 +64,10 @@ spack:
           access-esm1p5: '{name}/2024.05.0'
           cice4: '{name}/2024.05.21'
           um7: '{name}/2024.05.21'
-          mom5: '{name}/access-esm1.5'
+          mom5: '{name}/access-esm1.5_2024.05.24'
   config:
     install_tree:
-      root: "$spack/../restricted/ukmo/release"
-    source_cache: "$spack/../restricted/ukmo/source_cache"
+      root: $spack/../restricted/ukmo/release
+    source_cache: $spack/../restricted/ukmo/source_cache
     build_stage:
-      - "$TMPDIR/restricted/spack-stage"
+    - $TMPDIR/restricted/spack-stage