From b66d1de47f2f92de2aed5a3b96e88cb0f1bb8e03 Mon Sep 17 00:00:00 2001 From: Renbo Date: Wed, 26 Jun 2024 15:12:33 +0800 Subject: [PATCH 1/3] update to findutils-4.6.0-22.src.rpm Signed-off-by: Renbo --- ...-4.6.0-improve-printf-Ak-description.patch | 80 +++++++++++++++++++ findutils.spec | 26 ++---- 2 files changed, 87 insertions(+), 19 deletions(-) create mode 100644 findutils-4.6.0-improve-printf-Ak-description.patch diff --git a/findutils-4.6.0-improve-printf-Ak-description.patch b/findutils-4.6.0-improve-printf-Ak-description.patch new file mode 100644 index 0000000..44fca07 --- /dev/null +++ b/findutils-4.6.0-improve-printf-Ak-description.patch @@ -0,0 +1,80 @@ +From efa455493063270406f3c206d62032a475e52c47 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Tue, 6 Oct 2020 17:10:08 +0200 +Subject: [PATCH] doc: avoid misunderstanding of '-printf %Ak' description + +* find/find.1 (-printf): Make it clear that the list of conversion +specification characters of '%Ak' is incomplete; refer to the +strftime() documentation. While at it, document the F conversion +character which yields 'yyyy-mm-dd'. +* doc/find.texi (Time Formats): Likewise. + +Suggested in https://bugzilla.redhat.com/1882695 + +Cherry-picked-by: Lukáš Zaoral +--- + doc/find.texi | 11 +++++++---- + find/find.1 | 9 ++++++--- + 2 files changed, 13 insertions(+), 7 deletions(-) + +diff --git a/doc/find.texi b/doc/find.texi +index ce63ca52..0d7c8ae8 100644 +--- a/doc/find.texi ++++ b/doc/find.texi +@@ -2063,10 +2063,11 @@ behaviour, because other directives may be added in the future. + @node Time Formats + @subsection Time Formats + +-Below are the formats for the directives @samp{%A}, @samp{%C}, and +-@samp{%T}, which print the file's timestamps. Some of these formats +-might not be available on all systems, due to differences in the C +-@code{strftime} function between systems. ++Below is an incomplete list of formats for the directives @samp{%A}, @samp{%C}, ++and @samp{%T}, which print the file's timestamps. ++Please refer to the documentation of @code{strftime} for the full list. ++Some of these formats might not be available on all systems, due to differences ++in the implementation of the C @code{strftime} function. + + @menu + * Time Components:: +@@ -2162,6 +2163,8 @@ locale's date and time in ctime format (Sat Nov 04 12:02:33 EST + seconds field. + @item D + date (mm/dd/yy) ++@item F ++date (yyyy-mm-dd) + @item x + locale's date representation (mm/dd/yy) + @item + +diff --git a/find/find.1 b/find/find.1 +index ee7c6842..27ec62cd 100644 +--- a/find/find.1 ++++ b/find/find.1 +@@ -1420,10 +1420,11 @@ + File's last access time in the format returned by the C `ctime' function. + .IP %A\fIk\fP + File's last access time in the format specified by \fIk\fR, which is +-either `@' or a directive for the C `strftime' function. The possible +-values for \fIk\fR are listed below; some of them might not be +-available on all systems, due to differences in `strftime' between +-systems. ++either `@' or a directive for the C `strftime' function. The following ++shows an incomplete list of possible values for \fIk\fR. ++Please refer to the documentation of `strftime' for the full list. ++Some of the conversion specification characters might not be available on all systems, ++due to differences in the implementation of the `strftime' library function. + .RS + .IP @ + seconds since Jan.\& 1, 1970, 00:00 GMT, with fractional part. +@@ -1476,6 +1477,8 @@ in the seconds field. + day of month (01..31) + .IP D + date (mm/dd/yy) ++.IP F ++date (yyyy-mm-dd) + .IP h + same as b + .IP j +-- +2.41.0 + diff --git a/findutils.spec b/findutils.spec index dd54649..c5bb488 100644 --- a/findutils.spec +++ b/findutils.spec @@ -1,8 +1,7 @@ -%define anolis_release .0.1 Summary: The GNU versions of find utilities (find and xargs) Name: findutils Version: 4.6.0 -Release: 21%{anolis_release}%{?dist} +Release: 22%{?dist} Epoch: 1 License: GPLv3+ Group: Applications/File @@ -53,6 +52,9 @@ Patch13: findutils-4.6.0-covscan.patch # fix find not obeying option -ignore_readdir_race in symlink_loop (#2232278) Patch14: findutils-4.6.0-ignore_readdir_race-symlink_loop.patch +# manpage of find is incomplete regarding printf options (#1882695) +Patch15: findutils-4.6.0-improve-printf-Ak-description.patch + Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Conflicts: filesystem < 3 @@ -67,9 +69,6 @@ BuildRequires: git BuildRequires: libselinux-devel BuildRequires: texinfo -Requires: glibc -Provides: /usr/bin/xargs - %description The findutils package contains programs which will help you locate files on your system. The find utility searches through a hierarchy @@ -81,14 +80,6 @@ names generated by the find command). You should install findutils because it includes tools that are very useful for finding things on your system. -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{epoch}:%{version}-%{release} - - -%description doc -Doc pages for %{name} %prep %autosetup -N -S git @@ -156,6 +147,7 @@ fi %files -f %{name}.lang %{!?_licensedir:%global license %%doc} %license COPYING +%doc AUTHORS NEWS README THANKS TODO %{_bindir}/find %{_bindir}/xargs %{_mandir}/man1/find.1* @@ -163,13 +155,9 @@ fi %{_infodir}/find.info* %{_infodir}/find-maint.info.gz -%files doc -%doc AUTHORS NEWS README THANKS TODO - %changelog -* Mon Dec 11 2023 Chang Gao - 4.6.0-21.0.1 -- Add doc sub package -- Fix the doc package requirement +* Mon Aug 21 2023 Lukáš Zaoral - 1:4.6.0-22 +- improve description of printf options in find manpage (#1882695) * Wed Aug 16 2023 Lukáš Zaoral - 1:4.6.0-21 - fix find not obeying option -ignore_readdir_race in symlink_loop (#2232278) -- Gitee From b574a2cfc9fbe3cf0150ab9453d46faeeef6f4a2 Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Sun, 17 Jul 2022 16:57:57 +0800 Subject: [PATCH 2/3] spec: add doc sub package --- findutils.spec | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/findutils.spec b/findutils.spec index c5bb488..c6004df 100644 --- a/findutils.spec +++ b/findutils.spec @@ -1,7 +1,8 @@ +%define anolis_release .0.1 Summary: The GNU versions of find utilities (find and xargs) Name: findutils Version: 4.6.0 -Release: 22%{?dist} +Release: 22%{anolis_release}%{?dist} Epoch: 1 License: GPLv3+ Group: Applications/File @@ -69,6 +70,9 @@ BuildRequires: git BuildRequires: libselinux-devel BuildRequires: texinfo +Requires: glibc +Provides: /usr/bin/xargs + %description The findutils package contains programs which will help you locate files on your system. The find utility searches through a hierarchy @@ -80,6 +84,14 @@ names generated by the find command). You should install findutils because it includes tools that are very useful for finding things on your system. +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + + +%description doc +Doc pages for %{name} %prep %autosetup -N -S git @@ -147,7 +159,6 @@ fi %files -f %{name}.lang %{!?_licensedir:%global license %%doc} %license COPYING -%doc AUTHORS NEWS README THANKS TODO %{_bindir}/find %{_bindir}/xargs %{_mandir}/man1/find.1* @@ -155,7 +166,13 @@ fi %{_infodir}/find.info* %{_infodir}/find-maint.info.gz +%files doc +%doc AUTHORS NEWS README THANKS TODO + %changelog +* Wed Jun 26 2024 Chang Gao - 4.6.0-22.0.1 +- Add doc sub package + * Mon Aug 21 2023 Lukáš Zaoral - 1:4.6.0-22 - improve description of printf options in find manpage (#1882695) -- Gitee From 9adab1e671ce57cfe6612d223bde6f2ad8c570f1 Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Thu, 3 Nov 2022 19:10:39 +0800 Subject: [PATCH 3/3] Fix the doc package requirement --- findutils.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/findutils.spec b/findutils.spec index c6004df..d0fc027 100644 --- a/findutils.spec +++ b/findutils.spec @@ -87,7 +87,7 @@ useful for finding things on your system. %package doc Summary: Documents for %{name} BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{epoch}:%{version}-%{release} %description doc @@ -172,6 +172,7 @@ fi %changelog * Wed Jun 26 2024 Chang Gao - 4.6.0-22.0.1 - Add doc sub package +- Fix the doc package requirement * Mon Aug 21 2023 Lukáš Zaoral - 1:4.6.0-22 - improve description of printf options in find manpage (#1882695) -- Gitee