From a6095672c516643f42c2d99eb3b81533bf97d299 Mon Sep 17 00:00:00 2001
From: Laurent Forthomme <laurent.forthomme@cern.ch>
Date: Tue, 28 Mar 2023 15:25:41 +0200
Subject: [PATCH 1/2] Imported yaml-cpp 0.7.0

---
 cmssw-tool-conf.spec                         |  1 +
 scram-tools.file/tools/yaml-cpp/yaml-cpp.xml |  5 ++--
 yaml-cpp.spec                                | 26 ++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 yaml-cpp.spec

diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec
index e41f548dfcc..85b0872800b 100644
--- a/cmssw-tool-conf.spec
+++ b/cmssw-tool-conf.spec
@@ -95,6 +95,7 @@ Requires: grpc
 Requires: onnxruntime
 Requires: triton-inference-client
 Requires: hdf5
+Requires: yaml-cpp
 Requires: yoda
 Requires: fftw3
 Requires: fftjet
diff --git a/scram-tools.file/tools/yaml-cpp/yaml-cpp.xml b/scram-tools.file/tools/yaml-cpp/yaml-cpp.xml
index 5deda30efee..7a65516c036 100644
--- a/scram-tools.file/tools/yaml-cpp/yaml-cpp.xml
+++ b/scram-tools.file/tools/yaml-cpp/yaml-cpp.xml
@@ -1,10 +1,9 @@
 <tool name="yaml-cpp" version="@TOOL_VERSION@">
-  <info url="http://code.google.com/p/yaml-cpp/"/>
+  <info url="https://github.com/jbeder/yaml-cpp/"/>
   <lib name="yaml-cpp"/>
   <client>
     <environment name="YAML_CPP_BASE" default="@TOOL_ROOT@"/>
-    <environment name="LIBDIR" default="$YAML_CPP_BASE/lib"/>
+    <environment name="LIBDIR" default="$YAML_CPP_BASE/lib64"/>
     <environment name="INCLUDE" default="$YAML_CPP_BASE/include"/>
   </client>
-  <use name="boost"/>
 </tool>
diff --git a/yaml-cpp.spec b/yaml-cpp.spec
new file mode 100644
index 00000000000..f3316de28b8
--- /dev/null
+++ b/yaml-cpp.spec
@@ -0,0 +1,26 @@
+### RPM external yaml-cpp 0.7.0
+
+Source: https://github.com/jbeder/yaml-cpp/archive/refs/tags/%{n}-%{realversion}.tar.gz
+
+BuildRequires: cmake ninja
+
+%prep
+%setup -n %{n}-%{realversion}
+
+%build
+rm -rf ../build
+mkdir ../build
+cd ../build
+
+cmake ../%{n}-%{realversion} \
+  -G Ninja \
+  -DCMAKE_INSTALL_PREFIX:PATH="%i" \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DYAML_BUILD_SHARED_LIBS=ON \
+  -DYAML_CPP_BUILD_TESTS=OFF
+
+ninja -v %{makeprocesses}
+
+%install
+cd ../build
+ninja %{makeprocesses} install

From e210a93f8c2e1c6a73f14c99dfd84fb86b7043ec Mon Sep 17 00:00:00 2001
From: Laurent Forthomme <laurent.forthomme@cern.ch>
Date: Tue, 28 Mar 2023 16:04:35 +0200
Subject: [PATCH 2/2] Updated path to archive

---
 yaml-cpp.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yaml-cpp.spec b/yaml-cpp.spec
index f3316de28b8..3c41841158e 100644
--- a/yaml-cpp.spec
+++ b/yaml-cpp.spec
@@ -5,14 +5,14 @@ Source: https://github.com/jbeder/yaml-cpp/archive/refs/tags/%{n}-%{realversion}
 BuildRequires: cmake ninja
 
 %prep
-%setup -n %{n}-%{realversion}
+%setup -n %{n}-%{n}-%{realversion}
 
 %build
 rm -rf ../build
 mkdir ../build
 cd ../build
 
-cmake ../%{n}-%{realversion} \
+cmake ../%{n}-%{n}-%{realversion} \
   -G Ninja \
   -DCMAKE_INSTALL_PREFIX:PATH="%i" \
   -DCMAKE_BUILD_TYPE=Release \