From 1e824f65eaf21fdab3ba781fa3b92d7e849e434d Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Mon, 20 May 2019 09:57:23 +0200 Subject: [PATCH 1/2] Updated root to tip of branch v6-14-00-patches --- root.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/root.spec b/root.spec index b56b5afb9b3..46bd2038a41 100644 --- a/root.spec +++ b/root.spec @@ -2,8 +2,8 @@ ## INITENV +PATH PYTHON27PATH %{i}/lib ## INITENV +PATH PYTHON3PATH %{i}/lib ## INITENV SET ROOTSYS %{i} -%define tag c99f334c8d6bd505f4f0e453dcc654a938020e10 -%define branch cms/v6-14-00-patches/94610d9 +%define tag 4766a6c55c0d030dfe0abcd15604a66f2dd6ddc8 +%define branch cms/v6-14-00-patches/c22a273 %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 ea38daed5fbdced55f09390b73e9285fd22f5dcc Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 20 May 2019 10:02:22 +0200 Subject: [PATCH 2/2] build rules updated: latest root look for pcm is same directory as the library --- scram-project-build.file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scram-project-build.file b/scram-project-build.file index a71911935ab..d7af27d6ec1 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -64,7 +64,7 @@ Requires: glibc %endif %if "%{?configtag:set}" != "set" -%define configtag V05-08-38 +%define configtag V05-08-50 %endif %if "%{?cvssrc:set}" != "set"