diff --git a/geant4-G4ABLA.spec b/geant4-G4ABLA.spec index c965c630107..c8bbe130c5e 100644 --- a/geant4-G4ABLA.spec +++ b/geant4-G4ABLA.spec @@ -1,4 +1,4 @@ -### RPM external geant4-G4ABLA 3.1 +### RPM external geant4-G4ABLA 3.3 %define G4RunTime G4ABLADATA ## IMPORT geant4-data-rpm diff --git a/geant4-G4EMLOW.spec b/geant4-G4EMLOW.spec index cce98cd813e..a589c59caf3 100644 --- a/geant4-G4EMLOW.spec +++ b/geant4-G4EMLOW.spec @@ -1,4 +1,4 @@ -### RPM external geant4-G4EMLOW 8.2 +### RPM external geant4-G4EMLOW 8.5 %define G4RunTime G4LEDATA %define source0 https://geant4-data.web.cern.ch/datasets/G4EMLOW.%{realversion}.tar.gz diff --git a/geant4-G4INCL.spec b/geant4-G4INCL.spec index fb2462ea979..7821cc8eab5 100644 --- a/geant4-G4INCL.spec +++ b/geant4-G4INCL.spec @@ -1,4 +1,4 @@ -### RPM external geant4-G4INCL 1.0 +### RPM external geant4-G4INCL 1.2 %define G4RunTime G4INCLDATA ## IMPORT geant4-data-rpm diff --git a/geant4-G4NDL.spec b/geant4-G4NDL.spec index 2bd873229fd..d5b16c8c09d 100644 --- a/geant4-G4NDL.spec +++ b/geant4-G4NDL.spec @@ -1,4 +1,4 @@ -### RPM external geant4-G4NDL 4.6 +### RPM external geant4-G4NDL 4.7 %define G4RunTime G4NEUTRONHPDATA ## IMPORT geant4-data-rpm diff --git a/geant4.spec b/geant4.spec index 8122a195237..fe16db9b105 100644 --- a/geant4.spec +++ b/geant4.spec @@ -1,8 +1,8 @@ -### RPM external geant4 11.2.cand02 +### RPM external geant4 11.2.0 ## INCLUDE compilation_flags ## INCLUDE compilation_flags_lto ## INCLUDE cpp-standard -%define tag ee28eac6629f74fc60a352c488a33837b09b55a2 +%define tag 860a2b92bff1fbd70bc77cf7b43f8558634763b2 %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 @@ -34,9 +34,6 @@ fi rm -rf ../build mkdir ../build cd ../build -%if %{use_vecgeom} -export VecGeom_DIR=${VECGEOM_ROOT}/lib/cmake/VecGeom -%endif cmake ../%{n}.%{realversion} \ -DCMAKE_CXX_COMPILER="g++" \ @@ -53,6 +50,8 @@ cmake ../%{n}.%{realversion} \ -DGEANT4_BUILD_BUILTIN_BACKTRACE=OFF \ %if %{use_vecgeom} -DGEANT4_USE_USOLIDS="all" \ + -DVecGeom_DIR=${VECGEOM_ROOT}/lib64/cmake/VecGeom \ + -DVecCore_DIR=${VECGEOM_ROOT}/lib64/cmake/VecCore \ %endif -DBUILD_SHARED_LIBS=ON \ -DBUILD_STATIC_LIBS=ON \ diff --git a/vecgeom.spec b/vecgeom.spec index f64e3a0ecb9..deadd961572 100644 --- a/vecgeom.spec +++ b/vecgeom.spec @@ -1,12 +1,13 @@ -### RPM external vecgeom v1.2.1 +### RPM external vecgeom v1.2.7 ## INCLUDE compilation_flags ## INCLUDE compilation_flags_lto ## INCLUDE cpp-standard -%define tag 12fc8ba12efe93de5aaa9ff8e51e093ae93a1633 +%define tag be99ff9e6b26fa5e0063f8bd21df23cb87911bf8 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 +%define vecgeom_version %(echo %{realversion} | sed -e 's|^v||;s|-.*||') Patch0: vecgeom-fix-vector %define build_flags %{?arch_build_flags} %{?lto_build_flags} %{?pgo_build_flags} @@ -22,6 +23,7 @@ mkdir ../build cd ../build cmake ../%{n}-%{realversion} \ + -DVecGeom_GIT_DESCRIBE="%{vecgeom_version};;" \ -DCMAKE_INSTALL_PREFIX=%{i} \ -DCMAKE_CXX_STANDARD:STRING="%{cms_cxx_standard}" \ -DCMAKE_AR=$(which gcc-ar) \