From 7c99a4e4fae8c26a329fbcb48743c47c947e3590 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 3 Jan 2021 22:58:53 +0800 Subject: [PATCH 1/2] [patch tracking] 20210103225849748336 - https://github.com/coreutils/coreutils/commit/ebf2c4dcc687c9f057a8a22674fd984aa929012e --- ...c4dcc687c9f057a8a22674fd984aa929012e.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 ebf2c4dcc687c9f057a8a22674fd984aa929012e.patch diff --git a/ebf2c4dcc687c9f057a8a22674fd984aa929012e.patch b/ebf2c4dcc687c9f057a8a22674fd984aa929012e.patch new file mode 100644 index 0000000..12a19f9 --- /dev/null +++ b/ebf2c4dcc687c9f057a8a22674fd984aa929012e.patch @@ -0,0 +1,20 @@ +diff --git a/man/cat.x b/man/cat.x +index b84600fbd..9eb38cf05 100644 +--- a/man/cat.x ++++ b/man/cat.x +@@ -3,4 +3,4 @@ cat \- concatenate files and print on the standard output + [DESCRIPTION] + .\" Add any additional description here + [SEE ALSO] +-\fBtac\fP(1) ++tac(1) +diff --git a/man/tac.x b/man/tac.x +index 66bd338ec..677da2f82 100644 +--- a/man/tac.x ++++ b/man/tac.x +@@ -3,4 +3,4 @@ tac \- concatenate and print files in reverse + [DESCRIPTION] + .\" Add any additional description here + [SEE ALSO] +-\fBrev\fP(1) ++cat(1), rev(1) -- Gitee From b3f5b7a8ff7a4abe80ad469966facc90bcb94278 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Sun, 3 Jan 2021 22:58:54 +0800 Subject: [PATCH 2/2] [patch tracking] 20210103225849748336 - update spec file --- coreutils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index f5a08aa..5f9199d 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,6 +1,6 @@ Name: coreutils Version: 8.32 -Release: 2 +Release: 3 License: GPLv3+ Summary: A set of basic GNU tools commonly used in shell scripts Url: https://www.gnu.org/software/coreutils/ @@ -25,6 +25,7 @@ Patch8: skip-the-tests-that-require-selinux-if-selinux-is-di.patch Patch9: coreutils-8.32-ls-removed-dir.patch Patch10: coreutils-8.32-leaf-opt-xfs.patch +Patch6000: ebf2c4dcc687c9f057a8a22674fd984aa929012e.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +136,9 @@ fi %{_mandir}/man*/* %changelog +* 20210103225849748336 patch-tracking 8.32-3 +- append patch file of upstream repository from to + * Wed Aug 26 2020 chenbo pan - 8.32-2 - fix patch error @@ -221,4 +225,4 @@ fi - reintroduce very old Provides (mktemp, sh-utils, textwrap, fileutils, stat) * Thu Jul 12 2018 hexiaowen - 8.30-1 -- Pacakge init +- Pacakge init \ No newline at end of file -- Gitee