X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=findutils.spec;h=b1b84dc7b2130e57d070bbbc1bff4bba1cdd1865;hb=a2caf12978877694e3fc348d39b45e56433b1868;hp=34868c760d9f9ca3447b77dad55fc0df276f1c46;hpb=96fce7dda85ca2d4437b798c3e002134de3fd2a9;p=packages%2Ffindutils.git

diff --git a/findutils.spec b/findutils.spec
index 34868c7..b1b84dc 100644
--- a/findutils.spec
+++ b/findutils.spec
@@ -10,25 +10,26 @@ Summary(pl.UTF-8):	Narzędzia GNU do odnajdywania plików (find, xargs)
 Summary(pt_BR.UTF-8):	Utilitários de procura da GNU
 Summary(tr.UTF-8):	GNU dosya arama araçları
 Name:		findutils
-Version:	4.4.0
+Version:	4.6.0
 Release:	1
 Epoch:		1
 License:	GPL v3+
 Group:		Applications/File
 # development versions at ftp://alpha.gnu.org/gnu/findutils/
 Source0:	http://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
-# Source0-md5:	49e769ac4382fae6f104f99d54d0a112
+# Source0-md5:	9936aa8009438ce185bea2694a997fc1
 #Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 Source1:	%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	e76388b0c3218eec3557d05ccd6d6515
-Patch0:		%{name}-info.patch
-Patch1:		%{name}-selinux.patch
-Patch2:		%{name}-man-selinux.patch
+
+Patch1:		%{name}-man-selinux.patch
+Patch2:		%{name}-info.patch
+# http://translationproject.org/latest/findutils/pl.po
 Patch3:		%{name}-pl.po-update.patch
 URL:		http://www.gnu.org/software/findutils/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
-BuildRequires:	gettext-devel >= 0.14.5
+BuildRequires:	gettext-tools >= 0.14.5
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	texinfo
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -84,19 +85,20 @@ arayabilirsiniz.
 
 %prep
 %setup -q
-%patch0 -p1
+
+# patch1 is applied in install stage
+%patch2 -p1
 %patch3 -p1
-%{?with_selinux:%patch1 -p1}
-# patch2 is applied in install stage
 
-rm -f po/stamp-po
+%{__rm} po/stamp-po
 
 %build
-%{__aclocal} -I gnulib/m4 -I m4
+%{__aclocal} -I gl/m4 -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	%{__with_without selinux}
 
 %{__make}
 
@@ -107,17 +109,17 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-%{?with_selinux:patch -p0 -d $RPM_BUILD_ROOT%{_mandir} < %{PATCH2}}
+%{?with_selinux:patch -p0 -d $RPM_BUILD_ROOT%{_mandir} < %{PATCH1}}
 
 # xargs is wanted in /bin
 install -d $RPM_BUILD_ROOT/bin
 mv $RPM_BUILD_ROOT%{_bindir}/xargs $RPM_BUILD_ROOT/bin
 
 # useless in binary package
-rm $RPM_BUILD_ROOT%{_infodir}/find-maint.info*
+%{__rm} $RPM_BUILD_ROOT%{_infodir}/find-maint.info*
 
 # unpackaged locate
-rm $RPM_BUILD_ROOT%{_bindir}/{locate,updatedb} \
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{locate,updatedb} \
 	$RPM_BUILD_ROOT%{_libdir}/{bigram,code,frcode} \
 	$RPM_BUILD_ROOT%{_mandir}/{,*/}man?/{locate.1,updatedb.1,locatedb.5}*
 
@@ -138,10 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc NEWS README TODO ChangeLog
 %attr(755,root,root) %{_bindir}/find
-%attr(755,root,root) %{_bindir}/oldfind
 %attr(755,root,root) /bin/xargs
-
-%{_mandir}/man1/[fx]*
+%{_mandir}/man1/find.1*
+%{_mandir}/man1/xargs.1*
 %lang(de) %{_mandir}/de/man1/[fx]*
 %lang(es) %{_mandir}/es/man1/[fx]*
 %lang(fi) %{_mandir}/fi/man1/[fx]*