From 707d307b4203f2308c61f7ffcc2b3153342e7f30 Mon Sep 17 00:00:00 2001
From: iarspider <iarspider@gmail.com>
Date: Thu, 3 Aug 2023 10:22:49 +0200
Subject: [PATCH 1/4] [G4VECGEOM] Update Geant4 to 11.1.ref07

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

diff --git a/geant4.spec b/geant4.spec
index 1a299ee3ca0..2687b7b2725 100644
--- a/geant4.spec
+++ b/geant4.spec
@@ -1,8 +1,8 @@
-### RPM external geant4 11.1.2
+### RPM external geant4 11.1.ref07
 ## INCLUDE compilation_flags
 ## INCLUDE compilation_flags_lto
 %define use_vecgeom 1
-#%define tag 35f304cde19a3e2dfe3bb941d4fc76c2fe45fa26
+#%define tag d35b0306a837c2b3640b250c1af599688eee8df1
 #%define branch cms/v%{realversion}
 #%define github_user cms-externals
 %define tag cf4c6712c60cdf2b4d8799e34e176917c2de358d

From 949f5fdd99176459382cdbe4ae2e47bb57719b22 Mon Sep 17 00:00:00 2001
From: iarspider <iarspider@gmail.com>
Date: Thu, 3 Aug 2023 10:49:16 +0200
Subject: [PATCH 2/4] Update geant4.spec

---
 geant4.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/geant4.spec b/geant4.spec
index 2687b7b2725..d8ff43f072b 100644
--- a/geant4.spec
+++ b/geant4.spec
@@ -2,12 +2,12 @@
 ## INCLUDE compilation_flags
 ## INCLUDE compilation_flags_lto
 %define use_vecgeom 1
-#%define tag d35b0306a837c2b3640b250c1af599688eee8df1
-#%define branch cms/v%{realversion}
-#%define github_user cms-externals
 %define tag cf4c6712c60cdf2b4d8799e34e176917c2de358d
-%define branch master
-%define github_user Geant4
+%define branch cms/v%{realversion}
+%define github_user cms-externals
+#%define tag cf4c6712c60cdf2b4d8799e34e176917c2de358d
+#%define branch master
+#%define github_user Geant4
 Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz
 
 BuildRequires: cmake gmake

From ed47b3a05400c34f2d82652944910883ef91a314 Mon Sep 17 00:00:00 2001
From: iarspider <iarspider@gmail.com>
Date: Fri, 4 Aug 2023 11:22:01 +0200
Subject: [PATCH 3/4] Update geant4.spec

---
 geant4.spec | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/geant4.spec b/geant4.spec
index d8ff43f072b..572f340cad4 100644
--- a/geant4.spec
+++ b/geant4.spec
@@ -2,12 +2,9 @@
 ## INCLUDE compilation_flags
 ## INCLUDE compilation_flags_lto
 %define use_vecgeom 1
-%define tag cf4c6712c60cdf2b4d8799e34e176917c2de358d
+%define tag d35b0306a837c2b3640b250c1af599688eee8df1
 %define branch cms/v%{realversion}
 %define github_user cms-externals
-#%define tag cf4c6712c60cdf2b4d8799e34e176917c2de358d
-#%define branch master
-#%define github_user Geant4
 Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz
 
 BuildRequires: cmake gmake

From 79cb1bf2265603d895b7f459310f16db75b67ed1 Mon Sep 17 00:00:00 2001
From: Ivan Razumov <iarspider@gmail.com>
Date: Fri, 4 Aug 2023 18:12:29 +0200
Subject: [PATCH 4/4] Replace G4persistency with new libraries

---
 scram-tools.file/tools/geant4/geant4core.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scram-tools.file/tools/geant4/geant4core.xml b/scram-tools.file/tools/geant4/geant4core.xml
index 8361721e432..6c48a9cfef9 100644
--- a/scram-tools.file/tools/geant4/geant4core.xml
+++ b/scram-tools.file/tools/geant4/geant4core.xml
@@ -10,7 +10,9 @@
   <lib name="G4materials"/>
   <lib name="G4parmodels"/>
   <lib name="G4particles"/>
-  <lib name="G4persistency"/>
+  <lib name="G4geomtext"/>
+  <lib name="G4mctruth"/>
+  <lib name="G4gdml"/>
   <lib name="G4physicslists"/>
   <lib name="G4processes"/>
   <lib name="G4readout"/>