diff --git a/0001-findutils-leaf-opt.patch b/backport-findutils-leaf-opt.patch similarity index 100% rename from 0001-findutils-leaf-opt.patch rename to backport-findutils-leaf-opt.patch diff --git a/0001-findutils-xautofs.patch b/backport-findutils-xautofs.patch similarity index 100% rename from 0001-findutils-xautofs.patch rename to backport-findutils-xautofs.patch diff --git a/backport-maint-fix-typo-in-comments-in-parser.c.patch b/backport-maint-fix-typo-in-comments-in-parser.c.patch new file mode 100644 index 0000000000000000000000000000000000000000..7f69c818ec2742829b63d05ab16286708226ee71 --- /dev/null +++ b/backport-maint-fix-typo-in-comments-in-parser.c.patch @@ -0,0 +1,38 @@ +From 6a56f165c5f6749f385d54da801a49f2120c6dd1 Mon Sep 17 00:00:00 2001 +From: Bernhard Voelker +Date: Thu, 22 Apr 2021 21:38:34 +0200 +Subject: [PATCH] maint: fix typo in comments in parser.c + +* find/parser.c: s/fnd/find/; s/consiming/consuming/ + +Reference:https://git.savannah.gnu.org/cgit/findutils.git/commit/?id=6a56f165c5f6749f385d54da801a49f2120c6dd1 +Conflict:NA +--- + find/parser.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/find/parser.c b/find/parser.c +index 85469827..1ebf2548 100644 +--- a/find/parser.c ++++ b/find/parser.c +@@ -431,7 +431,7 @@ check_option_combinations (const struct predicate *p) + /* The user specified both -delete and -prune. One might test + * this by first doing + * find dirs .... -prune ..... -print +- * to fnd out what's going to get deleted, and then switch to ++ * to find out what's going to get deleted, and then switch to + * find dirs .... -prune ..... -delete + * once we are happy. Unfortunately, the -delete action also + * implicitly turns on -depth, which will affect the behaviour +@@ -2904,7 +2904,7 @@ insert_exec_ok (const char *action, + { + allow_plus = false; + /* If find reads stdin (i.e. for -ok and similar), close stdin +- * in the child to prevent some script from consiming the output ++ * in the child to prevent some script from consuming the output + * intended for find. + */ + execp->close_stdin = true; +-- +2.33.0 + diff --git a/findutils.spec b/findutils.spec index 29aa47adb2e7cb54da7fa260c99a52bcdee1546e..c0d0ffcdeb2e3c5c6cbec9d6cf19067be8adb22f 100644 --- a/findutils.spec +++ b/findutils.spec @@ -1,7 +1,7 @@ Name: findutils Epoch: 2 Version: 4.8.0 -Release: 3 +Release: 4 Summary: The GNU Find Utilities License: GPLv3+ URL: http://www.gnu.org/software/findutils/ @@ -9,9 +9,10 @@ Source0: https://ftp.gnu.org/pub/gnu/findutils/%{name}-%{version}.tar.xz # resolve test failures when ran as root # https://savannah.gnu.org/bugs/?57762 -Patch1: 0001-findutils-xautofs.patch +Patch1: backport-findutils-xautofs.patch # rhbz #1252549 #1299169 -Patch2: 0001-findutils-leaf-opt.patch +Patch2: backport-findutils-leaf-opt.patch +Patch3: backport-maint-fix-typo-in-comments-in-parser.c.patch Buildrequires: gcc autoconf gettext-devel texinfo libselinux-devel dejagnu automake gdb Requires(post): info @@ -94,6 +95,12 @@ fi %exclude %{_mandir}/man5/locatedb.5* %changelog +* Tue Oct 25 2022 zhoushuiqing - 2:4.8.0-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix typo in comments in parser.c + * Sat Feb 26 2022 shixuantong - 2:4.8.0-3 - Type:bugfix - ID:NA