From 27ec6ac32b8aebfddae40b4c30c34b59907ccf93 Mon Sep 17 00:00:00 2001 From: iarspider Date: Sat, 5 Aug 2023 14:56:35 +0200 Subject: [PATCH] [G4VECGEOM] Update Geant4 to 11.1.ref07 (#8632) * [G4VECGEOM] Update Geant4 to 11.1.ref07 * Update geant4.spec * Update geant4.spec * Replace G4persistency with new libraries --- geant4.spec | 11 ++++------- scram-tools.file/tools/geant4/geant4core.xml | 4 +++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/geant4.spec b/geant4.spec index 1a299ee3ca0..572f340cad4 100644 --- a/geant4.spec +++ b/geant4.spec @@ -1,13 +1,10 @@ -### 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 branch cms/v%{realversion} -#%define github_user cms-externals -%define tag cf4c6712c60cdf2b4d8799e34e176917c2de358d -%define branch master -%define github_user Geant4 +%define tag d35b0306a837c2b3640b250c1af599688eee8df1 +%define branch cms/v%{realversion} +%define github_user cms-externals Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz BuildRequires: cmake gmake 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 @@ - + + +