!23 Delete unnecessary patch

From: @zhoupengcheng11 
Reviewed-by: @lvying6 
Signed-off-by: @lvying6
This commit is contained in:
openeuler-ci-bot 2022-12-02 02:09:34 +00:00 committed by Gitee
commit 5260d03986
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 14 deletions

View File

@ -2,12 +2,11 @@
Name: environment-modules Name: environment-modules
Version: 5.1.1 Version: 5.1.1
Release: 1 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
@ -136,6 +135,9 @@ fi
%{_mandir}/man4/modulefile-c.4.gz %{_mandir}/man4/modulefile-c.4.gz
%changelog %changelog
* 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 * Wed Aug 3 2022 panxiaohe <panxh.life@foxmail.com> - 5.1.1-1
- upgrade version to 5.1.1 - upgrade version to 5.1.1

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"]