From 8e42d4922d423bb63d8a9e0d5216f1c0a82bf1fd Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <Shahzad.Malik.Muzaffar@cern.ch>
Date: Fri, 3 Jul 2020 12:35:51 +0200
Subject: [PATCH 1/3] [CXXMODULE] new build rules to allow building lcgdict for
 selected packages

---
 cmssw-queue-override.file | 5 +++++
 scram-project-build.file  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cmssw-queue-override.file b/cmssw-queue-override.file
index 3ceca7ac45d..0b3d39775de 100644
--- a/cmssw-queue-override.file
+++ b/cmssw-queue-override.file
@@ -30,5 +30,10 @@
 %if "%(case %realversion in (*CXXMODULE*) echo true ;; (*) echo false ;; esac)" == "true"
 Source20: CXXModules.mk
 %define patchsrc19     cp %{_sourcedir}/CXXModules.mk config/SCRAM/GMake/CXXModules.mk
+%define patchsrc20     \
+  for p in FWCore/Framework FWCore/ParameterSet FWCore/Reflection FWCore/Utilities ; do \
+    echo "${p}_CXXMODULES:=1" | sed 's|/||' >> config/SCRAM/GMake/CXXModules.mk ;\
+    echo "<flags LCGDICT_PACKAGE=\"$p\"/>"  >> config/BuildFile.xml ;\
+  done
 %endif
 
diff --git a/scram-project-build.file b/scram-project-build.file
index bbc0ad34e51..af23bcca291 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -64,7 +64,7 @@ Requires: glibc
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V05-10-16
+%define configtag       V05-10-20
 %endif
 
 %if "%{?cvssrc:set}" != "set"

From 67dfb645f447520589673d88c5f70fb6d6a15aa6 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Sat, 4 Jul 2020 20:46:50 +0200
Subject: [PATCH 2/3] escape \ char as rpm macro expansion removes it

---
 cmssw-queue-override.file | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmssw-queue-override.file b/cmssw-queue-override.file
index 0b3d39775de..dac3ed6784e 100644
--- a/cmssw-queue-override.file
+++ b/cmssw-queue-override.file
@@ -32,8 +32,8 @@ Source20: CXXModules.mk
 %define patchsrc19     cp %{_sourcedir}/CXXModules.mk config/SCRAM/GMake/CXXModules.mk
 %define patchsrc20     \
   for p in FWCore/Framework FWCore/ParameterSet FWCore/Reflection FWCore/Utilities ; do \
-    echo "${p}_CXXMODULES:=1" | sed 's|/||' >> config/SCRAM/GMake/CXXModules.mk ;\
-    echo "<flags LCGDICT_PACKAGE=\"$p\"/>"  >> config/BuildFile.xml ;\
+    echo "${p}_CXXMODULES:=1" | sed 's|/||'   >> config/SCRAM/GMake/CXXModules.mk \
+    echo "<flags LCGDICT_PACKAGE=\\"$p\\"/>"  >> config/BuildFile.xml \
   done
 %endif
 

From ca00d4f06abc2554218d198b7f5dc0b3c52c145e Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Tue, 7 Jul 2020 22:59:16 +0200
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 af23bcca291..5b8035fd0fd 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -64,7 +64,7 @@ Requires: glibc
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V05-10-20
+%define configtag       V05-10-22
 %endif
 
 %if "%{?cvssrc:set}" != "set"