diff --git a/sources b/sources index bbefa64..6aace70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (VecGeom-v1.2.7.tar.bz2) = 0e23760554c77a0021bad3fe97d2e8f83e2415939e765230c01deb72a2529dc2c954e992c834a1fe5c80480ea3cae3c127ab786b69f38550d315832965ebe991 +SHA512 (VecGeom-v2.0.0.tar.bz2) = 350ff9cbbdc011133fa29bfac2c65ac41f4a98d766f03c66be9f5059f80d2d55784b674c8108a9d9247d29bf11b8e0a459b7e127b6e798488be053bdb9f332b0 diff --git a/vecgeom-add-soversion.patch b/vecgeom-add-soversion.patch index adb7141..fa677dc 100644 --- a/vecgeom-add-soversion.patch +++ b/vecgeom-add-soversion.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8654407..4c3070c 100644 +index c75d548..6a4aa61 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -594,6 +594,10 @@ add_library(vecgeom - ${PROJECT_BINARY_DIR}/VecGeom/base/Version.h +@@ -818,6 +818,10 @@ cuda_rdc_add_library(vecgeom ${VECGEOM_COMMON_SRCS} - ${VECGEOM_CPPONLY_SRCS}) + ${VECGEOM_CPPONLY_SRCS} + ${VECGEOM_CUDA_SRCS}) +set_target_properties(vecgeom + PROPERTIES + VERSION ${PROJECT_VERSION} @@ -14,7 +14,7 @@ index 8654407..4c3070c 100644 # Add compile options that vecgeom clients must compile their code using Vecgeom diff --git a/persistency/gdml/source/CMakeLists.txt b/persistency/gdml/source/CMakeLists.txt -index 9f67409..ec5dda2 100644 +index 2af3e52..37ab409 100644 --- a/persistency/gdml/source/CMakeLists.txt +++ b/persistency/gdml/source/CMakeLists.txt @@ -19,7 +19,10 @@ add_library(vgdml diff --git a/vecgeom.spec b/vecgeom.spec index 5cf2745..9482d76 100644 --- a/vecgeom.spec +++ b/vecgeom.spec @@ -1,7 +1,7 @@ %bcond_without check %global forgeurl https://gitlab.cern.ch/VecGeom/VecGeom -Version: 1.2.7 +Version: 2.0.0 %global tag v%{version} %forgemeta @@ -16,8 +16,6 @@ Summary: A vectorized geometry library for particle-detector simulation License: Apache-2.0 AND MIT AND (Apache-2.0 OR MIT) URL: %{forgeurl} Source0: %{forgesource} -# add soversion to the library -# modified from https://gitlab.cern.ch/VecGeom/VecGeom/-/merge_requests/889 Patch0: vecgeom-add-soversion.patch BuildRequires: gcc-c++ @@ -47,9 +45,8 @@ The %{name}-devel package contains development files for %{name}. %build %cmake \ -GNinja \ - -DCMAKE_BUILD_TYPE=Release \ -DVECGEOM_GDML=ON \ - + -DCMAKE_SKIP_INSTALL_RPATH=ON %cmake_build %install @@ -66,8 +63,8 @@ The %{name}-devel package contains development files for %{name}. %files %license LICENSE.txt APACHE-LICENSE-2.0.txt %doc README.md -%{_libdir}/libvecgeom.so.1.2* -%{_libdir}/libvgdml.so.1.2* +%{_libdir}/libvecgeom.so.2* +%{_libdir}/libvgdml.so.2* %files devel %{_includedir}/VecGeom/