From 9dee062c84ce3aba7663df5e42de5c2ed34fdb67 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Wed, 11 Dec 2024 16:51:53 +0100
Subject: [PATCH 1/2] Update git to version 2.47.1

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

diff --git a/git.spec b/git.spec
index 7657da2cc2b..4ab33e0c23e 100644
--- a/git.spec
+++ b/git.spec
@@ -1,4 +1,4 @@
-### RPM external git 2.38.1
+### RPM external git 2.47.1
 ## INITENV +PATH PATH %{i}/bin
 ## INITENV +PATH PATH %{i}/libexec/git-core
 ## INITENV SET GIT_TEMPLATE_DIR %{i}/share/git-core/templates
@@ -6,7 +6,7 @@
 ## INITENV SET GIT_EXEC_PATH %{i}/libexec/git-core
 
 Source0: https://github.com/git/git/archive/v%{realversion}.tar.gz
-Source1: https://raw.github.com/bagder/curl/curl-7_59_0/lib/mk-ca-bundle.pl
+Source1: https://raw.github.com/curl/curl/curl-8_11_1/scripts/mk-ca-bundle.pl
 Patch1: git-2.19.0-runtime
 
 Requires: curl expat zlib pcre2 python3

From a4b732df0483ba4eb3ccdfac883cdc93915f3ea9 Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Wed, 11 Dec 2024 17:40:54 +0100
Subject: [PATCH 2/2] Added git-lfs

---
 cmssw-tools.spec                           |  1 +
 git-lfs.spec                               | 14 ++++++++++++++
 scram-tools.file/tools/git-lfs/git-lfs.xml |  7 +++++++
 3 files changed, 22 insertions(+)
 create mode 100644 git-lfs.spec
 create mode 100644 scram-tools.file/tools/git-lfs/git-lfs.xml

diff --git a/cmssw-tools.spec b/cmssw-tools.spec
index bcd59a3a073..c7315086051 100644
--- a/cmssw-tools.spec
+++ b/cmssw-tools.spec
@@ -118,6 +118,7 @@ Requires: sloccount
 Requires: millepede
 Requires: pacparser
 Requires: git
+Requires: git-lfs
 Requires: fastjet
 Requires: fastjet-contrib
 Requires: opencl
diff --git a/git-lfs.spec b/git-lfs.spec
new file mode 100644
index 00000000000..ed51ee32ef3
--- /dev/null
+++ b/git-lfs.spec
@@ -0,0 +1,14 @@
+### RPM external git-lfs 3.6.0
+Source: https://github.com/git-lfs/git-lfs/archive/v%{realversion}.tar.gz
+BuildRequires: gmake go
+Requires: git
+
+%prep
+%setup -n %{n}-%{realversion}
+
+%build
+make %{makeprocesses} VERSION=v%{realversion} GIT_LFS_SHA=${realversion}
+
+%install
+mkdir -p %{i}/bin
+mv bin/git-lfs %{i}/bin
diff --git a/scram-tools.file/tools/git-lfs/git-lfs.xml b/scram-tools.file/tools/git-lfs/git-lfs.xml
new file mode 100644
index 00000000000..62e28ae4c59
--- /dev/null
+++ b/scram-tools.file/tools/git-lfs/git-lfs.xml
@@ -0,0 +1,7 @@
+<tool name="git-lfs" version="@TOOL_VERSION@" revision="1">
+  <info url="https://git-lfs.com/"/>
+  <client>
+    <environment name="GIT_LFS_BASE" default="@TOOL_ROOT@"/>
+  </client>
+  <runtime name="PATH" value="$GIT_LFS_BASE/bin" type="path"/>
+</tool>