From 9facee94b8492e8aaaad078d7c90182ebc033de8 Mon Sep 17 00:00:00 2001
From: Mircho Rodozov <mrodozov@cern.ch>
Date: Mon, 11 May 2020 18:16:54 +0300
Subject: [PATCH 1/4] [ROOT master] Get latest commits

please test with https://github.com/cms-sw/root/pull/139, cms-sw/cmssw#29740
---
 root.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index 37041de1314..2224badc734 100644
--- a/root.spec
+++ b/root.spec
@@ -3,8 +3,8 @@
 ## INITENV +PATH PYTHON3PATH %{i}/lib
 ## INITENV SET ROOTSYS %{i}
 
-%define tag 384e06fed3d7305d8d438c34399d6e6e327256de
-%define branch cms/master/73ae672
+%define tag a2847019732b1b02e0cb1e437b4b9f4c913ddee1
+%define branch cms/master/e2c9e16
 %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 d410f82dfabde83e1904e389d5b7fa0d690e4a0b Mon Sep 17 00:00:00 2001
From: Mircho Rodozov <mrodozov@cern.ch>
Date: Tue, 12 May 2020 16:43:10 +0300
Subject: [PATCH 2/4] Update root.spec

---
 root.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/root.spec b/root.spec
index 2224badc734..367e2724328 100644
--- a/root.spec
+++ b/root.spec
@@ -3,8 +3,8 @@
 ## INITENV +PATH PYTHON3PATH %{i}/lib
 ## INITENV SET ROOTSYS %{i}
 
-%define tag a2847019732b1b02e0cb1e437b4b9f4c913ddee1
-%define branch cms/master/e2c9e16
+%define tag 25351d7377004cf2773b40f13028f80af8801ab9
+%define branch cms/master/cebff1e
 %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 95c914cb0722916dcd8aa80b8e13a1d203ec6191 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Tue, 12 May 2020 21:46:31 +0200
Subject: [PATCH 3/4] relocate for python path

---
 root.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/root.spec b/root.spec
index 367e2724328..08609477295 100644
--- a/root.spec
+++ b/root.spec
@@ -183,3 +183,7 @@ rm -rf build
 
 %post
 %{relocateConfig}etc/cling/llvm/Config/llvm-config.h
+for p in $(grep -rlI -m1 '^#\!.*python' $RPM_INSTALL_PREFIX/%{pkgrel}/bin) ; do
+  lnum=$(grep -n -m1 '^#\!.*python' $p | sed 's|:.*||')
+  sed -i -e "${lnum}c#!/usr/bin/env python" $p
+done

From 50959f2f10101380f9a2ef18f9fb4fba6ab5ebb9 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Wed, 13 May 2020 04:20:44 +0200
Subject: [PATCH 4/4] Update root.spec

---
 root.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/root.spec b/root.spec
index 08609477295..d929b1c27bc 100644
--- a/root.spec
+++ b/root.spec
@@ -173,8 +173,12 @@ export ROOTSYS="%{i}"
 ninja -v %{makeprocesses} -l $(getconf _NPROCESSORS_ONLN) install
 
 find %{i} -type f -name '*.py' | xargs chmod -x
-grep -R -l '#!.*python' %{i} | xargs chmod +x
+grep -rlI '#!.*python' %{i} | xargs chmod +x
 perl -p -i -e "s|#!/bin/perl|#!/usr/bin/env perl|" %{i}/bin/memprobe
+for p in $(grep -rlI -m1 '^#\!.*python' %i/bin) ; do
+  lnum=$(grep -n -m1 '^#\!.*python' $p | sed 's|:.*||')
+  sed -i -e "${lnum}c#!/usr/bin/env python" $p
+done
 
 #Make sure root build directory is not available after the root install is done
 #This will catch errors if root remembers the build paths.
@@ -183,7 +187,3 @@ rm -rf build
 
 %post
 %{relocateConfig}etc/cling/llvm/Config/llvm-config.h
-for p in $(grep -rlI -m1 '^#\!.*python' $RPM_INSTALL_PREFIX/%{pkgrel}/bin) ; do
-  lnum=$(grep -n -m1 '^#\!.*python' $p | sed 's|:.*||')
-  sed -i -e "${lnum}c#!/usr/bin/env python" $p
-done