Notification time stamped 2019-11-30 18:50:39 UTC
From c84a9d074ff64260dd584a5a12117271d92139e8 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)nwra.com>
Date: Nov 30 2019 18:50:33 +0000
Subject: Update to 8.2.7 (bz#1777262)
Make 00-modulepath.sh return 0
Make sure /etc/profile.d/modules.sh has $MODULEPATH (#1461656)
---
diff --git a/.gitignore b/.gitignore
index 013633f..67529a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,4 @@
/Lmod-7.8.6.tar.gz
/Lmod-7.8.9.tar.gz
/Lmod-7.8.16.tar.gz
+/Lmod-8.2.7.tar.gz
diff --git a/Lmod.spec b/Lmod.spec
index dcebb47..77d47af 100644
--- a/Lmod.spec
+++ b/Lmod.spec
@@ -3,22 +3,23 @@
%global debug_package %{nil}
Name: Lmod
-Version: 7.8.16
+Version: 8.2.7
Release: 1%{?dist}
Summary: Environmental Modules System in Lua
# Lmod-5.3.2/tools/base64.lua is LGPLv2
License: MIT and LGPLv2
URL:
https://www.tacc.utexas.edu/tacc-projects/lmod
-Source0:
https://github.com/TACC/Lmod/archive/%{version}.tar.gz#/Lmod-%{version}.t...
+Source0:
https://github.com/TACC/Lmod/archive/%{version}/Lmod-%{version}.tar.gz
Source1: macros.%{name}
BuildRequires: gcc
+BuildRequires: lua-devel
BuildRequires: lua-filesystem
BuildRequires: lua-json
BuildRequires: lua-posix
BuildRequires: lua-term
-BuildRequires: tcl
+BuildRequires: tcl-devel
BuildRequires: zsh
Requires: lua-filesystem
Requires: lua-json
@@ -29,7 +30,7 @@ Requires: /bin/ps
%else
Requires: /usr/bin/ps
%endif
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
Requires(post): coreutils
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives
@@ -48,8 +49,8 @@ where the library and header files can be found.
%prep
%setup -q
sed -i -e 's,/usr/bin/env ,/usr/bin/,' src/*.tcl
-# Remove bundled lua-term
-rm -r pkgs tools/json.lua
+# Remove bundled lua-filesystem and lua-term
+rm -r pkgs/{luafilesystem,term} tools/json.lua
#sed -i -e 's, pkgs , ,' Makefile.in
# Remove unneeded shbangs
sed -i -e '/^#!/d' init/*.in
@@ -67,22 +68,34 @@ sed -i -e '/^#!/d' init/*.in
%install
%make_install
# init scripts are sourced
-chmod -x %{buildroot}%{_datadir}/lmod/%{version}/init/*
+find %{buildroot}%{_datadir}/lmod/%{version}/init -type f -exec chmod -x {} +
mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
mkdir -p %{buildroot}%{_datadir}/modulefiles
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
# Setup for alternatives on Fedora
touch %{buildroot}%{_sysconfdir}/profile.d/modules.{csh,sh}
%endif
# Fedora defaults
-echo '[ -z "$MODULEPATH" ] && [ "$(readlink
/etc/alternatives/modules.sh)" = "/usr/share/lmod/lmod/init/profile" -o -f
/etc/profile.d/z00_lmod.sh ] && export
MODULEPATH=%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles' >
%{buildroot}%{_sysconfdir}/profile.d/00-modulepath.sh
+cat <<'EOF' > %{buildroot}%{_sysconfdir}/profile.d/00-modulepath.sh
+[ -z "$MODULEPATH" ] &&
+ [ "$(readlink /etc/alternatives/modules.sh)" =
"/usr/share/lmod/lmod/init/profile" -o -f /etc/profile.d/z00_lmod.sh ]
&&
+ export MODULEPATH=%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles || :
+EOF
+
cat << 'EOF' > %{buildroot}%{_sysconfdir}/profile.d/00-modulepath.csh
if (! $?MODULEPATH && ( `readlink /etc/alternatives/modules.csh` ==
/usr/share/lmod/lmod/init/cshrc || -f /etc/profile.d/z00_lmod.csh ) ) then
setenv MODULEPATH %{_sysconfdir}/modulefiles:%{_datadir}/modulefiles
endif
EOF
-%if 0%{?rhel}
+
+# Add a snippet to make sure that the 00-modulepath.* is included, when
+# the user calls /etc/profile.d/modules.sh directly, just below
+# the shbang line.
+sed -i '2i\. /etc/profile.d/00-modulepath.sh\n' \
+ %{buildroot}%{_datadir}/lmod/lmod/init/profile
+
+%if 0%{?rhel} && 0%{?rhel} < 8
# Install profile links to override environment-modules
ln -s %{_datadir}/lmod/lmod/init/profile
%{buildroot}%{_sysconfdir}/profile.d/z00_lmod.sh
ln -s %{_datadir}/lmod/lmod/init/cshrc %{buildroot}%{_sysconfdir}/profile.d/z00_lmod.csh
@@ -92,7 +105,7 @@ install -Dpm 644 %{SOURCE1} %{buildroot}/%{macrosdir}/macros.%{name}
# TODO - contrib
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
%post
# Cleanup from pre-alternatives
[ ! -L %{_sysconfdir}/profile.d/modules.sh ] && rm -f
%{_sysconfdir}/profile.d/modules.sh
@@ -113,7 +126,7 @@ fi
%{_sysconfdir}/modulefiles
%config(noreplace) %{_sysconfdir}/profile.d/00-modulepath.csh
%config(noreplace) %{_sysconfdir}/profile.d/00-modulepath.sh
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 8
%ghost %{_sysconfdir}/profile.d/modules.csh
%ghost %{_sysconfdir}/profile.d/modules.sh
%else
@@ -126,6 +139,11 @@ fi
%changelog
+* Sat Nov 30 2019 Orion Poplawski <orion(a)nwra.com> - 8.2.7-1
+- Update to 8.2.7 (bz#1777262)
+- Make 00-modulepath.sh return 0
+- Make sure /etc/profile.d/modules.sh has $MODULEPATH (#1461656)
+
* Sat Feb 2 2019 Orion Poplawski <orion(a)cora.nwra.com> - 7.8.16-1
- Update to 7.8.16
diff --git a/sources b/sources
index 6eb8c53..2614fed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Lmod-7.8.16.tar.gz) =
666352410af32286abd43bd3c8ad537d3188354a70d9bfd29a2d2b707b77310cff2250ab80a23d730278147ea2c467a3b2ab2bf71e774040e2cff7f8225042dd
+SHA512 (Lmod-8.2.7.tar.gz) =
bebc6dab3516d997226c07afd5fb5d8cfeb8f754cbee2f836bedb37077105657a9d9fe62ffcd2adc108d17aba4baa7d7983833bb4c743a5cedb93bf3a34bc8c1
https://src.fedoraproject.org/rpms/Lmod/c/c84a9d074ff64260dd584a5a1211727...