From 0ab7188559eafedec2710c8e8521893f10d1223f Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Fri, 13 Dec 2024 09:15:50 +0100
Subject: [PATCH 1/3] [BuildRule]Fix for code checks

---
 scram-project-build.file | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scram-project-build.file b/scram-project-build.file
index 542ad41e13b..cee2da7f906 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -52,7 +52,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V09-06-08
+%define configtag       V09-06-09
 %endif
 
 %if "%{?buildarch:set}" != "set"
@@ -121,6 +121,7 @@ echo %{configtag} > %_builddir/config/config_tag
   --keys ENABLE_PGO=0
 %endif
 
+echo -e '<tool name="cmssw-config" version="%{configtag}" revision="1"></tool>' > %i/config/toolbox/%{cmsplatf}/tools/selected/cmssw-config.xml
 sed -i -e 's| SCRAM_TARGETS=.*"| SCRAM_TARGETS=""|' %_builddir/config/Self.xml
 %if "%{package_vectorization}"
 %if "%{?scram_target_default:set}" != "set"

From ed0f4f4d5469e55e1ff0c7f2e09c5014f2f378c9 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Fri, 13 Dec 2024 09:43:01 +0100
Subject: [PATCH 2/3] move creation of of cmssw-config.xml at correct place

---
 scram-project-build.file | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scram-project-build.file b/scram-project-build.file
index cee2da7f906..4102ef94e9d 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -121,7 +121,6 @@ echo %{configtag} > %_builddir/config/config_tag
   --keys ENABLE_PGO=0
 %endif
 
-echo -e '<tool name="cmssw-config" version="%{configtag}" revision="1"></tool>' > %i/config/toolbox/%{cmsplatf}/tools/selected/cmssw-config.xml
 sed -i -e 's| SCRAM_TARGETS=.*"| SCRAM_TARGETS=""|' %_builddir/config/Self.xml
 %if "%{package_vectorization}"
 %if "%{?scram_target_default:set}" != "set"
@@ -169,6 +168,8 @@ for t in %{extra_tools}; do %scramcmd setup $t; done
 %if "%{?remove_tools:set}" == "set"
 for t in %{remove_tools}; do  %scramcmd tool remove $t; done
 %endif
+echo -e '<tool name="cmssw-config" version="%{configtag}" revision="1"></tool>' > %{i}/config/toolbox/%{cmsplatf}/tools/selected/cmssw-config.xml
+%scramcmd setup cmssw-config
 %{?buildarch:%buildarch}
 
 export BUILD_LOG=yes

From 9c155342abcf3502a7bfe45c3e3841f297b9a303 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Fri, 13 Dec 2024 09:43:27 +0100
Subject: [PATCH 3/3] Update scram-project-build.file

---
 scram-project-build.file | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scram-project-build.file b/scram-project-build.file
index 4102ef94e9d..e0ef6053a0d 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -168,7 +168,7 @@ for t in %{extra_tools}; do %scramcmd setup $t; done
 %if "%{?remove_tools:set}" == "set"
 for t in %{remove_tools}; do  %scramcmd tool remove $t; done
 %endif
-echo -e '<tool name="cmssw-config" version="%{configtag}" revision="1"></tool>' > %{i}/config/toolbox/%{cmsplatf}/tools/selected/cmssw-config.xml
+echo -e '<tool name="cmssw-config" version="%{configtag}" revision="1">\n</tool>' > %{i}/config/toolbox/%{cmsplatf}/tools/selected/cmssw-config.xml
 %scramcmd setup cmssw-config
 %{?buildarch:%buildarch}