From a66bc1cf7bfcc2cf0a82c891d2501f25c08a9352 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 23 Nov 2020 23:30:12 +0800 Subject: [PATCH 1/2] [patch tracking] 20201123233007632138 - https://github.com/coreutils/coreutils/commit/382044196e97ab04ba01e5c313a8a4e06723abb9 --- 382044196e97ab04ba01e5c313a8a4e06723abb9.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 382044196e97ab04ba01e5c313a8a4e06723abb9.patch diff --git a/382044196e97ab04ba01e5c313a8a4e06723abb9.patch b/382044196e97ab04ba01e5c313a8a4e06723abb9.patch new file mode 100644 index 0000000..4fc8af3 --- /dev/null +++ b/382044196e97ab04ba01e5c313a8a4e06723abb9.patch @@ -0,0 +1,12 @@ +diff --git a/po/POTFILES.in b/po/POTFILES.in +index 074322393..5ccc0e9a9 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -109,7 +109,6 @@ src/remove.c + src/rm.c + src/rmdir.c + src/runcon.c +-src/selinux.c + src/seq.c + src/set-fields.c + src/shred.c -- Gitee From 6ec88a500e49bc08c027b6c18ee234fa1ba044c3 Mon Sep 17 00:00:00 2001 From: openeuler-ci-bot <80474298@qq.com> Date: Mon, 23 Nov 2020 23:30:13 +0800 Subject: [PATCH 2/2] [patch tracking] 20201123233007632138 - update spec file --- coreutils.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/coreutils.spec b/coreutils.spec index f5a08aa..74ce094 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: 382044196e97ab04ba01e5c313a8a4e06723abb9.patch Conflicts: filesystem < 3 # To avoid clobbering installs @@ -135,6 +136,9 @@ fi %{_mandir}/man*/* %changelog +* 20201123233007632138 patch-tracking 8.32-3 +- append patch file of upstream repository from <382044196e97ab04ba01e5c313a8a4e06723abb9> to <382044196e97ab04ba01e5c313a8a4e06723abb9> + * 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