diff --git a/.gitignore b/.gitignore index 3014eee..9751683 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,6 @@ modules-3.2.8.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 diff --git a/environment-modules.spec b/environment-modules.spec index f46a29f..65ae317 100644 --- a/environment-modules.spec +++ b/environment-modules.spec @@ -1,16 +1,14 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global vimdatadir %{_datadir}/vim/vimfiles -%bcond_with compat - Name: environment-modules -Version: 4.7.0 -Release: 3%{?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 @@ -19,14 +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 -%if %{with compat} -# specific requirements to build compat version -BuildRequires: libX11-devel -BuildRequires: tclx-devel -%endif Requires: tcl Requires: sed Requires: less @@ -37,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 @@ -62,21 +56,8 @@ suite of different applications. NOTE: You will need to get a new shell after installing this package to have access to the module alias. -%if %{with compat} -%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). -%endif - %prep -%setup -q -n modules-%{version} +%setup -q -n modules-5.0.0-alpha %build @@ -88,14 +69,9 @@ This package provides Environment Modules compatibility version (3.2). --mandir=%{_mandir} \ --vimdatadir=%{vimdatadir} \ --enable-multilib-support \ -%if %{with compat} - --enable-compat-version \ -%endif --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' @@ -119,24 +95,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 @@ -155,26 +125,11 @@ fi --slave %{_sysconfdir}/profile.d/modules.csh modules.csh %{_datadir}/Modules/init/profile.csh \ --slave %{_bindir}/modulecmd modulecmd %{_datadir}/Modules/libexec/modulecmd.tcl -%if %{with compat} -%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 -%endif - %postun if [ $1 -eq 0 ] ; then %{_sbindir}/update-alternatives --remove modules.sh %{_datadir}/Modules/init/profile.sh fi -%if %{with compat} -%postun compat -if [ $1 -eq 0 ] ; then - %{_sbindir}/update-alternatives --remove modules.sh %{_datadir}/Modules/init/profile-compat.sh -fi -%endif - %files %license COPYING.GPLv2 %doc ChangeLog README NEWS.txt MIGRATING.txt CONTRIBUTING.txt diff_v3_v4.txt example.txt @@ -204,15 +159,16 @@ fi %{vimdatadir}/ftplugin/modulefile.vim %{vimdatadir}/syntax/modulefile.vim -%if %{with compat} -%files compat -%doc ChangeLog-compat NEWS-compat -%{_datadir}/Modules/libexec/modulecmd-compat -%{_mandir}/man1/module-compat.1.gz -%{_mandir}/man4/modulefile-compat.4.gz -%endif - %changelog +* Tue Aug 3 2021 Lukas Zaoral - 5.0.0-0.1.alpha +- Update to 5.0.0-alpha (#1989523) + + Based on spec by Xavier Delaruelle in Fedora Rawhide. Thanks a lot! +- 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 May 19 2021 Joe Orton - 4.7.0-3 - add bcond for compat subpackage (#1940568) diff --git a/sources b/sources index 33b55ee..e4da968 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (modules-4.7.0.tar.bz2) = f53b260a0a27b0ecc11a87136a0fe5776d32e37cc9755565c0fc11d4c6c33bdbef13d3d1a8c1c6a77980fec41ed1a60fc793e668745fee8b10c41051a602be1c +SHA512 (modules-5.0.0-alpha.tar.bz2) = f6db7ebbd7b48e14a501c9b17df0e2e628f4cdd2638cfb2d753de14cda9f7036280a515b618a3774e87d6111df8bc46bb1ed000d8a000587379081dfbab690a1