From 307009f93949e8cef6098cee938f5d26c108468e Mon Sep 17 00:00:00 2001
From: Gregory Becker <becker33@llnl.gov>
Date: Mon, 31 Mar 2025 17:27:41 -0700
Subject: [PATCH] revert bumping specfile version

Signed-off-by: Gregory Becker <becker33@llnl.gov>
---
 lib/spack/spack/environment/__init__.py    |  8 --------
 lib/spack/spack/environment/environment.py |  3 +--
 lib/spack/spack/spec.py                    | 14 ++++----------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/lib/spack/spack/environment/__init__.py b/lib/spack/spack/environment/__init__.py
index 0b36052f2b5..200f45e519d 100644
--- a/lib/spack/spack/environment/__init__.py
+++ b/lib/spack/spack/environment/__init__.py
@@ -543,14 +543,6 @@
         },
       }
     }
-
-Version 7
----------
-
-Version 7 does not change the lockfile format itself, but reflects
-a change in the specfile format. This adds the ``direct`` key for
-direct dependency edges. These are not relevant for environment
-behavior and merely require a change of specfile reader.
 """
 
 from .environment import (
diff --git a/lib/spack/spack/environment/environment.py b/lib/spack/spack/environment/environment.py
index 09fbf6daca6..02769f6eddf 100644
--- a/lib/spack/spack/environment/environment.py
+++ b/lib/spack/spack/environment/environment.py
@@ -129,7 +129,7 @@ def default_manifest_yaml():
 valid_environment_name_re = r"^\w[\w-]*$"
 
 #: version of the lockfile format. Must increase monotonically.
-lockfile_format_version = 7
+lockfile_format_version = 6
 
 
 READER_CLS = {
@@ -139,7 +139,6 @@ def default_manifest_yaml():
     4: spack.spec.SpecfileV3,
     5: spack.spec.SpecfileV4,
     6: spack.spec.SpecfileV5,
-    7: spack.spec.SpecfileV6,
 }
 
 
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
index 3ee86d20eed..c97cfdc18e8 100644
--- a/lib/spack/spack/spec.py
+++ b/lib/spack/spack/spec.py
@@ -187,7 +187,7 @@
 )
 
 #: specfile format version. Must increase monotonically
-SPECFILE_FORMAT_VERSION = 6
+SPECFILE_FORMAT_VERSION = 5
 
 
 class InstallStatus(enum.Enum):
@@ -2728,10 +2728,8 @@ def from_dict(data) -> "Spec":
             spec = SpecfileV3.load(data)
         elif int(data["spec"]["_meta"]["version"]) == 4:
             spec = SpecfileV4.load(data)
-        elif int(data["spec"]["_meta"]["version"]) == 5:
-            spec = SpecfileV5.load(data)
         else:
-            spec = SpecfileV6.load(data)
+            spec = SpecfileV5.load(data)
 
         # Any git version should
         for s in spec.traverse():
@@ -5100,22 +5098,18 @@ class SpecfileV5(SpecfileV4):
     def legacy_compiler(cls, node):
         raise RuntimeError("The 'compiler' option is unexpected in specfiles at v5 or greater")
 
-
-class SpecfileV6(SpecfileV5):
-    SPEC_VERSION = 6
-
     @classmethod
     def extract_info_from_dep(cls, elt, hash):
         dep_hash = elt[hash.name]
         deptypes = elt["parameters"]["deptypes"]
         hash_type = hash.name
         virtuals = elt["parameters"]["virtuals"]
-        direct = elt["parameters"]["direct"]
+        direct = elt["parameters"].get("direct", True)
         return dep_hash, deptypes, hash_type, virtuals, direct
 
 
 #: Alias to the latest version of specfiles
-SpecfileLatest = SpecfileV6
+SpecfileLatest = SpecfileV5
 
 
 class LazySpecCache(collections.defaultdict):