remove redundant patch and patch the other patch :)

cms-sw · Oct 20, 2020 · 6a39ccb · 6a39ccb
1 parent 6877dc2
commit 6a39ccb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/vecgeom-fix-for-arm64.patch b/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)

diff --git a/vecgeom-fix-vector.patch b/vecgeom-fix-vector.patch
diff --git a/vecgeom.spec b/vecgeom.spec
@@ -1,16 +1,16 @@
 ### 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
 
 Patch0: vecgeom-fix-for-arm64
-Patch1: vecgeom-fix-vector
 
 %prep
 %setup -n %{n}-%{realversion}
 
 %patch0 -p1
-%patch1 -p1
 
 %build
 rm -rf ../build