From cf7025cef47e7df0daa3d6f65216cfb810d054e0 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Tue, 5 Dec 2023 14:23:34 +0800 Subject: [PATCH 1/3] update to findutils-4.6.0-21.src.rpm Signed-off-by: Zhao Hang --- dist | 2 +- findutils.spec | 28 +++++----------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/dist b/dist index 5aa45c5..9c0e36e 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8_8 +an8 diff --git a/findutils.spec b/findutils.spec index 8b41b5f..809379b 100644 --- a/findutils.spec +++ b/findutils.spec @@ -1,8 +1,7 @@ -%define anolis_release .0.2 Summary: The GNU versions of find utilities (find and xargs) Name: findutils Version: 4.6.0 -Release: 20%{anolis_release}%{?dist}.1 +Release: 21%{?dist} Epoch: 1 License: GPLv3+ Group: Applications/File @@ -50,7 +49,7 @@ Patch12: findutils-4.6.0-leaf-opt.patch # fix programming mistakes detected by static analysis (#1606953) Patch13: findutils-4.6.0-covscan.patch -# fix find not obeying option -ignore_readdir_race in symlink_loop (#2232514) +# fix find not obeying option -ignore_readdir_race in symlink_loop (#2232278) Patch14: findutils-4.6.0-ignore_readdir_race-symlink_loop.patch Requires(post): /sbin/install-info @@ -67,9 +66,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 +77,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 +144,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,16 +152,9 @@ fi %{_infodir}/find.info* %{_infodir}/find-maint.info.gz -%files doc -%doc AUTHORS NEWS README THANKS TODO - %changelog -* Mon Sep 25 2023 Chang Gao - 4.6.0-20.0.2.1 -- Add doc sub package -- Fix the doc package requirement - -* Thu Aug 17 2023 Lukáš Zaoral - 1:4.6.0-20.1 -- fix find not obeying option -ignore_readdir_race in symlink_loop (#2232514) +* Wed Aug 16 2023 Lukáš Zaoral - 1:4.6.0-21 +- fix find not obeying option -ignore_readdir_race in symlink_loop (#2232278) * Mon Nov 05 2018 Kamil Dudka - 1:4.6.0-20 - fix programming mistakes detected by static analysis (#1606953) -- Gitee From f516dea981bc3afebf1472baa6295442668e98ff 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 809379b..5cafee3 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: 21%{?dist} +Release: 21%{anolis_release}%{?dist} Epoch: 1 License: GPLv3+ Group: Applications/File @@ -66,6 +67,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 @@ -77,6 +81,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 @@ -144,7 +156,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* @@ -152,7 +163,13 @@ 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 + * 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 ef1e238ebe2b68fb01f97cf40f1435a2f8cf0607 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 5cafee3..dd54649 100644 --- a/findutils.spec +++ b/findutils.spec @@ -84,7 +84,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 @@ -169,6 +169,7 @@ fi %changelog * Mon Dec 11 2023 Chang Gao - 4.6.0-21.0.1 - Add doc sub package +- Fix the doc package requirement * Wed Aug 16 2023 Lukáš Zaoral - 1:4.6.0-21 - fix find not obeying option -ignore_readdir_race in symlink_loop (#2232278) -- Gitee