From 2aeb0a30c59a26383e9e043594db756bff5b159b Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Fri, 9 Mar 2018 17:00:52 +0100 Subject: [PATCH 1/4] update fastjet-contrib to 1.033 This should resolve the memory leak issue https://github.com/cms-externals/fastjet-contrib/issues/14 --- fastjet-contrib.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastjet-contrib.spec b/fastjet-contrib.spec index 0360108c663..c60a998757b 100644 --- a/fastjet-contrib.spec +++ b/fastjet-contrib.spec @@ -1,5 +1,5 @@ -### RPM external fastjet-contrib 1.032 -%define tag 6000f18568bd2f03fb6bbb89cedf0baeed5344ad +### RPM external fastjet-contrib 1.033 +%define tag f16517fb133aeefd6ba10627a37208b2d0a6d947 %define branch cms/v%{realversion} %define github_user cms-externals Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&foo=1&output=/%{n}-%{realversion}.tgz From d44d1d3f186907b2bb1107e058f1a0f6ca2a60be Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Sat, 10 Mar 2018 10:35:15 +0100 Subject: [PATCH 2/4] fastjet-contrib: updated to tip of cms/v1.033 branch --- fastjet-contrib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastjet-contrib.spec b/fastjet-contrib.spec index c60a998757b..de838e70afb 100644 --- a/fastjet-contrib.spec +++ b/fastjet-contrib.spec @@ -1,5 +1,5 @@ ### RPM external fastjet-contrib 1.033 -%define tag f16517fb133aeefd6ba10627a37208b2d0a6d947 +%define tag 1ab32a0f646781c2104f52121172a8d3c3507125 %define branch cms/v%{realversion} %define github_user cms-externals Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&foo=1&output=/%{n}-%{realversion}.tgz From 5f8add36e48b426c4148f4756f5b011b4b746433 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 12 Mar 2018 14:54:44 +0100 Subject: [PATCH 3/4] Update fastjet-contrib.spec --- fastjet-contrib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastjet-contrib.spec b/fastjet-contrib.spec index de838e70afb..6b6962d50a3 100644 --- a/fastjet-contrib.spec +++ b/fastjet-contrib.spec @@ -1,5 +1,5 @@ ### RPM external fastjet-contrib 1.033 -%define tag 1ab32a0f646781c2104f52121172a8d3c3507125 +%define tag 69e835bfc3d36adfe70a1355a2773bc05d9f5599 %define branch cms/v%{realversion} %define github_user cms-externals Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&foo=1&output=/%{n}-%{realversion}.tgz From 1f333c05cc5e50a1e8a4c14ac8a24afc0252f2d4 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 12 Mar 2018 16:48:40 +0100 Subject: [PATCH 4/4] dd4hep: clean up dependency (remove py2-rootpy) --- dd4hep.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dd4hep.spec b/dd4hep.spec index 67f0d8ed29a..d64f4767f65 100644 --- a/dd4hep.spec +++ b/dd4hep.spec @@ -8,7 +8,7 @@ Source: git+https://github.com/%{github_user}/DD4hep.git?obj=%{branch}/%{tag}&ex BuildRequires: cmake -Requires: root boost clhep xerces-c py2-rootpy +Requires: root boost clhep xerces-c %prep