Compare commits
10 Commits
464c28f37d
...
af0da86a89
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
af0da86a89 | ||
|
|
e0753c39ba | ||
|
|
9685279d8f | ||
|
|
4e015d3795 | ||
|
|
ba505f6d36 | ||
|
|
dd82c98963 | ||
|
|
db1ef3feb2 | ||
|
|
d43cb72a31 | ||
|
|
c5fb8d2dfe | ||
|
|
459c56e997 |
@ -1,14 +1,12 @@
|
|||||||
%define debug_package %{nil}
|
%global vimdatadir %{_datadir}/Modules/share/vim/vimfiles
|
||||||
%global vimdatadir %{_datadir}/vim/vimfiles
|
|
||||||
|
|
||||||
Name: environment-modules
|
Name: environment-modules
|
||||||
Version: 4.6.1
|
Version: 5.0.1
|
||||||
Release: 1
|
Release: 4
|
||||||
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
|
||||||
@ -69,21 +67,16 @@ 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}/*
|
||||||
|
|
||||||
install -D -p -m 644 contrib/rpm/macros.%{name} $RPM_BUILD_ROOT/%{_rpmconfigdir}/macros.d/macros.%{name}
|
install -D -p -m 644 contrib/rpm/macros.%{name} $RPM_BUILD_ROOT/%{_rpmconfigdir}/macros.d/macros.%{name}
|
||||||
install -p script/createmodule{.sh,.py} $RPM_BUILD_ROOT%{_datadir}/Modules/bin
|
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
make test
|
make test
|
||||||
|
|
||||||
%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
|
||||||
@ -95,9 +88,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
|
||||||
@ -125,19 +116,32 @@ fi
|
|||||||
%ghost %{_sysconfdir}/profile.d/modules.csh
|
%ghost %{_sysconfdir}/profile.d/modules.csh
|
||||||
%ghost %{_sysconfdir}/profile.d/modules.sh
|
%ghost %{_sysconfdir}/profile.d/modules.sh
|
||||||
%ghost %{_bindir}/modulecmd
|
%ghost %{_bindir}/modulecmd
|
||||||
|
|
||||||
%files help
|
|
||||||
%doc ChangeLog README doc/build/{NEWS.txt,MIGRATING.txt,diff_v3_v4.txt} doc/example.txt
|
|
||||||
%ghost %{_mandir}/man1/module.1.gz
|
|
||||||
%ghost %{_mandir}/man4/modulefile.4.gz
|
|
||||||
%{_mandir}/man1/ml.1.gz
|
|
||||||
%{_mandir}/man1/module-c.1.gz
|
|
||||||
%{_mandir}/man4/modulefile-c.4.gz
|
|
||||||
%{vimdatadir}/ftdetect/modulefile.vim
|
%{vimdatadir}/ftdetect/modulefile.vim
|
||||||
%{vimdatadir}/ftplugin/modulefile.vim
|
%{vimdatadir}/ftplugin/modulefile.vim
|
||||||
%{vimdatadir}/syntax/modulefile.vim
|
%{vimdatadir}/syntax/modulefile.vim
|
||||||
|
|
||||||
|
%files help
|
||||||
|
%doc ChangeLog README doc/build/{NEWS.txt,MIGRATING.txt,diff_v3_v4.txt}
|
||||||
|
%{_mandir}/man1/module.1.gz
|
||||||
|
%{_mandir}/man4/modulefile.4.gz
|
||||||
|
%{_mandir}/man1/ml.1.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 25 2023 zhoupengcheng <zhoupengcheng11@huawei.com> - 5.0.1-4
|
||||||
|
- DESC:No man page provided via alternatives
|
||||||
|
|
||||||
|
* Tue Nov 29 2022 zhoupengcheng <zhoupengcheng11@huawei.com> - 5.0.1-3
|
||||||
|
- delete unnecessary patch
|
||||||
|
|
||||||
|
* Mon Jul 18 2022 zoulin <zoulin13@h-partners.com> - 5.0.1-2
|
||||||
|
- delete duplicate files
|
||||||
|
|
||||||
|
* Wed Dec 1 2021 zoulin <zoulin13@huawei.com> - 5.0.1-1
|
||||||
|
- upgrade version to 5.0.1
|
||||||
|
|
||||||
|
* Wed Mar 24 2021 shixuantong <shixuantong@huawei.com> - 4.6.1-2
|
||||||
|
- add debuginfo and debugsource
|
||||||
|
|
||||||
* Mon Feb 1 2021 liudabo <liudabo1@huawei.com> - 4.6.1-1
|
* Mon Feb 1 2021 liudabo <liudabo1@huawei.com> - 4.6.1-1
|
||||||
- upgrade version to 4.6.1
|
- upgrade version to 4.6.1
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
BIN
modules-5.0.1.tar.bz2
Normal file
BIN
modules-5.0.1.tar.bz2
Normal file
Binary file not shown.
@ -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 testsuite [set "u_$field"] noescval]
|
|
||||||
Loading…
x
Reference in New Issue
Block a user