packages/environment-modules
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: packages:8bded573c132d3c42e2222be8346670fad14be91
Branches Tags
packages:main
...
compare: packages:c615480914a169eec81c8b29c3af04ad7380c1c2
Branches Tags
packages:main

10 Commits
8bded573c1 ... c615480914

Author SHA1 Message Date
openeuler-ci-bot
c615480914
!40 [sync] PR-38: fix build failed 
From: @openeuler-sync-bot 
Reviewed-by: @hubin95 
Signed-off-by: @hubin95
 2024-04-17 09:59:03 +00:00
zhuofeng
96b39bd1b0 fix build failed 
(cherry picked from commit 5afd51654c2e3bbff955d0c7f4e95a25b3e628ae)
 2024-04-17 16:09:16 +08:00
openeuler-ci-bot
15f6dea4aa
!34 upgrade version to 5.3.1 
From: @markeryang 
Reviewed-by: @zhuofeng6, @gaoruoshu 
Signed-off-by: @gaoruoshu
 2024-01-31 07:20:28 +00:00
markeryang
1638fa6677 upgrade version to 5.3.1 2024-01-26 07:32:00 +00:00
openeuler-ci-bot
c3e553f693
!26 No man page provided via alternatives 
From: @zhoupengcheng11 
Reviewed-by: @gaoruoshu 
Signed-off-by: @gaoruoshu
 2023-09-25 03:27:48 +00:00
zhoupengcheng
7814577f70 No man page provided via alternatives 2023-09-25 10:22:41 +08:00
openeuler-ci-bot
5260d03986
!23 Delete unnecessary patch 
From: @zhoupengcheng11 
Reviewed-by: @lvying6 
Signed-off-by: @lvying6
 2022-12-02 02:09:34 +00:00
ZhouPengcheng
953d7f1f0d delete unnecessary patch 2022-12-01 14:13:58 +08:00
openeuler-ci-bot
c5a1ae4da5
!18 upgrade version to 5.1.1 
From: @panxh_purple 
Reviewed-by: @lvying6 
Signed-off-by: @lvying6
 2022-08-03 03:22:20 +00:00
panxiaohe
1155f6590c upgrade version to 5.1.1 2022-08-03 10:13:30 +08:00
4 changed files with 24 additions and 27 deletions
Show Stats Expand all files Collapse all files

39
environment-modules.spec
View File

