Update G4 11.1.1, vecgeom 1.2.1, clhep 2.4.6 and G4-data

clhep.spec

@@ -1,6 +1,6 @@
-### RPM external clhep 2.4.5.1
+### RPM external clhep 2.4.6.0
 
-%define tag f256fe37039681f7856f0e324ccf9337cdc35b51
+%define tag 06b39fc5f06924728af27f6b0df1ffdac174dff3
 %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}.tgz

geant4-G4EMLOW.spec

@@ -1,4 +1,4 @@
-### RPM external geant4-G4EMLOW 7.13
+### RPM external geant4-G4EMLOW 8.2
 %define G4RunTime G4LEDATA
 %define source0 https://geant4-data.web.cern.ch/datasets/G4EMLOW.%{realversion}.tar.gz
 

geant4-G4PARTICLEXS.spec

@@ -1,4 +1,4 @@
-### RPM external geant4-G4PARTICLEXS 3.1.1
+### RPM external geant4-G4PARTICLEXS 4.0
 %define G4RunTime G4PARTICLEXSDATA
 %define source0 https://geant4-data.web.cern.ch/datasets/G4PARTICLEXS.%{realversion}.tar.gz
 

geant4.spec

@@ -1,11 +1,11 @@
-### RPM external geant4 10.7.2
+### RPM external geant4 11.1.1
 ## INCLUDE compilation_flags
 ## INCLUDE compilation_flags_lto
 %define use_vecgeom 1
-%define tag 0aeb9c66fceb9ae0f66b91721783fd35a8dffa52
+%define tag 35f304cde19a3e2dfe3bb941d4fc76c2fe45fa26
 %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
+Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz
 
 BuildRequires: cmake gmake
 
@@ -45,12 +45,13 @@ cmake ../%{n}.%{realversion} \
   -DCMAKE_AR=$(which gcc-ar) \
   -DCMAKE_RANLIB=$(which gcc-ranlib) \
   -DCMAKE_INSTALL_PREFIX:PATH="%i" \
+  -DCMAKE_CXX_STANDARD:STRING="17" \
   -DCMAKE_BUILD_TYPE=Release \
   -DGEANT4_USE_GDML=ON \
-  -DGEANT4_BUILD_CXXSTD:STRING="17" \
   -DGEANT4_BUILD_TLS_MODEL:STRING="global-dynamic" \
   -DGEANT4_ENABLE_TESTING=OFF \
   -DGEANT4_BUILD_VERBOSE_CODE=OFF \
+  -DGEANT4_BUILD_BUILTIN_BACKTRACE=OFF \
 %if %{use_vecgeom}
   -DGEANT4_USE_USOLIDS="all" \
 %endif

scram-tools.file/tools/geant4/geant4vis.xml

@@ -5,7 +5,6 @@
   <lib name="G4Tree"/>
   <lib name="G4visHepRep"/>
   <lib name="G4vis_management"/>
-  <lib name="G4visXXX"/>
   <lib name="G4VRML"/>
   <lib name="G4GMocren"/>
   <use name="geant4core"/>

scram-tools.file/tools/vecgeom/vecgeom.xml

@@ -3,7 +3,7 @@
   <lib name="vecgeom"/>
   <client>
     <environment name="VECGEOM_BASE" default="@TOOL_ROOT@"/>
-    <environment name="LIBDIR" default="$VECGEOM_BASE/lib"/>
+    <environment name="LIBDIR" default="$VECGEOM_BASE/lib64"/>
   </client>
   <use name="vecgeom_interface"/>
 </tool>

vecgeom.spec

@@ -1,11 +1,11 @@
-### RPM external vecgeom v1.1.17
+### RPM external vecgeom v1.2.1
 ## INCLUDE compilation_flags
 ## INCLUDE compilation_flags_lto
-%define tag ed9a40412c354652262ec80af449f5531206e52c
+%define tag 12fc8ba12efe93de5aaa9ff8e51e093ae93a1633
 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
-
+%define vecgeom_backend Scalar
 Patch0: vecgeom-fix-vector
 
 %define build_flags %{?arch_build_flags} %{?lto_build_flags} %{?pgo_build_flags}
@@ -22,23 +22,26 @@ cd ../build
 
 cmake ../%{n}-%{realversion} \
   -DCMAKE_INSTALL_PREFIX=%{i} \
-  -DCMAKE_INSTALL_LIBDIR=%{i}/lib \
-  -DROOT=OFF \
+  -DCMAKE_CXX_STANDARD:STRING="17" \
   -DCMAKE_AR=$(which gcc-ar) \
   -DCMAKE_RANLIB=$(which gcc-ranlib) \
   -DCMAKE_BUILD_TYPE=Release \
-  -DNO_SPECIALIZATION=ON \
-  -DBACKEND=Scalar \
-%ifarch x86_64
-  -DVECGEOM_VECTOR=sse3 \
-%endif
+  -DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG" \
   -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-  -DCMAKE_CXX_STANDARD=17 \
   -DCMAKE_STATIC_LIBRARY_CXX_FLAGS="%{build_flags}" \
   -DCMAKE_STATIC_LIBRARY_C_FLAGS="%{build_flags}" \
   -DCMAKE_CXX_FLAGS="%{build_flags}" \
   -DCMAKE_C_FLAGS="%{build_flags}" \
-  -DGEANT4=OFF
+%ifarch x86_64
+%if "%{vecgeom_backend}" == "Vc"
+  -DVECGEOM_VECTOR=sse3 \
+%endif
+%endif
+  -DVECGEOM_NO_SPECIALIZATION=ON \
+  -DVECGEOM_BUILTIN_VECCORE=ON \
+  -DVECGEOM_BACKEND=%{vecgeom_backend} \
+  -DVECGEOM_GEANT4=OFF \
+  -DVECGEOM_ROOT=OFF
 
 make %{makeprocesses} VERBOSE=1