From 50e8f6395cf5e4505284578494f5df6043de7049 Mon Sep 17 00:00:00 2001
From: Dennis Klein <d.klein@gsi.de>
Date: Wed, 21 May 2025 00:54:58 +0200
Subject: [PATCH] fairlogger: add new v2.2.0 (#50545)

* remove deprecated
   * remove obsolete conditions
* deprecate remaining `@:1`
---
 .../builtin/packages/fairlogger/package.py    | 94 ++++++-------------
 1 file changed, 29 insertions(+), 65 deletions(-)

diff --git a/var/spack/repos/spack_repo/builtin/packages/fairlogger/package.py b/var/spack/repos/spack_repo/builtin/packages/fairlogger/package.py
index ab6254732a4..38968c102ac 100644
--- a/var/spack/repos/spack_repo/builtin/packages/fairlogger/package.py
+++ b/var/spack/repos/spack_repo/builtin/packages/fairlogger/package.py
@@ -16,67 +16,20 @@ class Fairlogger(CMakePackage):
     maintainers("dennisklein", "ChristianTackeGSI")
 
     version("develop", branch="dev", get_full_repo=True)
-    version("1.11.1", sha256="bba5814f101d705792499e43b387190d8b8c7592466171ae045d4926485f2f70")
-    version("1.10.4", sha256="2fa321893f2c8c599cca160db243299ce1e941fbfb3f935b1139caa943bc0dba")
-    version("1.9.3", sha256="0c02076ed708372d5ae7bdebcefc8e45a8cbfa480eea781308336d60a2781f3a")
+    version("2.2.0", sha256="8dfb11e3aa0a9c545f3dfb310d261956727cea558d4123fd8c9c98e135e4d02b")
     version(
-        "1.9.0",
-        sha256="13bcaa0d4129f8d4e69a0a2ece8e5b7073760082c8aa028e3fc0c11106503095",
+        "1.11.1",
+        sha256="bba5814f101d705792499e43b387190d8b8c7592466171ae045d4926485f2f70",
         deprecated=True,
     )
     version(
-        "1.8.0",
-        sha256="3f0a38dba1411b542d998e02badcc099c057b33a402954fc5c2ab74947a0c42c",
+        "1.10.4",
+        sha256="2fa321893f2c8c599cca160db243299ce1e941fbfb3f935b1139caa943bc0dba",
         deprecated=True,
     )
     version(
-        "1.7.0",
-        sha256="ef467f0a70afc0549442323d70b165fa0b0b4b4e6f17834573ca15e8e0b007e4",
-        deprecated=True,
-    )
-    version(
-        "1.6.2",
-        sha256="5c6ef0c0029eb451fee71756cb96e6c5011040a9813e8889667b6f3b6b04ed03",
-        deprecated=True,
-    )
-    version(
-        "1.6.1",
-        sha256="3894580f4c398d724ba408e410e50f70c9f452e8cfaf7c3ff8118c08df28eaa8",
-        deprecated=True,
-    )
-    version(
-        "1.6.0",
-        sha256="721e8cadfceb2f63014c2a727e098babc6deba653baab8866445a772385d0f5b",
-        deprecated=True,
-    )
-    version(
-        "1.5.0",
-        sha256="8e74e0b1e50ee86f4fca87a44c6b393740b32099ac3880046bf252c31c58dd42",
-        deprecated=True,
-    )
-    version(
-        "1.4.0",
-        sha256="75457e86984cc03ce87d6ad37adc5aab1910cabd39a9bbe5fb21ce2475a91138",
-        deprecated=True,
-    )
-    version(
-        "1.3.0",
-        sha256="5cedea2773f7091d69aae9fd8f724e6e47929ee3784acdd295945a848eb36b93",
-        deprecated=True,
-    )
-    version(
-        "1.2.0",
-        sha256="bc0e049cf84ceb308132d8679e7f22fcdca5561dda314d5233d0d5fe2b0f8c62",
-        deprecated=True,
-    )
-    version(
-        "1.1.0",
-        sha256="e185e5bd07df648224f85e765d18579fae0de54adaab9a194335e3ad6d3d29f7",
-        deprecated=True,
-    )
-    version(
-        "1.0.6",
-        sha256="2fc266a6e494adda40837be406aef8d9838f385ffd64fbfafb1164833906b4e0",
+        "1.9.3",
+        sha256="0c02076ed708372d5ae7bdebcefc8e45a8cbfa480eea781308336d60a2781f3a",
         deprecated=True,
     )
 
@@ -92,14 +45,21 @@ class Fairlogger(CMakePackage):
     variant(
         "cxxstd",
         default="default",
-        values=("default", conditional("11", when="@:1.9"), "14", "17", "20"),
+        values=(
+            "default",
+            conditional("11", when="@:1.9"),
+            conditional("14", when="@:1"),
+            "17",
+            "20",
+            "23",
+            "26",
+        ),
         multi=False,
         description="Use the specified C++ standard when building.",
     )
     variant(
         "pretty", default=False, description="Use BOOST_PRETTY_FUNCTION macro (Supported by 1.4+)."
     )
-    conflicts("+pretty", when="@:1.3")
 
     depends_on("cxx", type="build")  # generated
 
@@ -108,14 +68,15 @@ class Fairlogger(CMakePackage):
 
     depends_on("boost", when="+pretty")
     conflicts("^boost@1.70:", when="^cmake@:3.14")
+    depends_on("fmt")
     depends_on("fmt@:8", when="@:1.9")
-    depends_on("fmt@5.3.0:5", when="@1.6.0:1.6.1")
-    depends_on("fmt@5.3.0:", when="@1.6.2:")
 
     def patch(self):
         """FairLogger gets its version number from git.
-        But the tarball doesn't have that information, so
-        we patch the spack version into CMakeLists.txt"""
+
+        The tarball doesn't have that information, so we patch the spack
+        version into CMakeLists.txt.
+        """
         if not self.spec.satisfies("@develop"):
             filter_file(
                 r"(get_git_version\(.*)\)",
@@ -123,14 +84,17 @@ def patch(self):
                 "CMakeLists.txt",
             )
 
+        if self.spec.satisfies("@:1"):
+            filter_file(r"(LANGUAGES C CXX)", r"LANGUAGES CXX", "CMakeLists.txt")
+
     def cmake_args(self):
-        args = [self.define("DISABLE_COLOR", True)]
+        args = [
+            self.define("DISABLE_COLOR", True),
+            self.define_from_variant("USE_BOOST_PRETTY_FUNCTION", "pretty"),
+            self.define("USE_EXTERNAL_FMT", True),
+        ]
         if self.spec.variants["cxxstd"].value != "default":
             args.append(self.define_from_variant("CMAKE_CXX_STANDARD", "cxxstd"))
-        if self.spec.satisfies("@1.4:"):
-            args.append(self.define_from_variant("USE_BOOST_PRETTY_FUNCTION", "pretty"))
-        if self.spec.satisfies("@1.6:"):
-            args.append(self.define("USE_EXTERNAL_FMT", True))
         if self.spec.satisfies("^boost@:1.69"):
             args.append(self.define("Boost_NO_BOOST_CMAKE", True))
         return args