Accepting request 1309469 from network:cluster

OBS-URL: https://build.opensuse.org/request/show/1309469
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lua-lmod?expand=0&rev=46

Doc-Ugly-workaround-for-bug-in-Sphinx.patch

@@ -1,26 +0,0 @@
-From: Egbert Eich <eich@suse.de>
-Date: Mon Oct 16 14:51:52 2017 +0200
-Subject: Doc: Ugly workaround for bug in Sphinx.
-Patch-mainline: never
-Git-commit: 2f8d29d20add462e06d316e9e6ff3ed93bca9d52
-References: 
-
-Signed-off-by: Egbert Eich <eich@suse.de>
-Signed-off-by: Egbert Eich <eich@suse.com>
----
- docs/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-diff --git a/docs/Makefile b/docs/Makefile
-index 188360f..b066c68 100644
---- a/docs/Makefile
-+++ b/docs/Makefile
-@@ -124,6 +124,9 @@ latex:
- latexpdf:
- 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
- 	@echo "Running LaTeX files through pdflatex..."
-+	@grep -q "\usepackage{pmboxdraw}" $(BUILDDIR)/latex/Lmod.tex || \
-+         sed -ie 's#\\usepackage{cmap}#\\usepackage{cmap} \\usepackage{pmboxdraw}#' \
-+	  $(BUILDDIR)/latex/Lmod.tex
- 	$(MAKE) -C $(BUILDDIR)/latex all-pdf
- 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
- 

Messages-Remove-message-about-creating-a-consulting-ticket.patch

@@ -1,57 +0,0 @@
-From: Egbert Eich <eich@suse.com>
-Date: Fri Aug 17 21:31:37 2018 +0200
-Subject: [Messages] Remove message about creating a consulting ticket.
-Patch-mainline: never
-Git-commit: a116d2da370874292fb2a5ab6e884eb425c99728
-References: 
-
-Signed-off-by: Egbert Eich <eich@suse.com>
----
----
- messageDir/de.lua |    1 -
- messageDir/en.lua |    1 -
- messageDir/es.lua |    1 -
- messageDir/fr.lua |    2 --
- 4 files changed, 5 deletions(-)
-
---- a/messageDir/de.lua
-+++ b/messageDir/de.lua
-@@ -106,7 +106,6 @@ Verwenden Sie folgendes Kommando, um das
- 
-   $ module swap %{oldName} %{fullName}
- 
--Falls Sie weitere Unterstützung brauchen, erstellen Sie ein Support-Ticket.
- ]==],
-      e_Illegal_Load        = nil,
-      e_Illegal_option      = nil,
---- a/messageDir/en.lua
-+++ b/messageDir/en.lua
-@@ -125,7 +125,6 @@ To correct the situation, please execute
- 
-   $  module swap %{oldName} %{fullName}
- 
--Please submit a consulting ticket if you require additional assistance.
- ]==],
-      e_Illegal_Load        = [==[The following module(s) are illegal: %{module_list}
- Lmod does not support modulefiles that start with two or more underscores
---- a/messageDir/es.lua
-+++ b/messageDir/es.lua
-@@ -84,7 +84,6 @@ Para solucionar esta situación, introdu
- 
-   $  module swap %{oldName} %{fullName}
- 
--Por favor, envíe un ticket si necesita más ayuda.
- ]==],
-      e_Illegal_option      = nil,
-      e_Illegal_Load        = nil,
---- a/messageDir/fr.lua
-+++ b/messageDir/fr.lua
-@@ -111,8 +111,6 @@ Pour corriger le problème, vous pouvez
- 
-   $  module swap %{oldName} %{fullName}
- 
--Merci de bien vouloir soumettre un ticket si vous désirez plus d'assistance.
--
- ]==],
-      e_Illegal_Load      = nil,
-      e_Illegal_option    = nil,

lua-lmod-8.7.48.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3456ee9182ffcfbacbade3568361acf07d10058d3b55beb01e9b7eb5c3e38d27
-size 28114192

lua-lmod-8.7.55.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f85ed9b55c23afb563fa99c7201037628be016e8d88a1aa8dba4632c0ab450bd
+size 29572901

lua-lmod.changes

