- removed all locate relayted stuff (we have now slocate),

- added some patches from RH,
- summazized %changelog.

Changed files:
    findutils.spec -> 1.13

diff --git a/findutils.spec b/findutils.spec
index 1924e914bdfb3b3464b0ff606fc4db51806896df..936d5262547b4aca09f93a883bc2aa7533c778a5 100644 (file)
--- a/findutils.spec
+++ b/findutils.spec
@@ -12,75 +12,72 @@ Group(pl):  Narz
 Source0:       ftp://prep.ai.mit.edu/pub/gnu/%{name}-%{version}.tar.gz
 Source1:       updatedb.cron
 Source2:       xargs.1.pl
-Patch0:                findutils.patch
-Patch1:                findutils-info.patch
+Patch0:                findutils-info.patch
+Patch1:                findutils-basename.patch
+Patch2:                findutils-getshort.patch
+Patch3:                findutils-glibc.patch
+patch4:                findutils-glibc21.patch
+Patch5:                findutils-xargsoverflow.patch
 Prereq:                /sbin/install-info
-Requires:      mktemp
 Buildroot:     /tmp/%{name}-%{version}-root
 
 %description
 This package contains programs to help you locate files on your system. The
 find program can search through a hierarchy of directories looking for files
-matching a certain set of criteria (such as a filename pattern). The locate
-program searches a database (create by updatedb) to quickly find a file
-matching a given pattern.
+matching a certain set of criteria (such as a filename pattern).
 
 %description -l de
 Dieses Paket enthält Programme zum Suchen von Dateien auf
 dem System. Das Programm 'find' kann eine Verzeichnisstruktur
 durchsuchen und Dateien finden, die den Suchkritierien entsprechen
-(z.B. einem Dateinamenmuster). Das Programm 'locate' durchsucht
-eine Datenbank (durch updatedb erstellt), um eine Datei, die dem
-Suchmuster entspricht, zu finden.
+(z.B. einem Dateinamenmuster).
 
 %description -l fr
 Ce package contient des programmes pour vous aider à localiser
 des fichiers sur votre système. Le programme find peut rechercher
 à travers une hiérarchie de répertoires des fichiers conformes à
-certains critères (comme un type de nom). Le programme locatecherche 
-une base de données (crée par updatedb) pour trouver rapidement
-un fichier correspondant au type demandé.
+certains critères (comme un type de nom).
 
 %description -l pl
 W pakiecie znajduj± siê narzêdzia pozwalaj±ce na poszukiwanie okre¶lonych
 plików. Program find s³u¿y do przeszukania drzewa katalogów za plikami o
 okre¶lonych parametrach, jak nazwa, uprawnienia, typ, data ostatniej
-modyfikacji. Program locate lokalizuje pliki korzystaj±c z utworzonej
-poleceniem updatedb bazy danych, dziêki czemu jest znacznie szybszy od find.
+modyfikacji.
 
 %description -l tr
 Bu pakette yer alan yazýlýmlar sisteminizde yer alan dosyalarý bulabilmeniz
 için hazýrlanmýþlardýr. find programý ile belirli özellikleri olan bir
-yazýlýmý bir dizin hiyerarþisi altýnda arayabilirsiniz. locate yazýlýmý ise,
-updatedb tarafýndan hazýrlanan bir veri tabaný üzerinde, belirtilen
-dosyalarý arar.
+yazýlýmý bir dizin hiyerarþisi altýnda arayabilirsiniz.
 
 %prep
-%setup -q
+%setup  -q
 %patch0 -p1 
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
-autoconf && %configure 
+autoconf
+%configure 
 
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/{lib/findutils,share/man/{man{1,5},pl/man1}} \
-       $RPM_BUILD_ROOT/{etc/cron.daily,var/state}
+install -d $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
-make   prefix=$RPM_BUILD_ROOT%{_prefix} \
+make install \
+       prefix=$RPM_BUILD_ROOT%{_prefix} \
        exec_prefix=$RPM_BUILD_ROOT%{_prefix} \
-       install
+       mandir=$RPM_BUILD_ROOT%{_mandir} \
+       infodir=$RPM_BUILD_ROOT%{_infodir}
        
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.daily
 install %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/pl/man1/xargs.1
 
-:> $RPM_BUILD_ROOT/var/state/locatedb
-
 gzip -9fn $RPM_BUILD_ROOT%{_infodir}/find.info* \
-       $RPM_BUILD_ROOT%{_mandir}/{man[15]/*,pl/man1/*} \
+       $RPM_BUILD_ROOT%{_mandir}/{man?/*,pl/man1/*} \
        NEWS README TODO ChangeLog
 
 %post
@@ -88,7 +85,7 @@ gzip -9fn $RPM_BUILD_ROOT%{_infodir}/find.info* \
 
 %preun
 if [ "$1" = "0" ]; then
-    /sbin/install-info --delete %{_infodir}/find.info.gz /etc/info-dir
+       /sbin/install-info --delete %{_infodir}/find.info.gz /etc/info-dir
 fi
 
 %clean
@@ -97,50 +94,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc {NEWS,README,TODO,ChangeLog}.gz
+%attr(755,root,root) %{_bindir}/find
+%attr(755,root,root) %{_bindir}/xargs
 
-%attr(750,root,root) %config /etc/cron.daily/updatedb.cron
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %dir %{_libdir}/findutils
-%attr(755,root,root) %{_libdir}/findutils/*
-
-%{_mandir}/man[15]/*
+%{_mandir}/man1/find.1*
+%{_mandir}/man1/xargs.1*
 %lang(pl) %{_mandir}/pl/man1/*
-
 %{_infodir}/find.info*
-%ghost /var/state/*
 
 %changelog
-* Sat May 29 1999 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
-- FHS 2.0 
-
-* Wed May 12 1999 Piotr Czerwiñski <pius@pld.org.pl>
-  [4.1-30]
-- package is now FHS 2.0 compliant.
-
-* Tue Apr 20 1999 Piotr Czerwiñski <pius@pld.org.pl>
-  [4.1-29]
-- recompiled on rpm 3.
-
-* Tue Apr  5 1999 Piotr Czerwiñski <pius@pld.org.pl>
-  [4.1-28]
-- revision up to 28,
-- added Group(pl),
-- changed BuildRoot to /tmp/%%{name}-%%{version}-root,
-- removed 'rm -rf $RPM_BUILD_ROOT' from %build,
-- simplifications in %install,
-- standarized {un}registering info pages (added findutils-info.patch),
-- added more documentation,
-- added pl man page for xargs(1L),
-- added gzipping documentation and man pages,
-- changes in %files (for rpm-2.9x).
-
-* Sun Oct  4 1998 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [4.1.26]
-- changed way passing $RPM_OPT_FLAGS.
-
-* Fri Jun 12 1998 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
-  [4.1.26d]
-- added pl translation (made by Piotr Dembiñski <hektor@kki.net.pl>),
-- macro %%{name}-%%{version} in Source,
-- minor modifications of spec file.
-- build against GNU libc-2.1.
+* Mon Jun 21 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
+  [4.1-32]
+- based on RH spec,
+- spec rewrited by PLD team,
+- pl translation by Wojtek ¦lusarczyk <wojtek@shadow.eu.org>.