@ -1,13 +1,12 @@
%global vimdatadir %{_datadir}/Modules/share/vim/vimfiles %global vimdatadir %{_datadir}/Modules/share/vim/vimfiles
Name: environment-modules Name: environment-modules
Version: 5.0.1 Version: 5.3.1
Release: 2 Release: 2
Summary: Provides dynamic modification of a user's environment Summary: Provides dynamic modification of a user's environment
License: GPLv2+ License: GPLv2+
URL: http://modules.sourceforge.net/ URL: http://modules.sourceforge.net/
Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2 Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
Patch0001: openeuler-20200527.patch
BuildRequires: gcc tcl-devel libX11-devel dejagnu sed procps hostname man less BuildRequires: gcc tcl-devel libX11-devel dejagnu sed procps hostname man less
Requires: tcl sed procps man less vim-filesystem Requires: tcl sed procps man less vim-filesystem
@ -51,6 +50,7 @@ Help document for the Environment Modules package.
--libdir=%{_libdir} \ --libdir=%{_libdir} \
--etcdir=%{_sysconfdir}/%{name} \ --etcdir=%{_sysconfdir}/%{name} \
--vimdatadir=%{vimdatadir} \ --vimdatadir=%{vimdatadir} \
--nagelfardatadir=%{_datadir}/Modules/nagelfar \
--disable-set-shell-startup \ --disable-set-shell-startup \
--with-python=/usr/bin/python3 \ --with-python=/usr/bin/python3 \
--with-initconf-in=etcdir \ --with-initconf-in=etcdir \
@ -68,8 +68,6 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.{csh,sh}
touch $RPM_BUILD_ROOT%{_bindir}/modulecmd touch $RPM_BUILD_ROOT%{_bindir}/modulecmd
rm -f $RPM_BUILD_ROOT%{_datadir}/Modules/bin/modulecmd rm -f $RPM_BUILD_ROOT%{_datadir}/Modules/bin/modulecmd
mv $RPM_BUILD_ROOT%{_datadir}/Modules/bin/envml $RPM_BUILD_ROOT%{_bindir}/ mv $RPM_BUILD_ROOT%{_datadir}/Modules/bin/envml $RPM_BUILD_ROOT%{_bindir}/
mv $RPM_BUILD_ROOT%{_mandir}/man1/module{,-c}.1
mv $RPM_BUILD_ROOT%{_mandir}/man4/modulefile{,-c}.4
rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/* rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/*
@ -77,11 +75,9 @@ install -D -p -m 644 contrib/rpm/macros.%{name} $RPM_BUILD_ROOT/%{_rpmconfigdir}
%check %check
make test make test QUICKTEST=1
%post %post
[ ! -L %{_mandir}/man1/module.1.gz ] && rm -f %{_mandir}/man1/module.1.gz
[ ! -L %{_mandir}/man4/modulefile.4.gz ] && rm -f %{_mandir}/man4/modulefile.4.gz
[ ! -L %{_sysconfdir}/profile.d/modules.sh ] && rm -f %{_sysconfdir}/profile.d/modules.sh [ ! -L %{_sysconfdir}/profile.d/modules.sh ] && rm -f %{_sysconfdir}/profile.d/modules.sh
[ ! -L %{_sysconfdir}/profile.d/modules.csh ] && rm -f %{_sysconfdir}/profile.d/modules.csh [ ! -L %{_sysconfdir}/profile.d/modules.csh ] && rm -f %{_sysconfdir}/profile.d/modules.csh
[ ! -L $RPM_BUILD_ROOT%{_bindir}/modulecmd ] && rm -f %{_bindir}/modulecmd [ ! -L $RPM_BUILD_ROOT%{_bindir}/modulecmd ] && rm -f %{_bindir}/modulecmd
@ -93,9 +89,7 @@ fi
%{_sbindir}/update-alternatives \ %{_sbindir}/update-alternatives \
--install %{_sysconfdir}/profile.d/modules.sh modules.sh %{_datadir}/Modules/init/profile.sh 40 \ --install %{_sysconfdir}/profile.d/modules.sh modules.sh %{_datadir}/Modules/init/profile.sh 40 \
--slave %{_sysconfdir}/profile.d/modules.csh modules.csh %{_datadir}/Modules/init/profile.csh \ --slave %{_sysconfdir}/profile.d/modules.csh modules.csh %{_datadir}/Modules/init/profile.csh \
--slave %{_bindir}/modulecmd modulecmd %{_datadir}/Modules/libexec/modulecmd.tcl \ --slave %{_bindir}/modulecmd modulecmd %{_datadir}/Modules/libexec/modulecmd.tcl
--slave %{_mandir}/man1/module.1.gz module.1.gz %{_mandir}/man1/module-c.1.gz \
--slave %{_mandir}/man4/modulefile.4.gz modulefile.4.gz %{_mandir}/man4/modulefile-c.4.gz
%postun %postun
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
@ -126,16 +120,31 @@ fi
%{vimdatadir}/ftdetect/modulefile.vim %{vimdatadir}/ftdetect/modulefile.vim
%{vimdatadir}/ftplugin/modulefile.vim %{vimdatadir}/ftplugin/modulefile.vim
%{vimdatadir}/syntax/modulefile.vim %{vimdatadir}/syntax/modulefile.vim
%dir %{_datadir}/Modules/nagelfar
%{_datadir}/Modules/nagelfar/*
%files help %files help
%doc ChangeLog README doc/build/{NEWS.txt,MIGRATING.txt,diff_v3_v4.txt} %doc ChangeLog.gz README doc/build/{NEWS.txt,MIGRATING.txt,diff_v3_v4.txt}
%ghost %{_mandir}/man1/module.1.gz %{_mandir}/man1/module.1.gz
%ghost %{_mandir}/man4/modulefile.4.gz %{_mandir}/man4/modulefile.4.gz
%{_mandir}/man1/ml.1.gz %{_mandir}/man1/ml.1.gz
%{_mandir}/man1/module-c.1.gz
%{_mandir}/man4/modulefile-c.4.gz
%changelog %changelog
* Wed Apr 17 2024 zhuofeng <zhuofeng2@huawei.com> - 5.3.1-2
- fix build failed
* Fri Jan 26 2024 yanglongkang <yanglongkang@h-partners.com> - 5.3.1-1
- upgrade version to 5.3.1
* Mon Sep 25 2023 zhoupengcheng <zhoupengcheng11@huawei.com> - 5.1.1-3
- DESC:No man page provided via alternatives
* Thu Dec 1 2022 zhoupengcheng <zhoupengcheng11@huawei.com> - 5.1.1-2
- delete unnecessary patch
* Wed Aug 3 2022 panxiaohe <panxh.life@foxmail.com> - 5.1.1-1
- upgrade version to 5.1.1
* Mon Jul 18 2022 zoulin <zoulin13@h-partners.com> - 5.0.1-2 * Mon Jul 18 2022 zoulin <zoulin13@h-partners.com> - 5.0.1-2
- delete duplicate files - delete duplicate files

BIN
modules-5.0.1.tar.bz2
View File

Binary file not shown.

BIN
modules-5.3.1.tar.bz2 Normal file
View File

Binary file not shown.

12
openeuler-20200527.patch
View File

@ -1,12 +0,0 @@
diff -ur modules-4.1.4/testsuite/modules.50-cmds/095-uname.exp modules-4.1.4-20200527/testsuite/modules.50-cmds/095-uname.exp
--- modules-4.1.4/testsuite/modules.50-cmds/095-uname.exp 2018-08-20 23:46:50.000000000 +0800
+++ modules-4.1.4-20200527/testsuite/modules.50-cmds/095-uname.exp 2020-05-27 16:03:11.167849615 +0800
@@ -55,7 +55,7 @@
test_cmd_re "csh" "load $module/$field" $ans
}
-foreach field [list nodename version] {
+foreach field [list nodename] {
if {$uname ne ""} {
set ans [list]
lappend ans [list set _LMFILES_ "$modulefile/$field"]