@@ -1,3 +1,127 @@
+-------------------------------------------------------------------
+Tue Oct  7 07:10:02 UTC 2025 - Christian Goll <cgoll@suse.com>
+
+- Fix build failure by specifying the path to the lua and luac executables.
+
+-------------------------------------------------------------------
+Fri Mar 28 11:57:38 UTC 2025 - Egbert Eich <eich@suse.com>
+
+- Remove python2 support.
+
+-------------------------------------------------------------------
+Mon Jan 27 10:27:04 UTC 2025 - Egbert Eich <eich@suse.com>
+
+- Add /usr/share/lmod/%{version}/libexec/addto to the `bash`
+  Apparmor abstraction to allow it to be executed when setting the
+  environment when starting non-interactive shells (boo#1236365).
+
+-------------------------------------------------------------------
+Fri Jan  3 12:10:22 UTC 2025 - Egbert Eich <eich@suse.com>
+
+- Update to version 8.7.55:
+  * Version 8.7.38
+    + Issue #697: Add warning if doing `module use --help`
+    + Make `LMOD_IGNORE_CACHE` use "yes/no" env variable setting
+      system.
+    + Make `module --terse show <module>` do the same as
+      `module --loc show <module>`, namely print the location of the
+      module.
+    + Support for `module --terse spider phdf5/1.12.2` that just
+      prints the module in the hierarchy.
+    + Move almost almost all `cosmic:value()` calls to inside
+      function not at routine top-level.
+    + Report build time in UTC when `$SOURCE_DATE_EPOCH` is set.
+    + Support for downstream conflicts has been added.
+    + Support for dynamic `LMOD_MODULERC` has been added.
+  * Version 8.7.39:
+    + Fix busted test for ModuleA.
+  * Version 8.7.40
+    + Bug fix for prepend/append path when trying to add an empty string.
+    + Bug fix for `serializeTbl`: handle empty or single blank
+      string as key.
+  * Version 8.7.41
+    + Added new function `depends_on_any()`:
+      If `$MODULES_AUTO_HANDLING` is set then
+      `prereq()` -> `depends_on()`, `prereq_any()` -> `depends_on_any()`
+    + Generate a perl pod format for manpage for `module.1`
+    + `ModuleTable` modification: Changes to `$MODULEPATH` are
+      stored in an entry.
+  * Version 8.7.42
+    + Fix setting of `$FPATH` when running bash or ksh shell
+      and executing `zsh -l`.
+  * Version 8.7.43
+    + Support for ksh flag not needed anymore.
+  * Version 8.7.44
+    + `path2pathA()` keep double delims, Reduce triple delims to double.
+  * Version 8.7.45
+    + Changing `MName.src`: `l_find_highest_by_key()` to loop over
+      all `fileA` entries. Now stoping at first one found rather than
+      just looking at `fileA[1]`.
+    + Adding `=encoding UTF-8` to pod generation.
+  * Version 8.7.46
+    + Must only add `KSH_SUPPORT` to zsh when both `$orig_zsh_version`
+      and `$zsh_fpath` have non-null values.
+  * Version 8.7.47
+    + Use correct shell syntax in bash init script.
+  * Version 8.7.48
+    + Keep previous `varT` when restoring a collection.
+      Otherwise the previous modules env vars are lost and therefore
+      not purged.
+    + Use `__build_FPATH_for_zsh_ksh` to build `FPATH` for both shells.
+    + Support for `terse avail` extensions.
+  * Version 8.7.49
+    + Add support for zsh to handle a non-exported `FPATH` in bash
+      init script.
+    + Change `MF_Base:processVars` to use `oldT` to know which paths
+      from `newA` to prepend or append.
+    + Add support for `LMOD_FILE_IGNORE_PATTERNS` in `src/DirTree.lua`.
+      This is to ignore files like `.version.1.3` or `.modulerc-1.3.lua`
+      etc.
+  * Version 8.7.50
+    + Emacs lisp integration updated.
+    + Use `command -v` instead of checking status `$?`.
+    + Change `--hidden_load` to `--hidden-loaded` for TCL change
+      `hidden_load` to `hidden_loaded` in Lua.
+    + Report `dofile()` usage as an error.
+    + Updated `FPATH` support: bash, ksh just add path
+      (`init/ksh_funcs`) to `FPATH`.
+    + zsh: if `autoload` and `compinit` fail then set `__zsh_fpath`
+      with sub-shell.
+    + Improve `addto` to not include duplicates in path like
+      variables (`PATH`, `FPATH`, .. )
+    + Add support for `--dumpname` in `lmod` and `ml`; Update tab
+      completions files.
+    + Do not reset `BASH_ENV` if already set for `cshrc.in`.
+    + Do not reset `BASH_ENV` if already set for `profile.in`.
+    + Support for the functions `hide{}` and `forbid{}`.
+  * Version 8.7.51
+    + Fix bug in load test.
+  * Version 8.7.52
+    + Add `MName:isVisible()` so that load hooks can figure out if
+      a loaded module is is visible or not.
+  * Version 8.7.53
+    + Updating docs to include link to `165_debugging_lmod.rst`.
+  * Version 8.7.54
+    + Remove all `v.file` tests in dealing with `ModuleA`.
+    + Use `self.__mpathT[mpath].hiddenT` and `self.__hiddenT` instead
+      of merged table for hidden status.
+    + Added `mrc:set_display_mode()` before commands.
+    + Build reverse maps for `mod2versionT` and `full2aliasesT`
+      dynamically
+    + Added `MRC:pairsForMRC_aliases` iterator.
+    + Removed `MRC:__marged_hiddenT`, `MRC:__marged_forbiddenT`
+      and `MRC:__mergedAlias2modT`.
+    + Add support for environment variable `LMOD_SHOW_HIDDEN`.
+    + Make TCL files have `spider` as mode matching when Lmod is
+      in spider mode.
+  * Version 8.7.55
+    + Add a better test for spaces in front of `#`.
+- Replace
+  Messages-Remove-message-about-creating-a-consulting-ticket.patch
+  by `sed` command.
+- Remove Doc-Ugly-workaround-for-bug-in-Sphinx.patch
+  as it is relevant pre SLE-15 products only.
+
 -------------------------------------------------------------------
 Sat Aug 24 14:40:19 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
 

lua-lmod.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package lua-lmod
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -43,13 +43,13 @@ Name:           lua-lmod
 Summary:        Lua-based Environment Modules used in HPC
 License:        MIT
 Group:          Development/Libraries/Other
-Version:        8.7.48
+Version:        8.7.55
 Release:        0
 URL:            https://github.com/TACC/Lmod
 Source0:        https://github.com/TACC/Lmod/archive/%{version}.tar.gz#$/%{name}-%{version}.tar.gz
 Source1:        %{name}-rpmlintrc
-Patch1:         Messages-Remove-message-about-creating-a-consulting-ticket.patch
-Patch2:         Doc-Ugly-workaround-for-bug-in-Sphinx.patch
+#Patch1:         Messages-Remove-message-about-creating-a-consulting-ticket.patch
+#Patch2:         Doc-Ugly-workaround-for-bug-in-Sphinx.patch
 
 BuildRequires:  %{lua_pref} >= %{lmod_min_lua_version}
 BuildRequires:  %{lua_pref}-devel >= %{lmod_min_lua_version}
@@ -66,24 +66,14 @@ Requires:       lua%{version_name_suffix %lua_version}-luaterm
 Requires:       tcl
 Requires:       (lua-lmod-apparmor-abstractions if apparmor-abstractions)
 Conflicts:      Modules
-%if 0%{suse_version} >= 1550
 BuildRequires:  python3-Sphinx
-%else
-BuildRequires:  python-Sphinx
-%endif
 Provides:       environment-modules
 Provides:       lua-lmod-man = %{version}-%{release}
 Provides:       ml = %{version}
 Conflicts:      environment-modules
 %if 0%{?build_pdf:1}
 
-%if 0%{suse_version} >= 1550
 BuildRequires:  python3-Sphinx-latex
-%else
-%if 0%{?sle_version} == 0 || 0%{?sle_version} >= 120300
-BuildRequires:  python-Sphinx-latex
-%endif
-%endif
 BuildRequires:  texlive
 BuildRequires:  texlive-babel
 BuildRequires:  texlive-babel-english
@@ -146,10 +136,9 @@ Profile for shell source scripts for lua-lmod
 
 %prep
 %setup -q -n Lmod-%{version}
-%patch -P 1 -p1
-%if 0%{?sle_version:1} && 0%{?sle_version} < 150000
-%patch -P 2 -p1
-%endif
+%autopatch -p1
+# Remove message about creating a consulting ticket
+sed -i -e '/[T,t]icket/d' messageDir/*.lua
 
 %build
 %if 0%{!?build_pdf:1}
@@ -161,7 +150,9 @@ export LUA_PATH="%{lua_path}"
     --datadir=%{lua_noarchdir} \
     --with-redirect=yes \
     --with-autoSwap=no \
-    --with-fastTCLInterp=no
+    --with-fastTCLInterp=no \
+    --with-lua=/usr/bin/lua \
+    --with-luac=/usr/bin/luac
 make
 find my_docs/ -name .gitignore -delete
 %endif
@@ -285,6 +276,7 @@ cat <<EOF > %{buildroot}%{_sysconfdir}/apparmor.d/abstractions/bash.d/lmod
    abi <abi/3.0>,
 
    %_datadir/lmod/%{version}/init/*    r,
+   %_datadir/lmod/%{version}/libexec/addto ix,
 EOF
 
 mkdir -p %{buildroot}/%{_mandir}/man1