From 33db99b50fa6a775617d901fbf54e85dede992d3 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Tue, 9 May 2023 13:31:05 -0600
Subject: [PATCH 1/2] Add
 var/spack/repos/jcsda-emc-bundles/packages/jedi-neptune-env

---
 .../packages/jedi-neptune-env/package.py      | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 var/spack/repos/jcsda-emc-bundles/packages/jedi-neptune-env/package.py

diff --git a/var/spack/repos/jcsda-emc-bundles/packages/jedi-neptune-env/package.py b/var/spack/repos/jcsda-emc-bundles/packages/jedi-neptune-env/package.py
new file mode 100644
index 00000000000000..337aedf157eb6d
--- /dev/null
+++ b/var/spack/repos/jcsda-emc-bundles/packages/jedi-neptune-env/package.py
@@ -0,0 +1,27 @@
+# Copyright 2013-2022 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+from spack.package import *
+
+
+class JediNeptuneEnv(BundlePackage):
+    """Development environment for neptune-bundle"""
+
+    # Fake URL
+    homepage = "https://github.com/JCSDA-internal/neptune-bundle"
+    git = "https://github.com/JCSDA-internal/neptune-bundle.git"
+
+    maintainers("climbfuji", "areineke")
+
+    version("1.0.0")
+
+    depends_on("jedi-base-env", type="run")
+
+    depends_on("libyaml", type="run")
+    depends_on("p4est", type="run")
+    depends_on("w3emc", type="run")
+    depends_on("esmf~debug", type="run")
+
+    # There is no need for install() since there is no code.

From 632fa04251cf499d3a26d413602836330a8fd92d Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@icloud.com>
Date: Thu, 11 May 2023 16:22:53 -0600
Subject: [PATCH 2/2] Remove ~debug variants in jedi-neptune-env and
 jedi-ufs-env

---
 .../jcsda-emc-bundles/packages/jedi-neptune-env/package.py   | 2 +-
 .../repos/jcsda-emc-bundles/packages/jedi-ufs-env/package.py | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/var/spack/repos/jcsda-emc-bundles/packages/jedi-neptune-env/package.py b/var/spack/repos/jcsda-emc-bundles/packages/jedi-neptune-env/package.py
index 337aedf157eb6d..0645087e1d0196 100644
--- a/var/spack/repos/jcsda-emc-bundles/packages/jedi-neptune-env/package.py
+++ b/var/spack/repos/jcsda-emc-bundles/packages/jedi-neptune-env/package.py
@@ -22,6 +22,6 @@ class JediNeptuneEnv(BundlePackage):
     depends_on("libyaml", type="run")
     depends_on("p4est", type="run")
     depends_on("w3emc", type="run")
-    depends_on("esmf~debug", type="run")
+    depends_on("esmf", type="run")
 
     # There is no need for install() since there is no code.
diff --git a/var/spack/repos/jcsda-emc-bundles/packages/jedi-ufs-env/package.py b/var/spack/repos/jcsda-emc-bundles/packages/jedi-ufs-env/package.py
index 8a276cb4768346..99df7ff38f286e 100644
--- a/var/spack/repos/jcsda-emc-bundles/packages/jedi-ufs-env/package.py
+++ b/var/spack/repos/jcsda-emc-bundles/packages/jedi-ufs-env/package.py
@@ -27,8 +27,7 @@ class JediUfsEnv(BundlePackage):
     depends_on("sigio", type="run")
     depends_on("w3emc", type="run")
     depends_on("w3nco", type="run")
-
-    depends_on("esmf~debug", type="run")
-    depends_on("mapl~debug", type="run")
+    depends_on("esmf", type="run")
+    depends_on("mapl", type="run")
 
     # There is no need for install() since there is no code.