diff --git a/.gitignore b/.gitignore index db00164..9f69c2b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ modules-3.2.8.tar.bz2 /modules-4.2.3.tar.bz2 /modules-4.2.4.tar.bz2 /modules-4.2.5.tar.bz2 +/modules-4.3.0.tar.bz2 diff --git a/environment-modules.spec b/environment-modules.spec index 49ad784..c4a03be 100644 --- a/environment-modules.spec +++ b/environment-modules.spec @@ -1,8 +1,9 @@ %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) +%global vimdatadir %{_datadir}/vim/vimfiles Name: environment-modules -Version: 4.2.5 -Release: 2%{?dist} +Version: 4.3.0 +Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment License: GPLv2+ @@ -13,6 +14,7 @@ BuildRequires: gcc BuildRequires: tcl-devel, tclx-devel, libX11-devel BuildRequires: dejagnu, sed, procps, hostname, man, less Requires: tcl, sed, procps, man, less +Requires: vim-filesystem Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives Provides: environment(modules) @@ -59,10 +61,15 @@ This package provides Environment Modules compatibility version (3.2). %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-initconf-in=etcdir \ --with-modulepath=%{_datadir}/Modules/modulefiles:%{_sysconfdir}/modulefiles:%{_datadir}/modulefiles \ --with-quarantine-vars=LD_LIBRARY_PATH make %{?_smp_mflags} @@ -153,13 +160,17 @@ fi %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 %ghost %{_mandir}/man1/module.1.gz @@ -167,6 +178,9 @@ fi %{_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 +190,9 @@ fi %changelog +* Mon Jul 29 2019 Jan Synáček - 4.3.0-1 +- Update to 4.3.0 (#1733752) + * Wed Jul 24 2019 Fedora Release Engineering - 4.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 7c279c0..01e8858 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (modules-4.2.5.tar.bz2) = d7c689901aeb8afb2fc0c20fdf545d60f565dac7f94e0a2f839aa12a8eb643f689d0af3008cd75e177f4eeaa45ffab4879a167e668684ef48966284fca45e962 +SHA512 (modules-4.3.0.tar.bz2) = a44810145c9d9ad904ce92ee447acd71a51e7086875d9588a82ff4a3d0613de17046fe8f731a13044c026976053926eaa0ffa292ae7016a1e3ca3b0764de6323