!3 modify spec and add yaml file
Merge pull request !3 from Captain.Wei/master
This commit is contained in:
commit
289fc48b37
@ -2,11 +2,12 @@
|
|||||||
|
|
||||||
Name: environment-modules
|
Name: environment-modules
|
||||||
Version: 4.1.4
|
Version: 4.1.4
|
||||||
Release: 3
|
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
|
Requires: tcl sed procps man less
|
||||||
@ -122,6 +123,9 @@ fi
|
|||||||
%{_mandir}/man4/modulefile-c.4.gz
|
%{_mandir}/man4/modulefile-c.4.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed May 27 2020 Captain Wei <captain.a.wei@gmail.com> - 4.1.4-4
|
||||||
|
- Disable uname test tempoary
|
||||||
|
|
||||||
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.1.4-3
|
* Wed Jan 15 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.1.4-3
|
||||||
- Delete unneeded build requires
|
- Delete unneeded build requires
|
||||||
|
|
||||||
|
|||||||
4
environment-modules.yaml
Normal file
4
environment-modules.yaml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
version_control: github
|
||||||
|
src_repo: cea-hpc/modules
|
||||||
|
tag_prefix: ^v
|
||||||
|
seperator: .
|
||||||
12
openeuler-20200527.patch
Normal file
12
openeuler-20200527.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
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