rpms/environment-modules
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: rpms:c8
Branches Tags
rpms:c8
rpms:c10-beta
rpms:c10s
rpms:c9
rpms:c8-beta
rpms:c9-beta
rpms:c9s
rpms:c8s
rpms:imports/c10-beta/environment-modules-5.3.1-5.el10
rpms:imports/c10s/environment-modules-5.3.1-8.el10
rpms:imports/c10s/environment-modules-5.3.1-6.el10
rpms:imports/c10s/environment-modules-5.3.1-5.el10
rpms:imports/c8/environment-modules-4.5.2-4.el8
rpms:imports/c9/environment-modules-5.3.0-1.el9
rpms:imports/c8-beta/environment-modules-4.5.2-4.el8
rpms:imports/c9-beta/environment-modules-5.3.0-1.el9
rpms:imports/c8/environment-modules-4.5.2-3.el8
rpms:imports/c9/environment-modules-5.0.1-2.el9
rpms:imports/c9-beta/environment-modules-5.0.1-2.el9
rpms:imports/c8-beta/environment-modules-4.5.2-3.el8
rpms:imports/c8/environment-modules-4.5.2-2.el8
rpms:imports/c8-beta/environment-modules-4.5.2-2.el8
rpms:imports/c8s/environment-modules-4.5.2-3.el8
rpms:imports/c8s/environment-modules-4.5.2-2.el8
rpms:imports/c9/environment-modules-5.0.1-1.el9
rpms:imports/c9-beta/environment-modules-5.0.1-1.el9
rpms:imports/c9-beta/environment-modules-5.0.0-1.el9
rpms:imports/c9-beta/environment-modules-5.0.0-0.3.alpha.el9
rpms:imports/c8-beta/environment-modules-4.5.2-1.el8
rpms:imports/c8-beta/environment-modules-4.1.4-4.el8
rpms:imports/c8-beta/environment-modules-4.1.4-1.el8
rpms:imports/c8s/environment-modules-4.5.2-1.el8
rpms:imports/c8s/environment-modules-4.5.1-1.el8
rpms:imports/c8/environment-modules-4.5.2-1.el8
rpms:imports/c8/environment-modules-4.1.4-4.el8
rpms:imports/c8/environment-modules-4.1.4-1.el8
...
pull from: rpms:c10s
Branches Tags
rpms:c10-beta
rpms:c10s
rpms:c8
rpms:c9
rpms:c8-beta
rpms:c9-beta
rpms:c9s
rpms:c8s
rpms:imports/c10-beta/environment-modules-5.3.1-5.el10
rpms:imports/c10s/environment-modules-5.3.1-8.el10
rpms:imports/c10s/environment-modules-5.3.1-6.el10
rpms:imports/c10s/environment-modules-5.3.1-5.el10
rpms:imports/c8/environment-modules-4.5.2-4.el8
rpms:imports/c9/environment-modules-5.3.0-1.el9
rpms:imports/c8-beta/environment-modules-4.5.2-4.el8
rpms:imports/c9-beta/environment-modules-5.3.0-1.el9
rpms:imports/c8/environment-modules-4.5.2-3.el8
rpms:imports/c9/environment-modules-5.0.1-2.el9
rpms:imports/c9-beta/environment-modules-5.0.1-2.el9
rpms:imports/c8-beta/environment-modules-4.5.2-3.el8
rpms:imports/c8/environment-modules-4.5.2-2.el8
rpms:imports/c8-beta/environment-modules-4.5.2-2.el8
rpms:imports/c8s/environment-modules-4.5.2-3.el8
rpms:imports/c8s/environment-modules-4.5.2-2.el8
rpms:imports/c9/environment-modules-5.0.1-1.el9
rpms:imports/c9-beta/environment-modules-5.0.1-1.el9
rpms:imports/c9-beta/environment-modules-5.0.0-1.el9
rpms:imports/c9-beta/environment-modules-5.0.0-0.3.alpha.el9
rpms:imports/c8-beta/environment-modules-4.5.2-1.el8
rpms:imports/c8-beta/environment-modules-4.1.4-4.el8
rpms:imports/c8-beta/environment-modules-4.1.4-1.el8
rpms:imports/c8s/environment-modules-4.5.2-1.el8
rpms:imports/c8s/environment-modules-4.5.1-1.el8
rpms:imports/c8/environment-modules-4.5.2-1.el8
rpms:imports/c8/environment-modules-4.1.4-4.el8
rpms:imports/c8/environment-modules-4.1.4-1.el8

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

15 changed files with 461 additions and 229 deletions
Show Stats Expand all files Collapse all files

1
.environment-modules.metadata
View File

@ -1 +0,0 @@
a260805197fa5d5acd57f45505ded181025ead8e SOURCES/modules-4.5.2.tar.bz2

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

39
.gitignore vendored
View File

