From 5045ba9c3ad7b46c4193fab6a6fe86efcfa94f6a Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 2 May 2018 11:40:09 +0100 Subject: [PATCH 1/7] Bump to Lmod/7.7.29-a217695 --- Lmod-illumina.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lmod-illumina.spec b/Lmod-illumina.spec index 4452227..97094ef 100644 --- a/Lmod-illumina.spec +++ b/Lmod-illumina.spec @@ -1,11 +1,11 @@ ## This RPM .spec file will provide a build process for a cluster-ready Lmod: https://github.com/TACC/Lmod -## Please provide feedback about it at collaboration repo: http://github.com/Bright-Computing/bic +## Please provide feedback about it, at the github collaboration repository: http://github.com/Bright-Computing/bic %define cmrelease 7.0 %define release cm7.0 %define name Lmod %define secname Lmod-files -%define version 7.7.24 +%define version 7.7.29 %define debug_package %{nil} %define rhel6_based %(test -e /etc/redhat-release && grep -q -E '(CentOS|Red Hat Enterprise Linux Server|Scientific Linux) release 6' /etc/redhat-release && echo 1 || echo 0) @@ -21,7 +21,7 @@ %define git_rev %(git rev-list HEAD --first-parent | wc -l) %endif -%define git_tag 22d224b +%define git_tag a217695 %define lmod_upstream_gitid git-%{git_tag} %if %{rhel6_based} From bc41d79120363fa978aa5d881428609c3dd58137 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 2 May 2018 11:43:23 +0100 Subject: [PATCH 2/7] Update Lmod.yml deprecate settarg as a default (i.e. make it opt-in, rather than opt-out, to silence it) --- test/etc/profile.definitions/site/Lmod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/etc/profile.definitions/site/Lmod.yml b/test/etc/profile.definitions/site/Lmod.yml index 6493b98..5e1c05a 100644 --- a/test/etc/profile.definitions/site/Lmod.yml +++ b/test/etc/profile.definitions/site/Lmod.yml @@ -3,7 +3,7 @@ LMOD: CACHE: $HOME/.lmod.d/.cache CACHED_LOADS: "yes" RC: /etc/site/lmod/lmodrc.lua - SYSTEM_DEFAULT_MODULES: "settarg use.own.eb sge cluster" # HPCBIOS/2016q2" + SYSTEM_DEFAULT_MODULES: "use.own.eb sge cluster" ## settarg HPCBIOS/2016q2" ADMIN_FILE: /dev/shm/lmod/lmod_admin_file PACKAGE_PATH: /etc/site/lmod USE_DOT_FILES: "yes" From b2a2fd9ad14332f472b174701a0e9899049379d0 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 2 May 2018 12:00:54 +0100 Subject: [PATCH 3/7] rpmlint fixes, silence errors W: macro-in-comment --- Lmod-illumina.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lmod-illumina.spec b/Lmod-illumina.spec index 97094ef..ab1f881 100644 --- a/Lmod-illumina.spec +++ b/Lmod-illumina.spec @@ -58,7 +58,7 @@ Requires: lua-filesystem Requires: lua-json Requires: lua-posix Requires: lua-term -###Requires: cm-config-cm = %cmrelease ### unhash me when all is fine +## Requires: cm-config-cm = %%cmrelease ## unhash me when all is fine Provides: environment(modules) Patch0: lmod-bash-xtrace.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -118,7 +118,7 @@ install -m 644 %{secname}-%{cmrelease}/z00_lmod.sh %{buildroot}/%{_s install -m 644 %{secname}-%{cmrelease}/z00_lmod.csh %{buildroot}/%{_sysconfdir}/profile.d/z00_lmod.csh install -m 644 %{secname}-%{cmrelease}/z01-default_modules.sh %{buildroot}/%{_sysconfdir}/profile.d/z01-default_modules.sh install -m 644 %{secname}-%{cmrelease}/z01-default_modules.csh %{buildroot}/%{_sysconfdir}/profile.d/z01-default_modules.csh -# install -Dpm 644 %{SOURCE1} %{buildroot}/%{macrosdir}/macros.%{name} +# install -Dpm 644 %%{SOURCE1} %%{buildroot}/%%{macrosdir}/macros.%%{name} # Install the contrib directory cp -a contrib %{buildroot}%{_datadir}/lmod/%{version} From 9539312d85ab881c35f6203591982de00ae37e0e Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 2 May 2018 12:07:38 +0100 Subject: [PATCH 4/7] rpmlint fixes, silence error W: non-standard-group --- Lmod-illumina.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lmod-illumina.spec b/Lmod-illumina.spec index ab1f881..53b5d2a 100644 --- a/Lmod-illumina.spec +++ b/Lmod-illumina.spec @@ -36,7 +36,7 @@ Name: %{name} Version: %{version} Release: %{release} Summary: Environmental Modules System in Lua -Group: Utilities/Shell +Group: Unspecified License: MIT and LGPLv2 URL: https://www.tacc.utexas.edu/tacc-projects/lmod Source0: https://github.com/TACC/%{name}/archive/%{version}.tar.gz From 1f40cc62900bfffe69639dc6e91432f03f3735d2 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 2 May 2018 14:36:43 +0200 Subject: [PATCH 5/7] rpmlint fixes, silence error W: setup-not-quiet --- Lmod-illumina.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lmod-illumina.spec b/Lmod-illumina.spec index 53b5d2a..a6f9cb8 100644 --- a/Lmod-illumina.spec +++ b/Lmod-illumina.spec @@ -81,7 +81,7 @@ rm -r pkgs tools/json.lua #sed -i -e 's, pkgs , ,' Makefile.in # Remove unneeded shebangs sed -i -e '/^#!/d' init/*.in -%setup -c -D -T -a 1 +%setup -q -c -D -T -a 1 %patch0 -p1 @@ -162,4 +162,4 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %attr(644, root, root) %{_sysconfdir}/profile.d/z01-default_modules.csh %{_datadir}/lmod %{_datadir}/modulefiles -# %{macrosdir}/macros.%{name} +# %%{macrosdir}/macros.%%{name} From 7146c230782d6bb75525455a058c5a430603f402 Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Wed, 9 May 2018 18:53:07 +0100 Subject: [PATCH 6/7] Bump to Lmod/7.7.31-f4df153 --- Lmod-illumina.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lmod-illumina.spec b/Lmod-illumina.spec index a6f9cb8..c5d2b69 100644 --- a/Lmod-illumina.spec +++ b/Lmod-illumina.spec @@ -5,7 +5,7 @@ %define release cm7.0 %define name Lmod %define secname Lmod-files -%define version 7.7.29 +%define version 7.7.31 %define debug_package %{nil} %define rhel6_based %(test -e /etc/redhat-release && grep -q -E '(CentOS|Red Hat Enterprise Linux Server|Scientific Linux) release 6' /etc/redhat-release && echo 1 || echo 0) @@ -21,7 +21,7 @@ %define git_rev %(git rev-list HEAD --first-parent | wc -l) %endif -%define git_tag a217695 +%define git_tag f4df153 %define lmod_upstream_gitid git-%{git_tag} %if %{rhel6_based} From 9b13662e4cc08eb6b4869ab9de4bc8e08a71431a Mon Sep 17 00:00:00 2001 From: Fotis Georgatos Date: Mon, 14 May 2018 13:29:57 +0100 Subject: [PATCH 7/7] bump to Lmod/7.7.32-a24bfd0 --- Lmod-illumina.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lmod-illumina.spec b/Lmod-illumina.spec index c5d2b69..6d320b6 100644 --- a/Lmod-illumina.spec +++ b/Lmod-illumina.spec @@ -5,7 +5,7 @@ %define release cm7.0 %define name Lmod %define secname Lmod-files -%define version 7.7.31 +%define version 7.7.32 %define debug_package %{nil} %define rhel6_based %(test -e /etc/redhat-release && grep -q -E '(CentOS|Red Hat Enterprise Linux Server|Scientific Linux) release 6' /etc/redhat-release && echo 1 || echo 0) @@ -21,7 +21,7 @@ %define git_rev %(git rev-list HEAD --first-parent | wc -l) %endif -%define git_tag f4df153 +%define git_tag a24bfd0 %define lmod_upstream_gitid git-%{git_tag} %if %{rhel6_based}