From c6699a10af6da7b87b7fb52e2dbffbfb0ed74559 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 22 Oct 2018 11:17:03 +0200 Subject: [PATCH 1/2] Update scram tag V2_2_9_pre00 bug fix: make sure to set default compiler at scram project setup time. --- SCRAMV1.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SCRAMV1.spec b/SCRAMV1.spec index f432d9e9973..ab57303a6e7 100644 --- a/SCRAMV1.spec +++ b/SCRAMV1.spec @@ -1,4 +1,4 @@ -### RPM lcg SCRAMV1 V2_2_8 +### RPM lcg SCRAMV1 V2_2_9_pre00 ## NOCOMPILER BuildRequires: gmake From 6b9ba729492cba34f895b3091100f2b40a243a43 Mon Sep 17 00:00:00 2001 From: Malik Shahzad Muzaffar Date: Mon, 22 Oct 2018 17:52:30 +0200 Subject: [PATCH 2/2] Update SCRAMV1.spec use scram latest commit to build scram --- SCRAMV1.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/SCRAMV1.spec b/SCRAMV1.spec index ab57303a6e7..34ad04e1a04 100644 --- a/SCRAMV1.spec +++ b/SCRAMV1.spec @@ -1,4 +1,4 @@ -### RPM lcg SCRAMV1 V2_2_9_pre00 +### RPM lcg SCRAMV1 V2_2_9_pre01 ## NOCOMPILER BuildRequires: gmake @@ -6,9 +6,11 @@ BuildRequires: gmake Provides: perl(BuildSystem::Template::Plugins::PluginCore) Provides: perl(BuildSystem::TemplateStash) Provides: perl(Cache::CacheUtilities) -%define GitHubVersion %(echo SCRAM-%realversion | sed 's|-V|-|') -Source0: https://github.com/cms-sw/SCRAM/archive/%{realversion}.tar.gz +%define tag eb2a200233e34f2aac87d610f7fd4aa686f3e01c +%define branch master +%define github_user cms-sw +Source: git+https://github.com/%{github_user}/SCRAM.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz %define OldDB /%{cmsplatf}/lcg/SCRAMV1/scramdb/project.lookup %define SCRAM_ALL_VERSIONS V[0-9][0-9]*_[0-9][0-9]*_[0-9][0-9]* @@ -44,7 +46,7 @@ if [ "X%{SCRAM_REL_MINOR}" == "X" ] ; then exit 1 fi -%setup -n %GitHubVersion +%setup -n %{n}-%{realversion} %build gmake %{makeprocesses} all INSTALL_BASE=%{instroot} VERSION=%{realversion} PREFIX=%{i}