diff --git a/SCRAMV1.spec b/SCRAMV1.spec index 4ea0434f92c..5a6c00e7e37 100644 --- a/SCRAMV1.spec +++ b/SCRAMV1.spec @@ -1,4 +1,4 @@ -### RPM lcg SCRAMV1 V3_00_61 +### RPM lcg SCRAMV1 V3_00_62 ## NOCOMPILER ## NO_VERSION_SUFFIX @@ -66,7 +66,6 @@ if [ ! -d $RPM_INSTALL_PREFIX/etc/scramrc ] ; then echo 'CMSSW=$SCRAM_ARCH/cms/cmssw/CMSSW_*' > $RPM_INSTALL_PREFIX/etc/scramrc/cmssw.map echo 'CMSSW=$SCRAM_ARCH/cms/cmssw-patch/CMSSW_*' > $RPM_INSTALL_PREFIX/etc/scramrc/cmssw-patch.map echo 'CORAL=$SCRAM_ARCH/cms/coral/CORAL_*' > $RPM_INSTALL_PREFIX/etc/scramrc/coral.map - [ ! -f $RPM_INSTALL_PREFIX/%{OldDB} ] || grep '%{OldDB} *$' $RPM_INSTALL_PREFIX/%{OldDB} | awk '{print $2}' | sed 's|%{OldDB}.*||' > $RPM_INSTALL_PREFIX/etc/scramrc/links.db fi touch $RPM_INSTALL_PREFIX/etc/scramrc/site.cfg diff --git a/SCRAMV2.spec b/SCRAMV2.spec index f02afe08133..1ca0f7ddaa0 100644 --- a/SCRAMV2.spec +++ b/SCRAMV2.spec @@ -1,4 +1,4 @@ -### RPM lcg SCRAMV2 V2_2_9_pre17 +### RPM lcg SCRAMV2 V2_2_9_pre19 ## NOCOMPILER ## NO_VERSION_SUFFIX @@ -9,7 +9,7 @@ Provides: perl(BuildSystem::TemplateStash) Provides: perl(Cache::CacheUtilities) Provides: perl(BuildSystem::ToolManager) -%define tag fce83e9b457c3c34373e4e2c1eec7854f33e17fa +%define tag 158cdbe2c93768caf002fdb06e9c51ce6c5c1b56 %define branch SCRAMV2 %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 @@ -63,14 +63,6 @@ echo "SCRAMV1_VERSION='%v'" >> $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init. echo "set SCRAMV1_ROOT='$CMS_INSTALL_PREFIX/%{pkgrel}'" > $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh echo "set SCRAMV1_VERSION='%v'" >> $RPM_INSTALL_PREFIX/%{pkgrel}/etc/profile.d/init.csh -if [ ! -d $RPM_INSTALL_PREFIX/etc/scramrc ] ; then - mkdir -p $RPM_INSTALL_PREFIX/etc/scramrc - touch $RPM_INSTALL_PREFIX/etc/scramrc/links.db - echo 'CMSSW=$SCRAM_ARCH/cms/cmssw/CMSSW_*' > $RPM_INSTALL_PREFIX/etc/scramrc/cmssw.map - echo 'CMSSW=$SCRAM_ARCH/cms/cmssw-patch/CMSSW_*' > $RPM_INSTALL_PREFIX/etc/scramrc/cmssw-patch.map - echo 'CORAL=$SCRAM_ARCH/cms/coral/CORAL_*' > $RPM_INSTALL_PREFIX/etc/scramrc/coral.map -fi - if [ ! -d $RPM_INSTALL_PREFIX/%{cmsplatf}/%{scramv1_dir} ] ; then mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}/%{scramv1_dir} rsync --links --ignore-existing --recursive $RPM_INSTALL_PREFIX/%{pkgrel}/ $RPM_INSTALL_PREFIX/%{cmsplatf}/%{scramv1_dir}/ diff --git a/scram-project-build.file b/scram-project-build.file index 7b4fd81e14f..0d5c25a0093 100644 --- a/scram-project-build.file +++ b/scram-project-build.file @@ -55,7 +55,7 @@ BuildRequires: dwz %endif %if "%{?configtag:set}" != "set" -%define configtag V09-00-02 +%define configtag V09-01-03 %endif %if "%{?buildarch:set}" != "set" diff --git a/scram-tools.file/tools/gcc/gcc-cxxcompiler.xml b/scram-tools.file/tools/gcc/gcc-cxxcompiler.xml index 749388db433..44b9138cc6f 100644 --- a/scram-tools.file/tools/gcc/gcc-cxxcompiler.xml +++ b/scram-tools.file/tools/gcc/gcc-cxxcompiler.xml @@ -24,7 +24,10 @@ - + + + + diff --git a/scram-tools.file/tools/gsl/gsl.xml b/scram-tools.file/tools/gsl/gsl.xml index a8e512acfd8..67395d9dd12 100644 --- a/scram-tools.file/tools/gsl/gsl.xml +++ b/scram-tools.file/tools/gsl/gsl.xml @@ -7,6 +7,7 @@ +