diff --git a/.gitignore b/.gitignore index 352ec20..991b768 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ modules-3.2.8.tar.bz2 /modules-4.3.1.tar.bz2 /modules-4.4.0.tar.bz2 /modules-4.4.1.tar.bz2 +/modules-4.5.0.tar.bz2 diff --git a/environment-modules.spec b/environment-modules.spec index 4733fc9..957be55 100644 --- a/environment-modules.spec +++ b/environment-modules.spec @@ -2,8 +2,8 @@ %global vimdatadir %{_datadir}/vim/vimfiles Name: environment-modules -Version: 4.4.1 -Release: 2%{?dist} +Version: 4.5.0 +Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment License: GPLv2+ @@ -69,9 +69,10 @@ This package provides Environment Modules compatibility version (3.2). --vimdatadir=%{vimdatadir} \ --enable-dotmodulespath \ --disable-set-shell-startup \ + --with-python=/usr/bin/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} @@ -103,12 +104,9 @@ mv {doc/build/,}MIGRATING.txt mv {doc/build/,}CONTRIBUTING.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 contrib/scripts/createmodule.py %{buildroot}%{_datadir}/Modules/bin -sed -i -e 1s,/usr/bin/python,/usr/bin/python3, \ - %{buildroot}%{_datadir}/Modules/bin/createmodule.py +cp -p script/createmodule.sh %{buildroot}%{_datadir}/Modules/bin install -Dpm 644 contrib/rpm/macros.%{name} %{buildroot}/%{macrosdir}/macros.%{name} @@ -173,6 +171,7 @@ fi %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 @@ -190,6 +189,10 @@ fi %changelog +* Wed Apr 8 2020 Jan Synáček - 4.5.0-1 +- Update to 4.5.0 (#1821883) + + Big thanks to Xavier Delaruelle for a spec patch! + * Tue Jan 28 2020 Fedora Release Engineering - 4.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 905244c..6fa4a4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (modules-4.4.1.tar.bz2) = 35b33ea2b394011673fddd962336f61ec1b35b4ee5669ec5fecadf84261dfee67b12072fc3d487f499ec29eedc1d6a94b6671461960e094fae8071694085bf1b +SHA512 (modules-4.5.0.tar.bz2) = 705d1677c6d4fac1ebb5bad0a726c9e6833f1c061855e9fa01f1e369d9d53cedf9a2decec73288fb3c08137c510bfdb6c670521282bb470855f4a2cd51a47f8e