Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to Lmod/7.7.31-f4df153, change to opt-in for settarg & help some rpmlint warnings #111

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Bump to Lmod/7.7.31-f4df153, change to opt-in for settarg & help some rpmlint warnings #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5045ba9
Bump to Lmod/7.7.29-a217695
fgeorgatos May 2, 2018
bc41d79
Update Lmod.yml
fgeorgatos May 2, 2018
b2a2fd9
rpmlint fixes, silence errors W: macro-in-comment
fgeorgatos May 2, 2018
9539312
rpmlint fixes, silence error W: non-standard-group
fgeorgatos May 2, 2018
1f40cc6
rpmlint fixes, silence error W: setup-not-quiet
fgeorgatos May 2, 2018
7146c23
Bump to Lmod/7.7.31-f4df153
fgeorgatos May 9, 2018
9b13662
bump to Lmod/7.7.32-a24bfd0
fgeorgatos May 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Lmod-illumina.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.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)
Expand All @@ -21,7 +21,7 @@
%define git_rev %(git rev-list HEAD --first-parent | wc -l)
%endif

%define git_tag 22d224b
%define git_tag a24bfd0
%define lmod_upstream_gitid git-%{git_tag}

%if %{rhel6_based}
Expand All @@ -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
Expand All @@ -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)
Expand All @@ -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

Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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}
2 changes: 1 addition & 1 deletion test/etc/profile.definitions/site/Lmod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down