import environment-modules-4.5.2-1.el8

.environment-modules.metadata

@@ -1 +1 @@
-2b5c4606733a86cb322632692af3786bfa7cb74a SOURCES/modules-4.1.4.tar.bz2
+a260805197fa5d5acd57f45505ded181025ead8e SOURCES/modules-4.5.2.tar.bz2

.gitignore

@@ -1 +1 @@
-SOURCES/modules-4.1.4.tar.bz2
+SOURCES/modules-4.5.2.tar.bz2

SOURCES/environment-modules-configure.patch

@@ -0,0 +1,17 @@
+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
+ 

SPECS/environment-modules.spec

@@ -1,14 +1,16 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
+%global vimdatadir %{_datadir}/vim/vimfiles
 
 Name:           environment-modules
-Version:        4.1.4
+Version:        4.5.2
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
+Patch0001:      environment-modules-configure.patch
 
 BuildRequires:  tcl-devel, libX11-devel
 BuildRequires:  dejagnu, sed, procps, hostname, man, less
@@ -56,16 +58,23 @@ This package provides Environment Modules compatibility version (3.2).
 
 %prep
 %setup -q -n modules-%{version}
+%patch0001 -p1
 
 
 %build
 %configure --prefix=%{_datadir}/Modules \
+           --libdir=%{_libdir} \
+           --etcdir=%{_sysconfdir}/%{name} \
            --bindir=%{_datadir}/Modules/bin \
            --libexecdir=%{_datadir}/Modules/libexec \
            --docdir=%{_docdir}/%{name} \
+           --vimdatadir=%{vimdatadir} \
            --enable-dotmodulespath \
+           --disable-set-shell-startup \
+           --with-python=%{__python3} \
+           --with-initconf-in=etcdir \
            --with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles \
-           --with-quarantine-vars=LD_LIBRARY_PATH
+           --with-quarantine-vars='LD_LIBRARY_PATH LD_PRELOAD'
 make %{?_smp_mflags}
 
 
@@ -96,12 +105,10 @@ 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.txt,NEWS-compat}
+rm -f %{buildroot}%{_docdir}/%{name}/{COPYING.GPLv2,ChangeLog-compat,INSTALL{,-win}.txt,NEWS-compat}
 
-cp -p contrib/scripts/createmodule.sh %{buildroot}%{_datadir}/Modules/bin
+cp -p script/createmodule.sh %{buildroot}%{_datadir}/Modules/bin
-cp -p contrib/scripts/createmodule.py %{buildroot}%{_datadir}/Modules/bin
+cp -p script/createmodule.py %{buildroot}%{_datadir}/Modules/bin
-sed -i -e 1s,/usr/bin/python,%{__python3}, \
-    %{buildroot}%{_datadir}/Modules/bin/createmodule.py
 
 install -Dpm 644 contrib/rpm/macros.%{name} %{buildroot}/%{macrosdir}/macros.%{name}
 
@@ -147,26 +154,34 @@ fi
 
 %files
 %license COPYING.GPLv2
-%doc ChangeLog README NEWS.txt MIGRATING.txt diff_v3_v4.txt example.txt
+%doc ChangeLog README NEWS.txt MIGRATING.txt CONTRIBUTING.txt diff_v3_v4.txt example.txt
 %{_sysconfdir}/modulefiles
 %ghost %{_sysconfdir}/profile.d/modules.csh
 %ghost %{_sysconfdir}/profile.d/modules.sh
 %ghost %{_bindir}/modulecmd
 %{_bindir}/envml
+%{_libdir}/libtclenvmodules.so
 %dir %{_datadir}/Modules
 %{_datadir}/Modules/bin
 %dir %{_datadir}/Modules/libexec
 %{_datadir}/Modules/libexec/modulecmd.tcl
 %dir %{_datadir}/Modules/init
 %{_datadir}/Modules/init/*
-%{_datadir}/Modules/init/.modulespath
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/initrc
+%config(noreplace) %{_sysconfdir}/%{name}/modulespath
+%config(noreplace) %{_sysconfdir}/%{name}/siteconfig.tcl
 %{_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
 %{macrosdir}/macros.%{name}
+%{vimdatadir}/ftdetect/modulefile.vim
+%{vimdatadir}/ftplugin/modulefile.vim
+%{vimdatadir}/syntax/modulefile.vim
 
 %files compat
 %doc ChangeLog-compat NEWS-compat
@@ -176,6 +191,15 @@ fi
 
 
 %changelog
+* Tue Aug 18 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.2-1
+- Update to 4.5.2 (#1860674)
+
+* Mon Jul 13 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.1-1
+- Update to 4.5.1 (#1642837)
+
+* Thu Jul 09 2020 Jan Synáček <jsynacek@redhat.com> - 4.5.0-1
+- Update to 4.5.0 (#1642837)
+
 * Tue Aug 06 2019 Jan Macku <jamacku@redhat.com> - 4.1.4-4
 - Gating rebuilt