diff --git a/findutils-no-locate.patch b/findutils-no-locate.patch new file mode 100644 index 0000000..4b2f2e4 --- /dev/null +++ b/findutils-no-locate.patch @@ -0,0 +1,11 @@ +--- findutils-4.1.20/Makefile.am.no-locate 2004-07-06 11:55:04.707097969 +0100 ++++ findutils-4.1.20/Makefile.am 2004-07-06 11:55:16.655815509 +0100 +@@ -2,7 +2,7 @@ + + EXTRA_DIST = COPYING ChangeLog TODO install-sh config.h.in stamp-h.in \ + THANKS +-SUBDIRS = gnulib lib intl find xargs locate doc po ++SUBDIRS = gnulib lib intl find xargs doc po + + #ACLOCAL_AMFLAGS = + diff --git a/findutils.spec b/findutils.spec index 6ce47ad..013b7d1 100644 --- a/findutils.spec +++ b/findutils.spec @@ -4,7 +4,7 @@ Summary: The GNU versions of find utilities (find and xargs). Name: findutils Version: 4.1.20 -Release: 1 +Release: 2 Epoch: 1 License: GPL Group: Applications/File @@ -16,9 +16,11 @@ Patch3: findutils-d_type.patch Patch4: findutils-4.1.7-xargs-EIL.patch Patch5: findutils-install.patch Patch6: findutils-size.patch +Patch7: findutils-iregex.patch +Patch8: findutils-no-locate.patch %if %{WITH_SELINUX} BuildRequires: libselinux-devel -Patch7: findutils-selinux.patch +Patch9: findutils-selinux.patch %endif Prereq: /sbin/install-info Buildroot: %{_tmppath}/%{name}-%{version}-root @@ -45,9 +47,11 @@ useful for finding things on your system. %patch4 -p1 -b .xargs-EIL %patch5 -p1 -b .install %patch6 -p1 -b .size +%patch7 -p1 -b .iregex +%patch8 -p1 -b .no-locate %if %{WITH_SELINUX} #SELinux -%patch7 -p1 -b .selinux +%patch9 -p1 -b .selinux %endif rm -f config.guess config.sub @@ -114,7 +118,10 @@ rm -rf %{buildroot} %{_infodir}/find.info* %changelog -* Fri Jun 25 2004 Tim Waugh 4.1.20-1 +* Tue Jul 6 2004 Tim Waugh 1:4.1.20-2 +- Fix -iregex (bug #127297). + +* Fri Jun 25 2004 Tim Waugh 1:4.1.20-1 - Clarify find man page (bug #126098). - Apply changes by Robert Scheck (bug #126352): - Upgrade to 4.1.20 and some specfile cleanup