Update to 5.0.0-alpha

.gitignore

@@ -28,3 +28,4 @@ modules-3.2.8.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

environment-modules.spec

@@ -2,13 +2,13 @@
 %global vimdatadir %{_datadir}/vim/vimfiles
 
 Name:           environment-modules
-Version:        4.8.0
-Release:        2%{?dist}
+Version:        5.0.0
+Release:        0.1.alpha%{?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
+Source0:        http://downloads.sourceforge.net/modules/modules-5.0.0-alpha.tar.bz2
 
 BuildRequires:  tcl
 BuildRequires:  dejagnu
@@ -17,12 +17,9 @@ BuildRequires:  sed
 BuildRequires:  less
 BuildRequires:  hostname
 BuildRequires:  procps-ng
-# specific requirements to build compat version and extension library
+# specific requirements to build extension library
 BuildRequires:  gcc
 BuildRequires:  tcl-devel
-# specific requirements to build compat version
-BuildRequires:  libX11-devel
-BuildRequires:  tclx-devel
 Requires:       tcl
 Requires:       sed
 Requires:       less
@@ -33,6 +30,7 @@ Requires(post): coreutils
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
 Provides:       environment(modules)
+Obsoletes:      environment-modules-compat <= 4.8.99
 
 %description
 The Environment Modules package provides for the dynamic modification of
@@ -58,20 +56,9 @@ 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
-%setup -q -n modules-%{version}
+%setup -q -n modules-5.0.0-alpha
 
 
 %build
@@ -83,12 +70,9 @@ This package provides Environment Modules compatibility version (3.2).
            --mandir=%{_mandir} \
            --vimdatadir=%{vimdatadir} \
            --enable-multilib-support \
-           --enable-compat-version \
            --disable-doc-install \
-           --enable-dotmodulespath \
-           --disable-set-shell-startup \
+           --enable-modulespath \
            --with-python=/usr/bin/python3 \
-           --with-initconf-in=etcdir \
            --with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles \
            --with-quarantine-vars='LD_LIBRARY_PATH LD_PRELOAD'
 
@@ -112,24 +96,18 @@ rm -f %{buildroot}%{_datadir}/Modules/bin/modulecmd
 # 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/,}CONTRIBUTING.txt
 mv {doc/build/,}diff_v3_v4.txt
 mv {doc/,}example.txt
 
-cp -p script/createmodule.sh %{buildroot}%{_datadir}/Modules/bin
-
 # install the rpm config file
 install -Dpm 644 contrib/rpm/macros.%{name} %{buildroot}/%{macrosdir}/macros.%{name}
 
 
 %check
-make test
+make test QUICKTEST=1
 
 
 %post
@@ -148,22 +126,11 @@ fi
   --slave %{_sysconfdir}/profile.d/modules.csh modules.csh %{_datadir}/Modules/init/profile.csh \
   --slave %{_bindir}/modulecmd modulecmd %{_datadir}/Modules/libexec/modulecmd.tcl
 
-%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
-
 %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
@@ -194,14 +161,16 @@ fi
 %{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
-
 
 %changelog
+* 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
 

sources

@@ -1 +1 @@
-SHA512 (modules-4.8.0.tar.bz2) = eee84babae9475da4b3da9dac343aa5900e367f90698bd4fd1979159f87b90c463d82b9052794a5f30498c11b39e21db1680723e2a898bddbad742d3c2aa5a57
+SHA512 (modules-5.0.0-alpha.tar.bz2) = f6db7ebbd7b48e14a501c9b17df0e2e628f4cdd2638cfb2d753de14cda9f7036280a515b618a3774e87d6111df8bc46bb1ed000d8a000587379081dfbab690a1