Merge pull request #9163 from cms-sw/smuzaffar-patch-2

[14.0.X] config/Self.xml format update/fix
cms-sw · Apr 28, 2024 · fccbcf5 · fccbcf5
2 parents 5aa89b7 + 769e119
commit fccbcf5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/SCRAMV1.spec b/SCRAMV1.spec
@@ -1,8 +1,8 @@
-### RPM lcg SCRAMV1 V3_00_70
+### RPM lcg SCRAMV1 V3_00_71
 ## NOCOMPILER
 ## NO_VERSION_SUFFIX
 
-%define tag 121148347412a0362c99139de0aa67e06171909d
+%define tag d9563d4cdabd86a8fc3ef56dd59621747d3db670
 %define branch SCRAMV3
 %define github_user cms-sw
 Source: git+https://github.com/%{github_user}/SCRAM.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz

diff --git a/scram-project-build.file b/scram-project-build.file
@@ -131,7 +131,7 @@ echo %{configtag} > %_builddir/config/config_tag
 
 %if "%{?vectorized_build:set}" == "set"
 sed -i -e 's| SCRAM_TARGETS=.*"| SCRAM_TARGETS="%{package_vectorization}"|' %_builddir/config/Self.xml
-sed -i -e 's|</tool>|<runtime name="SCRAM_TARGET" value="%{scram_target_default}"/><runtime name="USER_TARGETS_ALL" value="1"/></tool>|' %_builddir/config/Self.xml
+sed -i -e 's|</tool>| <runtime name="SCRAM_TARGET" value="%{scram_target_default}"/>\n <runtime name="USER_TARGETS_ALL" value="1"/>\n</tool>|' %_builddir/config/Self.xml
 %endif
 
 %if "%{?release_usercxxflags:set}" == "set"