From e18e515b71e1fc37c8f67af71fe3e46106cc0b4d Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Wed, 8 Nov 2023 14:35:20 +0300
Subject: [PATCH] import environment-modules-5.3.0-1.el9

---
 .environment-modules.metadata                  |  2 +-
 .gitignore                                     |  2 +-
 ...ules-profilesh-misdetects-login-shell.patch | 18 ------------------
 SPECS/environment-modules.spec                 | 10 ++++++----
 4 files changed, 8 insertions(+), 24 deletions(-)
 delete mode 100644 SOURCES/environment-modules-profilesh-misdetects-login-shell.patch

diff --git a/.environment-modules.metadata b/.environment-modules.metadata
index 4306583..31b76ca 100644
--- a/.environment-modules.metadata
+++ b/.environment-modules.metadata
@@ -1 +1 @@
-57f66c1ccbcf10e6b583421ddc591db2663b3a18 SOURCES/modules-5.0.1.tar.bz2
+cb1def0bb726097edb5d077d59cf9272380243db SOURCES/modules-5.3.0.tar.bz2
diff --git a/.gitignore b/.gitignore
index 5fa7bfd..e8a578a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/modules-5.0.1.tar.bz2
+SOURCES/modules-5.3.0.tar.bz2
diff --git a/SOURCES/environment-modules-profilesh-misdetects-login-shell.patch b/SOURCES/environment-modules-profilesh-misdetects-login-shell.patch
deleted file mode 100644
index 0d03552..0000000
--- a/SOURCES/environment-modules-profilesh-misdetects-login-shell.patch
+++ /dev/null
@@ -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
-
diff --git a/SPECS/environment-modules.spec b/SPECS/environment-modules.spec
index 8ed1092..300a70e 100644
--- a/SPECS/environment-modules.spec
+++ b/SPECS/environment-modules.spec
@@ -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)