From ca04fd53e3ff16df00d122bdbc15362ea4e90068 Mon Sep 17 00:00:00 2001
From: Mircho Rodozov <mrodozov@cern.ch>
Date: Fri, 15 Jan 2021 00:01:04 +0200
Subject: [PATCH 1/3] Update DD4Hep to latest on master

---
 dd4hep.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dd4hep.spec b/dd4hep.spec
index 479614b7480..ef6fc9fcc30 100644
--- a/dd4hep.spec
+++ b/dd4hep.spec
@@ -1,6 +1,6 @@
-### RPM external dd4hep v01-14x
+### RPM external dd4hep v01-15x
 
-%define tag 934ce101148be15cce7725caad8c25084a272938
+%define tag 12caacb209af70835dbdd48efa7ef8d0b77b3dcd
 %define branch master
 %define github_user AIDASoft
 %define keep_archives true
@@ -24,6 +24,7 @@ CMAKE_ARGS="-DCMAKE_INSTALL_PREFIX='%{i}' \
       -DCMAKE_CXX_STANDARD=17 \
       -DCMAKE_BUILD_TYPE=Release \
       -DDD4HEP_USE_TBB=ON \
+      -DDD4HEP_USE_GEANT4_UNITS=ON \
       -DCMAKE_PREFIX_PATH=${TBB_ROOT}/cmake/TBB;${CLHEP_ROOT};${XERCES_C_ROOT}"
 
 #Build normal Shared D4Hep without Geant4

From ebac4e41cfb6f93f375245a2f16f1d8ff5a392d5 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Wed, 20 Jan 2021 08:56:44 +0100
Subject: [PATCH 2/3] Update dd4hep-toolfile.spec

---
 dd4hep-toolfile.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dd4hep-toolfile.spec b/dd4hep-toolfile.spec
index 0941f7c07e9..b4b3f716ad4 100644
--- a/dd4hep-toolfile.spec
+++ b/dd4hep-toolfile.spec
@@ -21,6 +21,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/dd4hep-core.xml
   </client>
   <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
   <runtime name="PATH" value="$DD4HEP_CORE_BASE/bin" type="path"/>
+  <flags cppdefines="DD4HEP_USE_GEANT4_UNITS=1"/>
   <use name="root_cxxdefaults"/>
   <use name="root"/>
   <use name="boost"/>

From a118fed1445a66b28435f26343037be1f2243af2 Mon Sep 17 00:00:00 2001
From: Mircho Rodozov <mrodozov@cern.ch>
Date: Tue, 26 Jan 2021 01:00:26 +0200
Subject: [PATCH 3/3] remove tbb and path to it

---
 dd4hep.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dd4hep.spec b/dd4hep.spec
index ef6fc9fcc30..2bcaedc66e6 100644
--- a/dd4hep.spec
+++ b/dd4hep.spec
@@ -23,9 +23,8 @@ CMAKE_ARGS="-DCMAKE_INSTALL_PREFIX='%{i}' \
       -DDD4HEP_USE_PYROOT=ON \
       -DCMAKE_CXX_STANDARD=17 \
       -DCMAKE_BUILD_TYPE=Release \
-      -DDD4HEP_USE_TBB=ON \
       -DDD4HEP_USE_GEANT4_UNITS=ON \
-      -DCMAKE_PREFIX_PATH=${TBB_ROOT}/cmake/TBB;${CLHEP_ROOT};${XERCES_C_ROOT}"
+      -DCMAKE_PREFIX_PATH=${CLHEP_ROOT};${XERCES_C_ROOT}"
 
 #Build normal Shared D4Hep without Geant4
 rm -rf ../build; mkdir ../build; cd ../build