cleanup in patches, fixed #562043
This commit is contained in:
parent
94aa45f80b
commit
a49c3c92f4
@ -10,3 +10,15 @@ diff -up findutils-4.4.2/Makefile.am_old findutils-4.4.2/Makefile.am
|
|||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
|
ACLOCAL_AMFLAGS = -I gnulib/m4 -I m4
|
||||||
|
|
||||||
|
diff --git a/doc/find.texi b/doc/find.texi
|
||||||
|
index 8944096..4d71066 100644
|
||||||
|
--- a/doc/find.texi
|
||||||
|
+++ b/doc/find.texi
|
||||||
|
@@ -7,7 +7,6 @@
|
||||||
|
@c %**end of header
|
||||||
|
|
||||||
|
@include version.texi
|
||||||
|
-@include ../locate/dblocation.texi
|
||||||
|
|
||||||
|
@iftex
|
||||||
|
@finalout
|
||||||
|
@ -15,18 +15,10 @@ index d00862f..6b8b725 100644
|
|||||||
|
|
||||||
** Bug Fixes
|
** Bug Fixes
|
||||||
diff --git a/doc/find.texi b/doc/find.texi
|
diff --git a/doc/find.texi b/doc/find.texi
|
||||||
index 8944096..4d71066 100644
|
index 8037c63..4d71066 100644
|
||||||
--- a/doc/find.texi
|
--- a/doc/find.texi
|
||||||
+++ b/doc/find.texi
|
+++ b/doc/find.texi
|
||||||
@@ -7,7 +7,6 @@
|
@@ -1241,6 +1241,14 @@ situation.
|
||||||
@c %**end of header
|
|
||||||
|
|
||||||
@include version.texi
|
|
||||||
-@include ../locate/dblocation.texi
|
|
||||||
|
|
||||||
@iftex
|
|
||||||
@finalout
|
|
||||||
@@ -1242,6 +1241,14 @@ situation.
|
|
||||||
|
|
||||||
@end deffn
|
@end deffn
|
||||||
|
|
||||||
@ -41,7 +33,7 @@ index 8944096..4d71066 100644
|
|||||||
@node Contents
|
@node Contents
|
||||||
@section Contents
|
@section Contents
|
||||||
|
|
||||||
@@ -1737,6 +1744,7 @@ from the novel you are reading.
|
@@ -1736,6 +1744,7 @@ from the novel you are reading.
|
||||||
* Size Directives::
|
* Size Directives::
|
||||||
* Location Directives::
|
* Location Directives::
|
||||||
* Time Directives::
|
* Time Directives::
|
||||||
@ -49,7 +41,7 @@ index 8944096..4d71066 100644
|
|||||||
* Formatting Flags::
|
* Formatting Flags::
|
||||||
@end menu
|
@end menu
|
||||||
|
|
||||||
@@ -1894,6 +1902,14 @@ File's last modification time in the format specified by @var{k}
|
@@ -1893,6 +1902,14 @@ File's last modification time in the format specified by @var{k}
|
||||||
(@pxref{Time Formats}).
|
(@pxref{Time Formats}).
|
||||||
@end table
|
@end table
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
diff --git a/doc/find.texi b/doc/find.texi
|
diff --git a/doc/find.texi b/doc/find.texi
|
||||||
index 2e5958d..8944096 100644
|
index f1feba3..8037c63 100644
|
||||||
--- a/doc/find.texi
|
--- a/doc/find.texi
|
||||||
+++ b/doc/find.texi
|
+++ b/doc/find.texi
|
||||||
@@ -1413,6 +1413,10 @@ them.
|
@@ -1412,6 +1412,10 @@ them.
|
||||||
There are two ways to avoid searching certain filesystems. One way is
|
There are two ways to avoid searching certain filesystems. One way is
|
||||||
to tell @code{find} to only search one filesystem:
|
to tell @code{find} to only search one filesystem:
|
||||||
|
|
||||||
|
@ -8,12 +8,28 @@ Group: Applications/File
|
|||||||
URL: http://www.gnu.org/software/findutils/
|
URL: http://www.gnu.org/software/findutils/
|
||||||
Source0: ftp://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
|
Source0: ftp://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
|
||||||
Source1: ftp://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz.sig
|
Source1: ftp://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz.sig
|
||||||
|
|
||||||
|
# do not build locate
|
||||||
Patch1: findutils-4.4.0-no-locate.patch
|
Patch1: findutils-4.4.0-no-locate.patch
|
||||||
|
|
||||||
|
# learn find to recognize autofs file system by reading /proc/mounts
|
||||||
|
# as autofs mount points are not listed in /etc/mtab
|
||||||
Patch2: findutils-4.4.2-autofs.patch
|
Patch2: findutils-4.4.2-autofs.patch
|
||||||
|
|
||||||
|
# adds a new option -xautofs to find to not descend into directories on autofs file systems
|
||||||
Patch3: findutils-4.4.2-xautofs.patch
|
Patch3: findutils-4.4.2-xautofs.patch
|
||||||
|
|
||||||
|
# patch accepted by gnulib upstream - rhbz#538536
|
||||||
Patch4: findutils-4.4.2-fts-remount.patch
|
Patch4: findutils-4.4.2-fts-remount.patch
|
||||||
|
|
||||||
|
# gnulib based SELinux patch adding a new search predicate -context and
|
||||||
|
# a new -printf conversion %Z
|
||||||
Patch5: findutils-4.4.2-selinux.patch
|
Patch5: findutils-4.4.2-selinux.patch
|
||||||
|
|
||||||
|
# once the selinux-at module appears on the list within import-gnulib.config
|
||||||
|
# the following patch will be no longer needed
|
||||||
Patch6: findutils-4.4.2-selinux-gnulib.patch
|
Patch6: findutils-4.4.2-selinux-gnulib.patch
|
||||||
|
|
||||||
Requires(post): /sbin/install-info
|
Requires(post): /sbin/install-info
|
||||||
Requires(preun): /sbin/install-info
|
Requires(preun): /sbin/install-info
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
Loading…
Reference in New Issue
Block a user