From 203e05c3a9554d54e2ba629e32b533a0efa6ecb7 Mon Sep 17 00:00:00 2001
From: jaimergp <jaimergp@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:26:31 +0100
Subject: [PATCH] add compatibility for archspec 0.2.3 (#60)

---
 news/60-archspec-023 | 19 +++++++++++++++++++
 recipe/meta.yaml     |  1 +
 src/conda.exe.spec   |  6 ++++++
 3 files changed, 26 insertions(+)
 create mode 100644 news/60-archspec-023

diff --git a/news/60-archspec-023 b/news/60-archspec-023
new file mode 100644
index 0000000..21beb95
--- /dev/null
+++ b/news/60-archspec-023
@@ -0,0 +1,19 @@
+### Enhancements
+
+* Add compatibility for archspec 0.2.3. (#60)
+
+### Bug fixes
+
+* <news item>
+
+### Deprecations
+
+* <news item>
+
+### Docs
+
+* <news item>
+
+### Other
+
+* <news item>
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index fcdf134..83dafb7 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -39,6 +39,7 @@ requirements:
     - menuinst >=2.0.2
     - conda-libmamba-solver ={{ conda_libmamba_solver_version }}
     - libmambapy ={{ libmambapy_version }}
+    - archspec >=0.2.3
   run_constrained:
     - constructor >={{ constructor_version }}
 
diff --git a/src/conda.exe.spec b/src/conda.exe.spec
index f2168c8..fa4a31f 100644
--- a/src/conda.exe.spec
+++ b/src/conda.exe.spec
@@ -33,12 +33,18 @@ extra_exe_kwargs = {}
 # Format: a list of tuples like (file-path, target-DIRECTORY)
 binaries = []
 datas = [
+    # put a dummy file in archspec/cpu so directory is created and relative paths can be resolved at runtime
+    (os.path.join(sitepackages, 'archspec', 'json', 'COPYRIGHT'), 'archspec/cpu'),
     (os.path.join(sitepackages, 'archspec', 'json', 'COPYRIGHT'), 'archspec/json'),
     (os.path.join(sitepackages, 'archspec', 'json', 'NOTICE'), 'archspec/json'),
+    (os.path.join(sitepackages, 'archspec', 'json', 'NOTICE'), 'archspec/json'),
     (os.path.join(sitepackages, 'archspec', 'json', 'LICENSE-APACHE'), 'archspec/json'),
     (os.path.join(sitepackages, 'archspec', 'json', 'LICENSE-MIT'), 'archspec/json'),
+    (os.path.join(sitepackages, 'archspec', 'json', 'cpu', 'cpuid.json'), 'archspec/json/cpu'),
+    (os.path.join(sitepackages, 'archspec', 'json', 'cpu', 'cpuid_schema.json'), 'archspec/json/cpu'),
     (os.path.join(sitepackages, 'archspec', 'json', 'cpu', 'microarchitectures.json'), 'archspec/json/cpu'),
     (os.path.join(sitepackages, 'archspec', 'json', 'cpu', 'microarchitectures_schema.json'), 'archspec/json/cpu'),
+    (os.path.join(sitepackages, 'archspec', 'vendor', 'cpuid', 'LICENSE'), 'archspec/vendor/cpuid'),
     (os.path.join(sitepackages, 'menuinst', 'data', 'menuinst.default.json'), 'menuinst/data'),
     (os.path.join(sitepackages, 'menuinst', 'data', 'menuinst.schema.json'), 'menuinst/data'),
 ]