Merge pull request #6327 from cms-sw/update-geant-to-10.6.9

[Geant4] Update to version 10.6.9

geant4.spec

@@ -1,7 +1,7 @@
-### RPM external geant4 10.7.0.beta
-%define tag 67ba86d073ec6366df0de75a0f5b5d57920d0b7e
-%define branch master
-%define github_user Geant4
+### RPM external geant4 10.6.9
+%define tag e8eb2b9a2c3c1f1e76008177e65c612f27cbdba4
+%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

vecgeom-fix-for-arm64.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b3014e9..f10fae0 100644
+index a090c57..9726ebe 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -317,6 +317,8 @@ elseif(Intel)
+@@ -294,6 +294,8 @@ elseif(Intel)
        list(APPEND CMAKE_CXX_FLAGS -std=c++11)
      elseif(CMAKE_CXX_STANDARD STREQUAL 14)
        list(APPEND CMAKE_CXX_FLAGS -std=c++14)

vecgeom-fix-vector.patch

@@ -1,13 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6f5833f..d4bfd51 100644
+index a090c57..7dbb121 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -80,7 +80,7 @@ option(USE_CACHED_TRANSFORMATIONS "Use cached transformations in navigation stat
- option(FAST_MATH "Enable the -ffast-math compiler option in Release builds" OFF)
-
+@@ -85,7 +85,7 @@ endif()
+ # - ISA
+ set(VECGEOM_ISAS empty)
  if(CMAKE_SYSTEM_PROCESSOR MATCHES "(i686|x86_64)")
--  set(VECGEOM_ARCH sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 mic mic_avx512 native empty)
-+  set(VECGEOM_ARCH sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 mic mic_avx512 native empty arch=nehalem arch=sandybridge  arch=haswell)
- else()
-   set(VECGEOM_ARCH empty)
+-  set(VECGEOM_ISAS sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 mic mic_avx512 native empty)
++  set(VECGEOM_ISAS sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 mic mic_avx512 native empty arch=nehalem arch=sandybridge  arch=haswell)
  endif()
+
+ enum_option(VECGEOM_VECTOR DOC "Vector instruction set to be used"

vecgeom.spec

@@ -1,5 +1,7 @@
 ### RPM external vecgeom v1.1.7
-Source: git+https://gitlab.cern.ch/VecGeom/VecGeom.git?obj=master/%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
+%define tag 982503b232bb2101a5257630335340fbd3eb9f78
+Source: git+https://gitlab.cern.ch/VecGeom/VecGeom.git?obj=master/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
+
 BuildRequires: cmake gmake
 %define keep_archives true