diff --git a/coreutils-9.5-ls-k-info-fix.patch b/coreutils-9.5-ls-k-info-fix.patch new file mode 100644 index 0000000..ac9b579 --- /dev/null +++ b/coreutils-9.5-ls-k-info-fix.patch @@ -0,0 +1,28 @@ +From 6eb93a992f32d5e8973a195ba167ca7beee02ca5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= +Date: Wed, 2 Oct 2024 17:45:26 +0200 +Subject: [PATCH] doc: ls: fix regression in -k description + +The description of -k regressed in coreutils 9.0 + +* doc/coreutils.texi (ls invocation): Fix incomplete paragraph +describing -k introduced by a mistake in commit v8.32-180-g1625916a1. +--- + doc/coreutils.texi | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/doc/coreutils.texi b/doc/coreutils.texi +index 03dfd0011..d5dd55092 100644 +--- a/doc/coreutils.texi ++++ b/doc/coreutils.texi +@@ -8441,6 +8441,7 @@ overriding any contrary specification in environment variables + (@pxref{Block size}). If @option{--block-size}, + @option{--human-readable} (@option{-h}), or @option{--si} options are used, + they take precedence even if @option{--kibibytes} (@option{-k}) is placed after ++the other options. + + The @option{--kibibytes} (@option{-k}) option affects the + per-directory block count written in long format, +-- +2.46.2 + diff --git a/coreutils.spec b/coreutils.spec index 56827dc..6cd8d31 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,7 +1,7 @@ Summary: A set of basic GNU tools commonly used in shell scripts Name: coreutils Version: 9.5 -Release: 3%{?dist} +Release: 4%{?dist} # some used parts of gnulib are under various variants of LGPL License: GPL-3.0-or-later AND GFDL-1.3-no-invariants-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later Url: https://www.gnu.org/software/coreutils/ @@ -32,6 +32,10 @@ Patch103: coreutils-python3.patch # df --direct Patch104: coreutils-df-direct.patch +# doc: ls: fix regression in -k description +# upstream commit: https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=2606f5a0437e092078167afbcd1dabb1b00ecb88 +Patch105: coreutils-9.5-ls-k-info-fix.patch + # (sb) lin18nux/lsb compliance - multibyte functionality patch Patch800: coreutils-i18n.patch @@ -264,6 +268,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir %license COPYING %changelog +* Thu Oct 03 2024 Lukáš Zaoral - 9.5-4 +- fix typo in ls -k info page (RHEL-60268) + * Fri Sep 27 2024 Lukáš Zaoral - 9.5-3 - fix fold -b with UTF-8 locale (RHEL-60295)