@ -1 +1,38 @@
SOURCES/modules-4.5.2.tar.bz2
modules-3.2.8.tar.bz2
/modules-3.2.8a.tar.bz2
/modules-3.2.9a.tar.bz2
/modules-3.2.9b.tar.bz2
/modules-3.2.9c.tar.bz2
/modules-3.2.10.tar.bz2
/modules-4.0.0.tar.bz2
/modules-4.1.0.tar.bz2
/modules-4.1.1.tar.bz2
/modules-4.1.2.tar.bz2
/modules-4.1.3.tar.bz2
/modules-4.1.4.tar.bz2
/modules-4.2.0.tar.bz2
/modules-4.2.1.tar.bz2
/modules-4.2.2.tar.bz2
/modules-4.2.3.tar.bz2
/modules-4.2.4.tar.bz2
/modules-4.2.5.tar.bz2
/modules-4.3.0.tar.bz2
/modules-4.3.1.tar.bz2
/modules-4.4.0.tar.bz2
/modules-4.4.1.tar.bz2
/modules-4.5.0.tar.bz2
/modules-4.5.2.tar.bz2
/modules-4.5.3.tar.bz2
/modules-4.6.0.tar.bz2
/modules-4.6.1.tar.bz2
/modules-4.7.0.tar.bz2
/modules-4.7.1.tar.bz2
/modules-4.8.0.tar.bz2
/modules-5.0.0-alpha.tar.bz2
/modules-5.0.0.tar.bz2
/modules-5.0.1.tar.bz2
/modules-5.1.0.tar.bz2
/modules-5.1.1.tar.bz2
/modules-5.2.0.tar.bz2
/modules-5.3.0.tar.bz2
/modules-5.3.1.tar.bz2

17
SOURCES/environment-modules-configure.patch
View File

@ -1,17 +0,0 @@
Partially reverts https://github.com/cea-hpc/modules/commit/6a80cd9a460160fee96ed46b175b716989adbf27.
Fedora still uses rpm macros that add "--build=x86_64-redhat-linux-gnu" to the configure arguments
and since this configure is not a proper gnu one, it would always error out and never build.
See https://bugzilla.redhat.com/show_bug.cgi?id=1842562.
--- a/configure 2020-07-30 14:13:34.000000000 +0200
+++ b/configure 2020-08-03 16:06:37.137023909 +0200
@@ -598,8 +598,6 @@
--with-x|--without-x)
# pass argument supported by compat version to its ./configure script
compatarglist+="$arg " ;;
- *)
- echo_error "Unrecognized option \`$arg'" 1;;
esac
done

44
SOURCES/environment-modules-module-switch-mod-modvers.patch
View File

