- rel 2; exec fix from fc/upstream

[packages/findutils.git] / findutils.spec

diff --git a/findutils.spec b/findutils.spec
index b70d4b5d7ee51ef2b907654ea7ae3bb47fd9ac25..de2c1f0306e7dafb8a1216192b9cae5c1bd4562c 100644 (file)
--- 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.2.30
-Release:       1
+Version:       4.6.0
+Release:       2
 Epoch:         1
-License:       GPL
+License:       GPL v3+
 Group:         Applications/File
 # development versions at ftp://alpha.gnu.org/gnu/findutils/
-Source0:       ftp://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
-# Source0-md5: c35ff6502e0b3514c99089cb5d333c25
+Source0:       http://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
+# 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
+Patch0:                findutils-4.6.0-exec-args.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
+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
-%patch3 -p1
 %patch0 -p1
-%{?with_selinux:%patch1 -p1}
-# patch2 is applied in install stage
+# patch1 is applied in install stage
+%patch2 -p1
+%patch3 -p1
 
-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,14 +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*
+
 # unpackaged locate
-rm -f $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}*
 
@@ -125,19 +130,19 @@ rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_mandir}/README.findutils-non-english-ma
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post  -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun        -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc NEWS README TODO ChangeLog
 %attr(755,root,root) %{_bindir}/find
 %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]*