From 9ec9d12b395d6801ed8eaf346989cfcac943456a Mon Sep 17 00:00:00 2001
From: Sioni Summers <14807534+thesps@users.noreply.github.com>
Date: Mon, 23 Oct 2023 15:24:36 +0200
Subject: [PATCH 1/3] Add conifer external

---
 conifer.spec                               | 16 ++++++++++++++++
 scram-tools.file/tools/conifer/conifer.xml |  7 +++++++
 2 files changed, 23 insertions(+)
 create mode 100644 conifer.spec
 create mode 100644 scram-tools.file/tools/conifer/conifer.xml

diff --git a/conifer.spec b/conifer.spec
new file mode 100644
index 00000000000..e6f8f8782b9
--- /dev/null
+++ b/conifer.spec
@@ -0,0 +1,16 @@
+### RPM external conifer 1.2
+## NOCOMPILER
+
+Source: https://github.com/thesps/%{n}/archive/v%{realversion}.tar.gz
+
+%prep
+%setup -n %{n}-%{realversion}
+
+%build
+
+%install
+mkdir -p %{i}/include/
+cp conifer/backends/cpp/include/conifer.h     %{i}/include/
+
+%post
+
diff --git a/scram-tools.file/tools/conifer/conifer.xml b/scram-tools.file/tools/conifer/conifer.xml
new file mode 100644
index 00000000000..5ff3679bc78
--- /dev/null
+++ b/scram-tools.file/tools/conifer/conifer.xml
@@ -0,0 +1,7 @@
+<tool name="conifer" version="@TOOL_VERSION@">
+  <client>
+    <environment name="CONIFER_BASE" default="@TOOL_ROOT@"/>
+    <environment name="INCLUDE" default="$CONIFER_BASE/conifer/backends/cpp/include"/>
+  </client>
+</tool>
+

From 60cac4d2c6b2f22177f3091a50f8119556db9703 Mon Sep 17 00:00:00 2001
From: Sioni Summers <14807534+thesps@users.noreply.github.com>
Date: Mon, 23 Oct 2023 15:35:41 +0200
Subject: [PATCH 2/3] Add json requirement

---
 conifer.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conifer.spec b/conifer.spec
index e6f8f8782b9..c307ebd9c76 100644
--- a/conifer.spec
+++ b/conifer.spec
@@ -2,6 +2,7 @@
 ## NOCOMPILER
 
 Source: https://github.com/thesps/%{n}/archive/v%{realversion}.tar.gz
+Requires: json
 
 %prep
 %setup -n %{n}-%{realversion}

From 6ad2c6cf19d63957dd519d4ef7c11942a3e20a76 Mon Sep 17 00:00:00 2001
From: Sioni Summers <14807534+thesps@users.noreply.github.com>
Date: Mon, 23 Oct 2023 15:54:55 +0200
Subject: [PATCH 3/3] Address comments: change include and add use JSON to xml.
 Add conifer to Requires of cmssw-tool-conf

---
 cmssw-tool-conf.spec                       | 1 +
 scram-tools.file/tools/conifer/conifer.xml | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec
index 6dde42ba71f..b959eb1aefb 100644
--- a/cmssw-tool-conf.spec
+++ b/cmssw-tool-conf.spec
@@ -17,6 +17,7 @@ Requires: bz2lib
 Requires: cepgen
 Requires: classlib
 Requires: clhep
+Requires: conifer
 Requires: coral
 Requires: cppunit
 Requires: cpu_features
diff --git a/scram-tools.file/tools/conifer/conifer.xml b/scram-tools.file/tools/conifer/conifer.xml
index 5ff3679bc78..31b5fe63858 100644
--- a/scram-tools.file/tools/conifer/conifer.xml
+++ b/scram-tools.file/tools/conifer/conifer.xml
@@ -1,7 +1,8 @@
 <tool name="conifer" version="@TOOL_VERSION@">
   <client>
     <environment name="CONIFER_BASE" default="@TOOL_ROOT@"/>
-    <environment name="INCLUDE" default="$CONIFER_BASE/conifer/backends/cpp/include"/>
+    <environment name="INCLUDE" default="$CONIFER_BASE/include"/>
   </client>
+  <use name="json"/>
 </tool>