From 578ccf2d7db1595c952997d0f3c75d8c390b2d03 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Wed, 31 Mar 2021 17:24:45 +0200 Subject: [PATCH 1/5] Updated root to tip of branch master --- root.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root.spec b/root.spec index ae6a72d0217..34d742ae02c 100644 --- a/root.spec +++ b/root.spec @@ -3,8 +3,8 @@ ## INITENV +PATH PYTHON3PATH %{i}/lib ## INITENV SET ROOTSYS %{i} -%define tag 3d485ea9925a0bcf7e7a9132aac3237ca3ffa185 -%define branch cms/master/6df3488 +%define tag d2d415b0ec291841baa61c9f891764d91a43513e +%define branch cms/master/f078957 %define github_user cms-sw Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz From ce3892e5f21758b37cb7f091fa24248a704eff0a Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Wed, 31 Mar 2021 17:26:30 +0200 Subject: [PATCH 2/5] lets build in release mode --- root.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root.spec b/root.spec index 34d742ae02c..f3aa8245376 100644 --- a/root.spec +++ b/root.spec @@ -40,7 +40,7 @@ export CXXFLAGS=-D__ROOFIT_NOBANNER cmake ../%{n}-%{realversion} \ -G Ninja \ - -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_BUILD_TYPE=Release \ -DLLVM_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="%{i}" \ -DCMAKE_C_COMPILER=gcc \ From b452b8e88e6dbae28330789f3b982dd915d92d40 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Wed, 31 Mar 2021 19:05:37 +0200 Subject: [PATCH 3/5] update dd4hep to v01-16-01 --- dd4hep.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dd4hep.spec b/dd4hep.spec index 16eaea07968..fe22c15a6e2 100644 --- a/dd4hep.spec +++ b/dd4hep.spec @@ -1,6 +1,6 @@ -### RPM external dd4hep v01-16x +### RPM external dd4hep v01-16-01 -%define tag v01-16 +%define tag %{realversion} %define branch master %define github_user AIDASoft %define keep_archives true From 36d685aaf02671e7e353bae820ac26c4919736b7 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Thu, 1 Apr 2021 07:35:07 +0200 Subject: [PATCH 4/5] Update root.spec --- root.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root.spec b/root.spec index f3aa8245376..34d742ae02c 100644 --- a/root.spec +++ b/root.spec @@ -40,7 +40,7 @@ export CXXFLAGS=-D__ROOFIT_NOBANNER cmake ../%{n}-%{realversion} \ -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=Debug \ -DLLVM_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="%{i}" \ -DCMAKE_C_COMPILER=gcc \ From 624569252b7f7cbde6f535c0653c4e2fb9ff1a20 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Fri, 2 Apr 2021 12:16:47 +0200 Subject: [PATCH 5/5] update to 0aa77ef --- root.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root.spec b/root.spec index 34d742ae02c..2b3452863aa 100644 --- a/root.spec +++ b/root.spec @@ -3,8 +3,8 @@ ## INITENV +PATH PYTHON3PATH %{i}/lib ## INITENV SET ROOTSYS %{i} -%define tag d2d415b0ec291841baa61c9f891764d91a43513e -%define branch cms/master/f078957 +%define tag 69023f04f113e686cb65da9f5ba4b67dc1d60137 +%define branch cms/master/0aa77ef %define github_user cms-sw Source: git+https://github.com/%{github_user}/root.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz