forked from pool/findutils
This commit is contained in:
parent
ce9d6e58a6
commit
c4f988054e
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:813cd9405aceec5cfecbe96400d01e90ddad7b512d3034487176ce5258ab0f78
|
|
||||||
size 1455067
|
|
@ -1,6 +1,6 @@
|
|||||||
--- doc/find.texi
|
--- doc/find.texi
|
||||||
+++ doc/find.texi
|
+++ doc/find.texi
|
||||||
@@ -2908,7 +2908,7 @@
|
@@ -3329,7 +3329,7 @@ Default is none.
|
||||||
@item --prunepaths='@var{path}@dots{}'
|
@item --prunepaths='@var{path}@dots{}'
|
||||||
Directories to omit from the database, which would otherwise be
|
Directories to omit from the database, which would otherwise be
|
||||||
included. The environment variable @code{PRUNEPATHS} also sets this
|
included. The environment variable @code{PRUNEPATHS} also sets this
|
||||||
@ -11,7 +11,7 @@
|
|||||||
them. This means for example that the paths must not include trailing
|
them. This means for example that the paths must not include trailing
|
||||||
--- locate/updatedb.1
|
--- locate/updatedb.1
|
||||||
+++ locate/updatedb.1
|
+++ locate/updatedb.1
|
||||||
@@ -75,8 +75,7 @@
|
@@ -75,8 +75,7 @@ Default is \fInfs NFS proc\fP.
|
||||||
.TP
|
.TP
|
||||||
.B \-\-output=\fIdbfile\fP
|
.B \-\-output=\fIdbfile\fP
|
||||||
The database file to build.
|
The database file to build.
|
||||||
@ -21,7 +21,7 @@
|
|||||||
.TP
|
.TP
|
||||||
.B \-\-localuser=\fIuser\fP
|
.B \-\-localuser=\fIuser\fP
|
||||||
The user to search non-network directories as, using \fBsu\fP(1).
|
The user to search non-network directories as, using \fBsu\fP(1).
|
||||||
@@ -85,7 +84,7 @@
|
@@ -85,7 +84,7 @@ You can also use the environment variabl
|
||||||
.TP
|
.TP
|
||||||
.B \-\-netuser=\fIuser\fP
|
.B \-\-netuser=\fIuser\fP
|
||||||
The user to search network directories as, using \fBsu\fP(1).
|
The user to search network directories as, using \fBsu\fP(1).
|
||||||
@ -32,16 +32,16 @@
|
|||||||
.B \-\-old\-format
|
.B \-\-old\-format
|
||||||
--- locate/updatedb.sh
|
--- locate/updatedb.sh
|
||||||
+++ locate/updatedb.sh
|
+++ locate/updatedb.sh
|
||||||
@@ -117,7 +117,7 @@
|
@@ -158,7 +158,7 @@ select_shell() {
|
||||||
: ${NETPATHS=}
|
: ${NETPATHS=}
|
||||||
|
|
||||||
# Directories to not put in the database, which would otherwise be.
|
# Directories to not put in the database, which would otherwise be.
|
||||||
-: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /amd /sfs"}
|
-: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /amd /sfs /proc"}
|
||||||
+: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /amd /sfs /var/spool"}
|
+: ${PRUNEPATHS="/tmp /usr/tmp /var/tmp /afs /amd /sfs /proc /var/spool"}
|
||||||
|
|
||||||
# Trailing slashes result in regex items that are never matched, which
|
# Trailing slashes result in regex items that are never matched, which
|
||||||
# is not what the user will expect. Therefore we now reject such
|
# is not what the user will expect. Therefore we now reject such
|
||||||
@@ -147,7 +147,7 @@
|
@@ -188,7 +188,7 @@ fi
|
||||||
export TMPDIR
|
export TMPDIR
|
||||||
|
|
||||||
# The user to search network directories as.
|
# The user to search network directories as.
|
||||||
@ -50,7 +50,7 @@
|
|||||||
|
|
||||||
# The directory containing the subprograms.
|
# The directory containing the subprograms.
|
||||||
if test -n "$LIBEXECDIR" ; then
|
if test -n "$LIBEXECDIR" ; then
|
||||||
@@ -172,11 +172,10 @@
|
@@ -228,11 +228,10 @@ done
|
||||||
|
|
||||||
PATH=/bin:/usr/bin:${BINDIR}; export PATH
|
PATH=/bin:/usr/bin:${BINDIR}; export PATH
|
||||||
|
|
||||||
@ -64,23 +64,3 @@
|
|||||||
else
|
else
|
||||||
prunefs_exp=''
|
prunefs_exp=''
|
||||||
fi
|
fi
|
||||||
@@ -235,8 +234,8 @@
|
|
||||||
# results in a temp file, then rename it atomically.
|
|
||||||
if test -s $LOCATE_DB.n; then
|
|
||||||
rm -f $LOCATE_DB
|
|
||||||
+ chmod 644 $LOCATE_DB.n
|
|
||||||
mv $LOCATE_DB.n $LOCATE_DB
|
|
||||||
- chmod 644 $LOCATE_DB
|
|
||||||
else
|
|
||||||
echo "updatedb: new database would be empty" >&2
|
|
||||||
rm -f $LOCATE_DB.n
|
|
||||||
@@ -305,8 +304,8 @@
|
|
||||||
# put the results in a temp file, then rename it atomically.
|
|
||||||
if test -s $LOCATE_DB.n; then
|
|
||||||
rm -f $LOCATE_DB
|
|
||||||
+ chmod 644 $LOCATE_DB.n
|
|
||||||
mv $LOCATE_DB.n $LOCATE_DB
|
|
||||||
- chmod 644 $LOCATE_DB
|
|
||||||
else
|
|
||||||
echo "updatedb: new database would be empty" >&2
|
|
||||||
rm -f $LOCATE_DB.n
|
|
3
findutils-4.4.0.tar.bz2
Normal file
3
findutils-4.4.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:dd1dd2ffb38b28d00ab360ada03613ef07643c1f0e207ab2a00f362b7c160e19
|
||||||
|
size 1436805
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Mar 18 10:40:04 CET 2008 - schwab@suse.de
|
||||||
|
|
||||||
|
- Update to findutils 4.4.0.
|
||||||
|
See NEWS for details.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Feb 24 17:24:53 CET 2008 - crrodriguez@suse.de
|
Sun Feb 24 17:24:53 CET 2008 - crrodriguez@suse.de
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package findutils (Version 4.2.33)
|
# spec file for package findutils (Version 4.4.0)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# This file and all modifications and additions to the pristine
|
# This file and all modifications and additions to the pristine
|
||||||
@ -18,14 +18,13 @@ Provides: find
|
|||||||
Obsoletes: find
|
Obsoletes: find
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
PreReq: %{install_info_prereq}
|
PreReq: %{install_info_prereq}
|
||||||
Version: 4.2.33
|
Version: 4.4.0
|
||||||
Release: 5
|
Release: 1
|
||||||
Summary: GNU find--Finding Files
|
Summary: GNU find--Finding Files
|
||||||
Source: findutils-%{version}.tar.gz
|
Source: findutils-%{version}.tar.bz2
|
||||||
Source1: sysconfig.locate
|
Source1: sysconfig.locate
|
||||||
Source2: cron.daily.updatedb
|
Source2: cron.daily.updatedb
|
||||||
Patch: findutils-%{version}.diff
|
Patch: findutils-%{version}.diff
|
||||||
Patch2: warn.diff
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -76,7 +75,6 @@ Authors:
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch
|
%patch
|
||||||
%patch2
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./configure CFLAGS="$RPM_OPT_FLAGS" \
|
./configure CFLAGS="$RPM_OPT_FLAGS" \
|
||||||
@ -93,7 +91,9 @@ mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
|
|||||||
mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
|
mkdir -p $RPM_BUILD_ROOT/etc/cron.daily
|
||||||
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates
|
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/var/adm/fillup-templates
|
||||||
install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/suse.de-updatedb
|
install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/suse.de-updatedb
|
||||||
%find_lang %{name}
|
%find_lang %name
|
||||||
|
rm -f $RPM_BUILD_ROOT%{_bindir}/oldfind
|
||||||
|
rm -f $RPM_BUILD_ROOT%{_infodir}/find-maint*
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -107,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%postun
|
%postun
|
||||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/find.info.gz
|
%install_info_delete --info-dir=%{_infodir} %{_infodir}/find.info.gz
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %name.lang
|
||||||
%defattr(-,root,root,755)
|
%defattr(-,root,root,755)
|
||||||
%doc README NEWS AUTHORS TODO
|
%doc README NEWS AUTHORS TODO
|
||||||
%{_bindir}/find
|
%{_bindir}/find
|
||||||
@ -128,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
/var/adm/fillup-templates/*
|
/var/adm/fillup-templates/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 18 2008 schwab@suse.de
|
||||||
|
- Update to findutils 4.4.0.
|
||||||
|
See NEWS for details.
|
||||||
* Sun Feb 24 2008 crrodriguez@suse.de
|
* Sun Feb 24 2008 crrodriguez@suse.de
|
||||||
- use find_lang macro
|
- use find_lang macro
|
||||||
* Thu Feb 14 2008 schwab@suse.de
|
* Thu Feb 14 2008 schwab@suse.de
|
||||||
|
31
warn.diff
31
warn.diff
@ -1,31 +0,0 @@
|
|||||||
Index: lib/regexprops.c
|
|
||||||
================================================================================
|
|
||||||
--- lib/regexprops.c
|
|
||||||
+++ lib/regexprops.c
|
|
||||||
@@ -144,7 +144,7 @@ static void newpara()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
-static int describe_regex_syntax(int options)
|
|
||||||
+static void describe_regex_syntax(int options)
|
|
||||||
{
|
|
||||||
newpara();
|
|
||||||
content("The character @samp{.} matches any single character");
|
|
||||||
@@ -435,7 +435,7 @@ static int describe_regex_syntax(int opt
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-static int menu()
|
|
||||||
+static void menu()
|
|
||||||
{
|
|
||||||
int i, options;
|
|
||||||
const char *name;
|
|
||||||
@@ -456,7 +456,7 @@ static int menu()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
-static int describe_all(const char *up)
|
|
||||||
+static void describe_all(const char *up)
|
|
||||||
{
|
|
||||||
const char *name, *next, *previous;
|
|
||||||
int options;
|
|
Loading…
Reference in New Issue
Block a user