@ -1,44 +0,0 @@
From 741f2e6b61b2c574e9c6972d3633653c26bb143a Mon Sep 17 00:00:00 2001
From: Xavier Delaruelle <xavier.delaruelle@cea.fr>
Date: Mon, 10 Aug 2020 19:22:46 +0200
Subject: [PATCH] Skip module switch conflict set if old matches new
`module switch` command used in modulefile is sometimes used to ensure a
given version of a module is loaded. Currently loaded version of this
module is unloaded to replace it by the designated specific version.
This use case does not cope with the conflict declaration that is set
over switched-off module specification. To support this use case,
conflict definition is skipped if swapped-off module specification
matches (includes) swapped-on module specification.
Fixes #355
---
modulecmd.tcl.in | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/modulecmd.tcl.in b/modulecmd.tcl.in
index 3abd4ad9a..8658b90bd 100644
--- a/modulecmd.tcl.in
+++ b/modulecmd.tcl.in
@@ -9482,11 +9482,16 @@ proc cmdModuleSwitch {uasked old {new {}}} {
# mentionned on this module switch command set in a modulefile
set orig_auto_handling [getConf auto_handling]
if {!$uasked && $argold ne {}} {
- # temporarily disable auto handling just to record deps, not to try to
- # load or unload them (already tried)
- setConf auto_handling 0
- catch {conflict $argold}
- setConf auto_handling $orig_auto_handling
+ # skip conflict declaration if old spec matches new as in this case
+ # switch means *replace loaded version of mod by this specific version*
+ lassign [getPathToModule $new] newmodfile newmod
+ if {$newmod eq {} || ![modEq $argold $newmod eqstart]} {
+ # temporarily disable auto handling just to record deps, not to try
+ # to load or unload them (already tried)
+ setConf auto_handling 0
+ catch {conflict $argold}
+ setConf auto_handling $orig_auto_handling
+ }
}
# attempt load and depre reload only if unload succeed

44
SOURCES/environment-modules-moulespath-initrc.patch
View File

@ -1,44 +0,0 @@
diff --git a/modules-4.5.2/modulecmd.tcl.in b/modulecmd.tcl.in
index 3abd4ad..cf6cb3b 100644
--- a/modules-4.5.2/modulecmd.tcl.in
+++ b/modulecmd.tcl.in
@@ -10564,8 +10564,17 @@ proc cmdModuleAutoinit {} {
@VERSIONING@ setenv MODULE_VERSION_STACK @MODULES_RELEASE@@MODULES_BUILD@
@VERSIONING@}
- # initialize default MODULEPATH and LOADEDMODULES
- if {![info exists ::env(MODULEPATH)] || $::env(MODULEPATH) eq {}} {
+ # initialize MODULEPATH and LOADEDMODULES if found unset
+ if {![info exists ::env(MODULEPATH)]} {
+ setenv MODULEPATH {}
+ }
+ if {![info exists ::env(LOADEDMODULES)]} {
+ setenv LOADEDMODULES {}
+ }
+
+ # initialize user environment if found undefined (both MODULEPATH and
+ # LOADEDMODULES empty)
+ if {$::env(MODULEPATH) eq {} && $::env(LOADEDMODULES) eq {}} {
# set modpaths defined in modulespath config file if it exists, use file
# in etcdir if it exists, dot file in initdir elsewhere
set modulespath [expr {[file exists @etcdir@/modulespath] ?\
@@ -10580,17 +10589,8 @@ proc cmdModuleAutoinit {} {
}
}
- if {![info exists ::env(MODULEPATH)]} {
- setenv MODULEPATH {}
- }
- }
- if {![info exists ::env(LOADEDMODULES)]} {
- setenv LOADEDMODULES {}
- }
-
- # source initialization modulerc if any and if no env already initialized
- # use initrc file in etcdir if any, modulerc file in initdir otherwise
- if {$::env(MODULEPATH) eq {} && $::env(LOADEDMODULES) eq {}} {
+ # source initialization modulerc if any and if no env already initialized
+ # use initrc file in etcdir if any, modulerc file in initdir otherwise
set initrc [expr {[file exists @etcdir@/initrc] ? {@etcdir@/initrc} :\
{@initdir@/modulerc}}]
if {[file exists $initrc]} {

18
SOURCES/environment-modules-profilesh-misdetects-login-shell.patch
View File

@ -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

1
ci.fmf Normal file
View File

@ -0,0 +1 @@
resultsdb-testcase: separate

26
environment-modules-5.3.1-fix-intermittent-test-failures.patch Normal file
View File

@ -0,0 +1,26 @@
From 8c757d59c068d7c41e78f59f575eca9d58785a36 Mon Sep 17 00:00:00 2001
From: Xavier Delaruelle <xavier.delaruelle@cea.fr>
Date: Mon, 28 Oct 2024 06:16:20 +0100
Subject: [PATCH] ts: fix 70/410 when no stdin and re chars in path
Fixes #552
Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
Upstream-commit: 8c757d59c068d7c41e78f59f575eca9d58785a36
---
testsuite/modules.70-maint/410-timer.exp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/testsuite/modules.70-maint/410-timer.exp b/testsuite/modules.70-maint/410-timer.exp
index fe1dd0ffb..14ba2d2b1 100644
--- a/testsuite/modules.70-maint/410-timer.exp
+++ b/testsuite/modules.70-maint/410-timer.exp
@@ -77,7 +77,7 @@ testouterr_cmd_re sh {list --timer --silent} OK $tserr
# debug
set tserr "($timer_msgs .* \\\(\\d+.\\d+ ms\\\))*
-[msg_load foo/1.0 "Evaluate modulefile: '$mpre/foo/1.0' as 'foo/1.0'"]
+[escre [msg_load foo/1.0 "Evaluate modulefile: '$mp/foo/1.0' as 'foo/1.0'"]]
($timer_msgs .* \\\(\\d+.\\d+ ms\\\))*

131
environment-modules-5.3.1-fix-source-sh-test.patch Normal file
View File

@ -0,0 +1,131 @@
From a124745566804f8987a2c68944d395be10591f8c Mon Sep 17 00:00:00 2001
From: Xavier Delaruelle <xavier.delaruelle@cea.fr>
Date: Tue, 15 Oct 2024 07:52:44 +0200
Subject: [PATCH] ts: adapt 50/400 tests when install manpath is default
Fix source-sh tests in 50/400 test case to adapt expected value set to
MANPATH variable when the installed MANPATH value set at configure step
is included in the default MANPATH value set for test.
Fixes #549
---
testsuite/modules.50-cmds/400-source-sh.exp | 46 ++++++++++++++-------
1 file changed, 30 insertions(+), 16 deletions(-)
diff --git a/testsuite/modules.50-cmds/400-source-sh.exp b/testsuite/modules.50-cmds/400-source-sh.exp
index 19a23fb81..753975c2a 100644
--- a/testsuite/modules.50-cmds/400-source-sh.exp
+++ b/testsuite/modules.50-cmds/400-source-sh.exp
@@ -1612,12 +1612,26 @@ if {$install_setmanpath eq {y}} {
} else {
set mandirenc $install_mandir
}
- if {$install_appendmanpath eq {y}} {
- set updatedmanpath $default_manpath:$install_mandir
- set lmsourceshpath "append-path MANPATH $mandirenc|"
- } else {
- set updatedmanpath $install_mandir:$default_manpath
- set lmsourceshpath "prepend-path MANPATH $mandirenc|"
+ set updated_manpath_list [split $default_manpath :]
+ set is_default_manpath_updated 0
+ foreach install_manpath_elt [split $install_mandir :] {
+ if {$install_manpath_elt ni $updated_manpath_list} {
+ if {$install_appendmanpath eq {y}} {
+ lappend updated_manpath_list $install_manpath_elt
+ } else {
+ set updated_manpath_list [linsert $updated_manpath_list 0 $install_manpath_elt]
+ }
+ set is_default_manpath_updated 1
+ }
+ }
+ set updatedmanpath [join $updated_manpath_list :]
+
+ if {$is_default_manpath_updated} {
+ if {$install_appendmanpath eq {y}} {
+ set lmsourceshpath "append-path MANPATH $mandirenc|"
+ } else {
+ set lmsourceshpath "prepend-path MANPATH $mandirenc|"
+ }
}
}
# setup PATH without Modules bin location
@@ -1647,13 +1661,13 @@ if {$install_versioning eq {y}} {
lappend ans [list set MODULE_VERSION_STACK $install_version]
}
# MANPATH is set before PATH if the latter is appended and not the former
-if {$install_setmanpath eq {y} && $install_appendbinpath eq {y} && $install_appendmanpath eq {n}} {
+if {$install_setmanpath eq {y} && $install_appendbinpath eq {y} && $install_appendmanpath eq {n} && $is_default_manpath_updated} {
lappend ans [list set MANPATH $updatedmanpath]
}
if {$install_setbinpath eq {y}} {
lappend ans [list set PATH $updatedpath]
}
-if {$install_setmanpath eq {y} && ($install_appendbinpath eq {n} || $install_appendmanpath eq {y})} {
+if {$install_setmanpath eq {y} && ($install_appendbinpath eq {n} || $install_appendmanpath eq {y}) && $is_default_manpath_updated} {
lappend ans [list set MANPATH $updatedmanpath]
}
lappend ans [list set _LMFILES_ $mp/source-sh/1]
@@ -1703,7 +1717,7 @@ set extratserr {}
set tserr "-------------------------------------------------------------------
$mp/source-sh/1:\n\n"
set tserr_path {}
-if {$install_setmanpath eq {y}} {
+if {$install_setmanpath eq {y} && $is_default_manpath_updated} {
if {$install_appendmanpath eq {y}} {
append tserr_path "append-path\tMANPATH $mandirenc\n"
} else {
@@ -1754,13 +1768,13 @@ if {$install_versioning eq {y}} {
lappend ans [list set MODULE_VERSION_STACK $install_version]
}
# MANPATH is set before PATH if the latter is appended and not the former
-if {$install_setmanpath eq {y} && $install_appendbinpath eq {y} && $install_appendmanpath eq {n}} {
+if {$install_setmanpath eq {y} && $install_appendbinpath eq {y} && $install_appendmanpath eq {n} && $is_default_manpath_updated} {
lappend ans [list set MANPATH $updatedmanpath]
}
if {$install_setbinpath eq {y}} {
lappend ans [list set PATH $updatedpath]
}
-if {$install_setmanpath eq {y} && ($install_appendbinpath eq {n} || $install_appendmanpath eq {y})} {
+if {$install_setmanpath eq {y} && ($install_appendbinpath eq {n} || $install_appendmanpath eq {y}) && $is_default_manpath_updated} {
lappend ans [list set MANPATH $updatedmanpath]
}
lappend ans [list set _LMFILES_ $mp/source-sh/1]
@@ -1792,13 +1806,13 @@ if {$install_versioning eq {y}} {
lappend ans [list set MODULE_VERSION_STACK $install_version]
}
# MANPATH is set before PATH if the latter is appended and not the former
-if {$install_setmanpath eq {y} && $install_appendbinpath eq {y} && $install_appendmanpath eq {n}} {
+if {$install_setmanpath eq {y} && $install_appendbinpath eq {y} && $install_appendmanpath eq {n} && $is_default_manpath_updated} {
lappend ans [list set MANPATH $updatedmanpath]
}
if {$install_setbinpath eq {y}} {
lappend ans [list set PATH $updatedpath]
}
-if {$install_setmanpath eq {y} && ($install_appendbinpath eq {n} || $install_appendmanpath eq {y})} {
+if {$install_setmanpath eq {y} && ($install_appendbinpath eq {n} || $install_appendmanpath eq {y}) && $is_default_manpath_updated} {
lappend ans [list set MANPATH $updatedmanpath]
}
lappend ans [list set _LMFILES_ $modpath/setenv/1.0:$mp/source-sh/1]
@@ -1829,19 +1843,19 @@ setenv_var MODULES_COLLECTION_TARGET bar
if {$install_setbinpath eq {y}} {
setenv_var PATH $updatedpath
}
-if {$install_setmanpath eq {y}} {
+if {$install_setmanpath eq {y} && $is_default_manpath_updated} {
setenv_var MANPATH $updatedmanpath
}
setenv_var __MODULES_LMSOURCESH source-sh/1\&bash\ testsuite/example/sh-to-mod.sh\|${lmsourceshpath}setenv\ MODULES_COLLECTION_TARGET\ bar\|setenv\ testsuite\ yes
set ans [list]
# MANPATH is set before PATH if the latter is appended and not the former
-if {$install_setmanpath eq {y} && $install_appendbinpath eq {y} && $install_appendmanpath eq {n}} {
+if {$install_setmanpath eq {y} && $install_appendbinpath eq {y} && $install_appendmanpath eq {n} && $is_default_manpath_updated} {
lappend ans [list set MANPATH $default_manpath]
}
if {$install_setbinpath eq {y}} {
lappend ans [list set PATH $default_path]
}
-if {$install_setmanpath eq {y} && ($install_appendbinpath eq {n} || $install_appendmanpath eq {y})} {
+if {$install_setmanpath eq {y} && ($install_appendbinpath eq {n} || $install_appendmanpath eq {y}) && $is_default_manpath_updated} {
lappend ans [list set MANPATH $default_manpath]
}
lappend ans [list unset _LMFILES_]

11
environment-modules.rpmlintrc Normal file
View File

@ -0,0 +1,11 @@
# from the https://docs.fedoraproject.org/en-US/packaging-guidelines/:
# "If a package supersedes/replaces an existing package without being a
# sufficiently compatible replacement as defined above, use only the
# 'Obsoletes:' line."
addFilter("W: obsolete-not-provided environment-modules-compat")
# %ghost file mode false positive
addFilter("W: non-executable-in-bin /usr/bin/modulecmd 644")
# generic environment(modules) provides statement
addFilter("W: unversioned-explicit-provides environment\(modules\)")

339
SPECS/environment-modules.spec → environment-modules.spec
View File

@ -2,26 +2,46 @@
%global vimdatadir %{_datadir}/vim/vimfiles
Name: environment-modules
Version: 4.5.2
Release: 4%{?dist}
Version: 5.3.1
Release: 8%{?dist}
Summary: Provides dynamic modification of a user's environment
Group: System Environment/Base
License: GPLv2+
License: GPL-2.0-or-later
URL: http://modules.sourceforge.net/
Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
Patch0001: environment-modules-configure.patch
Patch0002: environment-modules-moulespath-initrc.patch
Patch0003: environment-modules-profilesh-misdetects-login-shell.patch
Patch0004: environment-modules-module-switch-mod-modvers.patch
BuildRequires: tcl-devel, libX11-devel
BuildRequires: dejagnu, sed, procps, hostname, man, less
BuildRequires: python3-devel
Requires: tcl, sed, procps, man, less
# fix source-sh test with non-default manpath (RHEL-62847)
# https://github.com/cea-hpc/modules/commit/a124745566804f8987a2c68944d395be10591f8c
Patch0: environment-modules-5.3.1-fix-source-sh-test.patch
# fix intermittent test failures (RHEL-62847)
# https://github.com/cea-hpc/modules/commit/8c757d59c068d7c41e78f59f575eca9d58785a36
Patch1: environment-modules-5.3.1-fix-intermittent-test-failures.patch
BuildRequires: tcl
BuildRequires: dejagnu
BuildRequires: make
BuildRequires: sed
BuildRequires: less
BuildRequires: hostname
BuildRequires: procps-ng
# specific requirements to build extension library
BuildRequires: gcc
BuildRequires: tcl-devel
Requires: tcl
Requires: sed
Requires: less
Requires: vim-filesystem
Requires: procps-ng
Requires: man-db
Requires(post): coreutils
Requires(post): %{_sbindir}/update-alternatives
Requires(postun): %{_sbindir}/update-alternatives
Provides: environment(modules)
Provides: environment(modules)
Obsoletes: environment-modules-compat <= 4.8.99
# Tcl linter is useful for module lint command
Recommends: nagelfar
%description
The Environment Modules package provides for the dynamic modification of
@ -47,17 +67,6 @@ suite of different applications.
NOTE: You will need to get a new shell after installing this package to
have access to the module alias.
%package compat
Summary: Environment Modules compatibility version
Requires: environment-modules = %{version}-%{release}
Requires: hostname
%description compat
The Environment Modules package provides for the dynamic modification of
a user's environment via modulefiles.
This package provides Environment Modules compatibility version (3.2).
%prep
%autosetup -p1 -n modules-%{version}
@ -65,65 +74,65 @@ This package provides Environment Modules compatibility version (3.2).
%build
%configure --prefix=%{_datadir}/Modules \
--libdir=%{_libdir} \
--libdir=%{_libdir}/%{name} \
--etcdir=%{_sysconfdir}/%{name} \
--bindir=%{_datadir}/Modules/bin \
--libexecdir=%{_datadir}/Modules/libexec \
--docdir=%{_docdir}/%{name} \
--mandir=%{_mandir} \
--vimdatadir=%{vimdatadir} \
--enable-dotmodulespath \
--disable-set-shell-startup \
--with-python=%{__python3} \
--with-initconf-in=etcdir \
--nagelfardatadir=%{_datadir}/Modules/nagelfar \
--with-bashcompletiondir=%{_datadir}/bash-completion/completions \
--with-fishcompletiondir=%{_datadir}/fish/vendor_completions.d \
--with-zshcompletiondir=%{_datadir}/zsh/site-functions \
--enable-multilib-support \
--disable-doc-install \
--enable-modulespath \
--with-python=/usr/bin/python3 \
--with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles \
--with-quarantine-vars='LD_LIBRARY_PATH LD_PRELOAD'
make %{?_smp_mflags}
%make_build
%install
make install DESTDIR=%{buildroot}
%make_install
mkdir -p %{buildroot}%{_sysconfdir}/modulefiles
mkdir -p %{buildroot}%{_datadir}/modulefiles
mkdir -p %{buildroot}%{_sysconfdir}/profile.d
mkdir -p %{buildroot}%{_datadir}/fish/vendor_conf.d
mkdir -p %{buildroot}%{_bindir}
# Set up for alternatives.
# setup for alternatives
touch %{buildroot}%{_sysconfdir}/profile.d/modules.{csh,sh}
touch %{buildroot}%{_datadir}/fish/vendor_conf.d/modules.fish
touch %{buildroot}%{_bindir}/modulecmd
# remove modulecmd wrapper as it will be handled by alternatives
rm -f %{buildroot}%{_datadir}/Modules/bin/modulecmd
mv %{buildroot}%{_mandir}/man1/module{,-c}.1
mv %{buildroot}%{_mandir}/man4/modulefile{,-c}.4
# Major utilities go to regular bin dir.
# major utilities go to regular bin dir
mv %{buildroot}%{_datadir}/Modules/bin/envml %{buildroot}%{_bindir}/
# Rename compat docs to find them in files section.
mv compat/ChangeLog ChangeLog-compat
mv compat/NEWS NEWS-compat
mv {doc/build/,}NEWS.txt
mv {doc/build/,}MIGRATING.txt
mv {doc/build/,}diff_v3_v4.txt
mv {doc/,}example.txt
rm -f %{buildroot}%{_docdir}/%{name}/{COPYING.GPLv2,ChangeLog-compat,INSTALL{,-win}.txt,NEWS-compat}
cp -p script/createmodule.sh %{buildroot}%{_datadir}/Modules/bin
cp -p script/createmodule.py %{buildroot}%{_datadir}/Modules/bin
mv {doc/build/,}CONTRIBUTING.txt
mv {doc/build/,}INSTALL.txt
mv {doc/build/,}changes.txt
# install the rpm config file
install -Dpm 644 contrib/rpm/macros.%{name} %{buildroot}/%{macrosdir}/macros.%{name}
%check
make test
make test QUICKTEST=1
%post
# Cleanup from pre-alternatives
[ ! -L %{_mandir}/man1/module.1.gz ] && rm -f %{_mandir}/man1/module.1.gz
[ ! -L %{_mandir}/man4/modulefile.4.gz ] && rm -f %{_mandir}/man4/modulefile.4.gz
[ ! -L %{_sysconfdir}/profile.d/modules.sh ] && rm -f %{_sysconfdir}/profile.d/modules.sh
[ ! -L %{_sysconfdir}/profile.d/modules.csh ] && rm -f %{_sysconfdir}/profile.d/modules.csh
[ ! -L %{buildroot}%{_bindir}/modulecmd ] && rm -f %{_bindir}/modulecmd
[ ! -L %{_datadir}/fish/vendor_conf.d/modules.fish ] && rm -f %{_datadir}/fish/vendor_conf.d/modules.fish
[ ! -L %{_bindir}/modulecmd ] && rm -f %{_bindir}/modulecmd
# Migration from version 3.x to 4
if [ "$(readlink /etc/alternatives/modules.sh)" = '%{_datadir}/Modules/init/modules.sh' ]; then
@ -133,42 +142,41 @@ fi
%{_sbindir}/update-alternatives \
--install %{_sysconfdir}/profile.d/modules.sh modules.sh %{_datadir}/Modules/init/profile.sh 40 \
--slave %{_sysconfdir}/profile.d/modules.csh modules.csh %{_datadir}/Modules/init/profile.csh \
--slave %{_bindir}/modulecmd modulecmd %{_datadir}/Modules/libexec/modulecmd.tcl \
--slave %{_mandir}/man1/module.1.gz module.1.gz %{_mandir}/man1/module-c.1.gz \
--slave %{_mandir}/man4/modulefile.4.gz modulefile.4.gz %{_mandir}/man4/modulefile-c.4.gz
%post compat
%{_sbindir}/update-alternatives \
--install %{_sysconfdir}/profile.d/modules.sh modules.sh %{_datadir}/Modules/init/profile-compat.sh 10 \
--slave %{_sysconfdir}/profile.d/modules.csh modules.csh %{_datadir}/Modules/init/profile-compat.csh \
--slave %{_bindir}/modulecmd modulecmd %{_datadir}/Modules/libexec/modulecmd-compat
--slave %{_datadir}/fish/vendor_conf.d/modules.fish modules.fish %{_datadir}/Modules/init/fish \
--slave %{_bindir}/modulecmd modulecmd %{_datadir}/Modules/libexec/modulecmd.tcl
%postun
if [ $1 -eq 0 ] ; then
%{_sbindir}/update-alternatives --remove modules.sh %{_datadir}/Modules/init/profile.sh
fi
%postun compat
if [ $1 -eq 0 ] ; then
%{_sbindir}/update-alternatives --remove modules.sh %{_datadir}/Modules/init/profile-compat.sh
fi
%files
%license COPYING.GPLv2
%doc ChangeLog README NEWS.txt MIGRATING.txt CONTRIBUTING.txt diff_v3_v4.txt example.txt
%doc ChangeLog.gz README NEWS.txt MIGRATING.txt INSTALL.txt CONTRIBUTING.txt changes.txt
%{_sysconfdir}/modulefiles
%dir %{_datadir}/fish/vendor_conf.d
%ghost %{_sysconfdir}/profile.d/modules.csh
%ghost %{_sysconfdir}/profile.d/modules.sh
%ghost %{_datadir}/fish/vendor_conf.d/modules.fish
%ghost %{_bindir}/modulecmd
%{_bindir}/envml
%{_libdir}/libtclenvmodules.so
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/libtclenvmodules.so
%dir %{_datadir}/Modules
%{_datadir}/Modules/bin
%dir %{_datadir}/Modules/libexec
%{_datadir}/Modules/libexec/modulecmd.tcl
%dir %{_datadir}/Modules/init
%{_datadir}/Modules/init/*
# do not need to require shell package as we "own" completion dir
%dir %{_datadir}/bash-completion/completions
%{_datadir}/bash-completion/completions/module
%{_datadir}/bash-completion/completions/ml
%dir %{_datadir}/zsh/site-functions
%{_datadir}/zsh/site-functions/_module
%dir %{_datadir}/fish/vendor_completions.d
%{_datadir}/fish/vendor_completions.d/module.fish
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/initrc
%config(noreplace) %{_sysconfdir}/%{name}/modulespath
@ -176,61 +184,184 @@ fi
%{_datadir}/Modules/modulefiles
%{_datadir}/modulefiles
%{_mandir}/man1/ml.1.gz
%ghost %{_mandir}/man1/module.1.gz
%ghost %{_mandir}/man4/modulefile.4.gz
%{_mandir}/man1/module-c.1.gz
%{_mandir}/man4/modulefile-c.4.gz
%{_mandir}/man1/module.1.gz
%{_mandir}/man4/modulefile.4.gz
%{macrosdir}/macros.%{name}
%{vimdatadir}/ftdetect/modulefile.vim
%{vimdatadir}/ftplugin/modulefile.vim
%{vimdatadir}/syntax/modulefile.vim
%files compat
%doc ChangeLog-compat NEWS-compat
%{_datadir}/Modules/libexec/modulecmd-compat
%{_mandir}/man1/module-compat.1.gz
%{_mandir}/man4/modulefile-compat.4.gz
%dir %{_datadir}/Modules/nagelfar
%{_datadir}/Modules/nagelfar/*
%changelog
* Mon Apr 24 2023 Lukáš Zaoral <lzaoral@redhat.com> - 4.5.2-4
- Fix `module switch mod mod/vers` module loading (#2189252)
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 5.3.1-8
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Wed Sep 21 2022 Lukáš Zaoral <lzaoral@redhat.com> - 4.5.2-3
- Fix profile.sh login shell misdetection (#1815047)
* Tue Oct 29 2024 Lukáš Zaoral <lzaoral@redhat.com> - 5.3.1-7
- fix intermittent test failures (RHEL-62847)
* Tue Jun 07 2022 Lukáš Zaoral <lzaoral@redhat.com> - 4.5.2-2
- Evaluate both modulespath and initrc during initialization (#1894870)
* Wed Oct 16 2024 Lukáš Zaoral <lzaoral@redhat.com> - 5.3.1-6
- fix source-sh test with non-default manpath (RHEL-62847)
* Tue Aug 18 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.2-1
- Update to 4.5.2 (#1860674)
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 5.3.1-5
- Bump release for June 2024 mass rebuild
* Mon Jul 13 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.1-1
- Update to 4.5.1 (#1642837)
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jul 09 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.0-1
- Update to 4.5.0 (#1642837)
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Aug 06 2019 Jan Macku <jamacku@redhat.com> - 4.1.4-4
- Gating rebuilt
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Aug 5 2019 Jan Synáček <jsynacek@redhat.com> - 4.1.4-2
- Fix postun script (#1736487)
* Tue Jun 27 2023 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 5.3.1-1
- Update to 5.3.1 (#2217986)
- Distribute ChangeLog as a zipped file to reduce installation size
* Wed Aug 29 2018 Jan Synáček <jsynacek@redhat.com> - 4.1.4-1
- Update to 4.1.4 (#1619619)
- Don't install any files under /usr as config files
* Sat May 27 2023 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 5.3.0-2
- Install module initialization script for fish as configuration snippet for
this shell via alternatives (#2196379)
* Tue Jun 26 2018 Jan Synáček <jsynacek@redhat.com> - 4.1.3-2
- Remove unnecessary build dependency on tclx (#1595105)
* Mon May 15 2023 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 5.3.0-1
- Update to 5.3.0 (#2203629)
* Mon Jun 25 2018 Jan Synáček <jsynacek@redhat.com> - 4.1.3-1
- Update to 4.1.3 (#1594693)
* Tue Apr 11 2023 Lukáš Zaoral <lzaoral@redhat.com> - 5.2.0-3
- migrate to SPDX license format
* Wed Jun 20 2018 Tomas Orsava <torsava@redhat.com> - 4.1.2-2
- Switch hardcoded python3 shebangs into the %%{__python3} macro
- Add missing BuildRequires on python3-devel so that %%{__python3} macro is
defined
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Nov 08 2022 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 5.2.0-1
- Update to 5.2.0 (#2140892)
- Recommends Nagelfar Tcl syntax linter
- Add Nagelfar linter addons
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue May 31 2022 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 5.1.1-1
- Update to 5.1.1 (#2092100)
- Move libtclenvmodules in an environment-modules directory under libdir
* Sat Apr 30 2022 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 5.1.0-1
- Update to 5.1.0 (#2080577)
- Install shell completion scripts in system-wide shell-specific locations
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Sat Oct 16 2021 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 5.0.1-1
- Update to 5.0.1 (#2014796)
* Sun Sep 12 2021 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 5.0.0-1
- Update to 5.0.0
- Configuration guide example.txt is replaced by more up to date INSTALL.txt
document
* Sun Jul 25 2021 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 5.0.0-0.1.alpha
- Update to 5.0.0-alpha
- Remove createmodule.sh and createmodule.py utilities ('module sh-to-mod'
should be used instead)
- Remove configure options that have been made default starting version 5.0
- Remove compat subpackage
- Run non-regression tests in quick mode
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jul 14 2021 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 4.8.0-1
- Update to 4.8.0 (#1982175)
* Tue Apr 6 2021 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 4.7.1-1
- Update to 4.7.1 (#1946442)
* Fri Feb 19 2021 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 4.7.0-1
- Update to 4.7.0 (#1930632)
- Align spec syntax with upstream spec file
- Add 'tcl' to the BuildRequires and remove 'man' from this list
- Fix names of 'procps-ng' and 'man-db' packages on Fedora
- Only install manpages through make install, other docs are handled by %%doc
- Remove alternatives mechanism for manpages
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sun Nov 15 2020 Xavier Delaruelle <xavier.delaruelle@cea.fr> - 4.6.1-1
- Update to 4.6.1 (#1897820)
* Thu Sep 17 2020 Jan Synáček <jsynacek@redhat.com> - 4.6.0-1
- Update to 4.6.0 (#1879374)
* Wed Sep 2 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.3-1
- Update to 4.5.3 (#1874145)
+ Big thanks to Xavier Delaruelle for a spec patch!
* Mon Aug 3 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.2-1
- Update to 4.5.2 (#1842562)
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Apr 8 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.0-1
- Update to 4.5.0 (#1821883)
+ Big thanks to Xavier Delaruelle for a spec patch!
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 6 2020 Jan Synáček <jsynacek@redhat.com> - 4.4.1-1
- Update to 4.4.1 (#1787690)
* Wed Nov 27 2019 Jan Synáček <jsynacek@redhat.com> - 4.4.0-1
- Update to 4.4.0 (#1773590)
* Wed Oct 2 2019 Jan Synáček <jsynacek@redhat.com> - 4.3.1-1
- Update to 4.3.1 (#1754182)
* Mon Jul 29 2019 Jan Synáček <jsynacek@redhat.com> - 4.3.0-1
- Update to 4.3.0 (#1733752)
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Jul 9 2019 Jan Synáček <jsynacek@redhat.com> - 4.2.5-1
- Update to 4.2.5 (#1727988)
* Mon Apr 29 2019 Jan Synáček <jsynacek@redhat.com> - 4.2.4-1
- Update to 4.2.4 (#1703415, #1687033)
* Mon Mar 25 2019 Jan Synáček <jsynacek@redhat.com> - 4.2.3-1
- Update to 4.2.3 (#1692024, #1687033)
* Mon Feb 18 2019 Jan Synáček <jsynacek@redhat.com> - 4.2.2-1
- Update to 4.2.2 (#1678041)
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Nov 20 2018 Jan Synáček <jsynacek@redhat.com> - 4.2.1-1
- Update to 4.2.1 (#1648738)
* Thu Oct 18 2018 Jan Synáček <jsynacek@redhat.com> - 4.2.0-1
- Update to 4.2.0 (#1640450)
* Tue Aug 21 2018 Jan Synáček <jsynacek@redhat.com> - 4.1.4-2
- Don't install any files under /usr as config files (#1506663)
* Tue Aug 21 2018 Jan Synáček <jsynacek@redhat.com> - 4.1.4-1
- Update to 4.1.4 (#1619415)
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jun 18 2018 Jan Synáček <jsynacek@redhat.com> - 4.1.3-1
- Update to 4.1.3 (#1592179, #1575479, #1585305)
* Fri May 4 2018 Jan Synáček <jsynacek@redhat.com> - 4.1.2-2
- Fix postun script (#1565699)
* Tue Apr 3 2018 Jan Synáček <jsynacek@redhat.com> - 4.1.2-1
- Update to 4.1.2 (#1562535)
@ -383,7 +514,7 @@ fi
* Thu Jan 7 2010 Orion Poplawski <orion@cora.nwra.com> - 3.2.7b-7
- Add patch to set a sane default MANPATH
- Add createmodule.sh utility script for creating modulefiles
* Mon Nov 30 2009 Orion Poplawski <orion@cora.nwra.com> - 3.2.7b-6
- Add Requires: propcs (bug #54272)

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

11
plans/tier1-internal.fmf Normal file
View File

@ -0,0 +1,11 @@
summary: Internal gating tests plan
discover:
- name: Internal gating tests
how: fmf
filter: 'tag: ci-tier-1'
url: https://pkgs.devel.redhat.com/git/tests/environment-modules
execute:
how: tmt
adjust:
enabled: false
when: distro == centos-stream or distro == fedora

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (modules-5.3.1.tar.bz2) = b78cab4adf2c980ee52bcf9168f95c4809131e023c2d8298489741fe713ec85f2e84b13d561b85c1a54eb6b4fc77dd8ee3b36ef2662c631f70b07aed7e674636