Rebase to environment-modules 5.3.0
Resolves: rhbz#2207885
This commit is contained in:
parent
53726c9955
commit
07f6b562cb
1
.gitignore
vendored
1
.gitignore
vendored
@ -31,3 +31,4 @@ modules-3.2.8.tar.bz2
|
||||
/modules-5.0.0-alpha.tar.bz2
|
||||
/modules-5.0.0.tar.bz2
|
||||
/modules-5.0.1.tar.bz2
|
||||
/modules-5.3.0.tar.bz2
|
||||
|
@ -1,18 +0,0 @@
|
||||
diff --git a/init/profile.sh.in b/init/profile.sh.in
|
||||
index faa468639..64d21dbcd 100644
|
||||
--- a/init/profile.sh.in
|
||||
+++ b/init/profile.sh.in
|
||||
@@ -3,7 +3,11 @@
|
||||
# get current shell name by querying shell variables or looking at parent
|
||||
# process name
|
||||
if [ -n "${BASH:-}" ]; then
|
||||
- shell=${BASH##*/}
|
||||
+ if [ "${BASH##*/}" = 'sh' ]; then
|
||||
+ shell='sh'
|
||||
+ else
|
||||
+ shell='bash'
|
||||
+ fi
|
||||
elif [ -n "${ZSH_NAME:-}" ]; then
|
||||
shell=$ZSH_NAME
|
||||
else
|
||||
|
@ -2,16 +2,14 @@
|
||||
%global vimdatadir %{_datadir}/vim/vimfiles
|
||||
|
||||
Name: environment-modules
|
||||
Version: 5.0.1
|
||||
Release: 2%{?dist}
|
||||
Version: 5.3.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Provides dynamic modification of a user's environment
|
||||
|
||||
License: GPLv2+
|
||||
URL: http://modules.sourceforge.net/
|
||||
Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
|
||||
|
||||
Patch1: environment-modules-profilesh-misdetects-login-shell.patch
|
||||
|
||||
BuildRequires: tcl
|
||||
BuildRequires: dejagnu
|
||||
BuildRequires: make
|
||||
@ -72,6 +70,7 @@ have access to the module alias.
|
||||
--vimdatadir=%{vimdatadir} \
|
||||
--enable-multilib-support \
|
||||
--disable-doc-install \
|
||||
--disable-nagelfar-addons \
|
||||
--enable-modulespath \
|
||||
--with-python=/usr/bin/python3 \
|
||||
--with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles \
|
||||
@ -162,6 +161,9 @@ fi
|
||||
%{vimdatadir}/syntax/modulefile.vim
|
||||
|
||||
%changelog
|
||||
* Wed May 17 2023 Lukáš Zaoral <lzaoral@redhat.com> - 5.3.0-1
|
||||
- Rebase to environment-modules 5.3.0 (rhbz#2207885)
|
||||
|
||||
* Thu Sep 22 2022 Lukáš Zaoral <lzaoral@redhat.com> - 5.0.1-2
|
||||
- Fix profile.sh login shell misdetection (#2128975)
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (modules-5.0.1.tar.bz2) = 8dd4b73ad541093bfc224108fc0f598e9b69cb94115c761618c3ee99173143602807fdbe993eaa71806c5408c456ad0a57257f0c3773d3e33bc1749ed9a1a457
|
||||
SHA512 (modules-5.3.0.tar.bz2) = 9d7a4a7f9e44f7e34769be043e49d99b986e8c547cba53de712d7aa73ebf345330b1d08deff0adb1e7f2cd5467eaa90543fc553261cd97463fc41eb85856fd9e
|
||||
|
Loading…
Reference in New Issue
Block a user