From b3b7b0f034a426538ed2083487a4da4648ebbc74 Mon Sep 17 00:00:00 2001 From: Captain Wei Date: Mon, 11 May 2020 11:30:30 +0800 Subject: [PATCH 1/4] add yaml file --- environment-modules.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 environment-modules.yaml diff --git a/environment-modules.yaml b/environment-modules.yaml new file mode 100644 index 0000000..621c3f6 --- /dev/null +++ b/environment-modules.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: cea-hpc/modules +tag_prefix: ^v +seperator: . From cb913428ac6fa335a6f2af46a4280f1e1de7cd03 Mon Sep 17 00:00:00 2001 From: Captain Date: Tue, 26 May 2020 14:54:51 +0800 Subject: [PATCH 2/4] add csh build dependancy --- environment-modules.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/environment-modules.spec b/environment-modules.spec index 7e6ba9d..81da714 100644 --- a/environment-modules.spec +++ b/environment-modules.spec @@ -2,13 +2,13 @@ Name: environment-modules Version: 4.1.4 -Release: 3 +Release: 4 Summary: Provides dynamic modification of a user's environment License: GPLv2+ URL: http://modules.sourceforge.net/ Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2 -BuildRequires: gcc tcl-devel libX11-devel dejagnu sed procps hostname man less +BuildRequires: gcc tcl-devel libX11-devel dejagnu sed procps hostname man less csh Requires: tcl sed procps man less Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -122,6 +122,9 @@ fi %{_mandir}/man4/modulefile-c.4.gz %changelog +* Tue May 26 2020 Captain Wei - 4.1.4-4 +- Add csh build requires + * Wed Jan 15 2020 openEuler Buildteam - 4.1.4-3 - Delete unneeded build requires From ced3683f1180782f6bd0bd2fa954b100d1c0ed9b Mon Sep 17 00:00:00 2001 From: Captain Date: Tue, 26 May 2020 16:59:36 +0800 Subject: [PATCH 3/4] remove modification of spec file --- environment-modules.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/environment-modules.spec b/environment-modules.spec index 81da714..7e6ba9d 100644 --- a/environment-modules.spec +++ b/environment-modules.spec @@ -2,13 +2,13 @@ Name: environment-modules Version: 4.1.4 -Release: 4 +Release: 3 Summary: Provides dynamic modification of a user's environment License: GPLv2+ URL: http://modules.sourceforge.net/ Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2 -BuildRequires: gcc tcl-devel libX11-devel dejagnu sed procps hostname man less csh +BuildRequires: gcc tcl-devel libX11-devel dejagnu sed procps hostname man less Requires: tcl sed procps man less Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -122,9 +122,6 @@ fi %{_mandir}/man4/modulefile-c.4.gz %changelog -* Tue May 26 2020 Captain Wei - 4.1.4-4 -- Add csh build requires - * Wed Jan 15 2020 openEuler Buildteam - 4.1.4-3 - Delete unneeded build requires From 6a1e2e0a029ef7314f1e5fefb09897c3b7bbb6e3 Mon Sep 17 00:00:00 2001 From: Captain Date: Wed, 27 May 2020 16:25:13 +0800 Subject: [PATCH 4/4] add patch --- environment-modules.spec | 6 +++++- openeuler-20200527.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 openeuler-20200527.patch diff --git a/environment-modules.spec b/environment-modules.spec index 7e6ba9d..542a630 100644 --- a/environment-modules.spec +++ b/environment-modules.spec @@ -2,11 +2,12 @@ Name: environment-modules Version: 4.1.4 -Release: 3 +Release: 4 Summary: Provides dynamic modification of a user's environment License: GPLv2+ URL: http://modules.sourceforge.net/ 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 Requires: tcl sed procps man less @@ -122,6 +123,9 @@ fi %{_mandir}/man4/modulefile-c.4.gz %changelog +* Wed May 27 2020 Captain Wei - 4.1.4-4 +- Disable uname test tempoary + * Wed Jan 15 2020 openEuler Buildteam - 4.1.4-3 - Delete unneeded build requires diff --git a/openeuler-20200527.patch b/openeuler-20200527.patch new file mode 100644 index 0000000..a41b8ea --- /dev/null +++ b/openeuler-20200527.patch @@ -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]