- rel 2; from upstream: be less picky about encoding errors

[packages/grep.git] / grep.spec

diff --git a/grep.spec b/grep.spec
index 0a88da04d156baeb26315afac33e8282babc2590..23ddf460f9702dbac9c04b63716b241a89d7a6c5 100644 (file)
--- a/grep.spec
+++ b/grep.spec
@@ -14,21 +14,22 @@ Summary(ru.UTF-8):  Утилиты поиска по шаблонам GNU grep
 Summary(tr.UTF-8):     Dosyalarda katar arama aracı
 Summary(uk.UTF-8):     Утиліти пошуку по шаблонам GNU grep
 Name:          grep
-Version:       2.15
-Release:       1
+Version:       2.22
+Release:       2
 Epoch:         2
 License:       GPL v3+
 Group:         Applications/Text
 Source0:       http://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.xz
-# Source0-md5: 8cab8ca52bcae735af40278423c7c942
+# Source0-md5: e1015e951a49a82b02e38891026ef5df
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 1b5e726d0bee53e898531de4a76ad290
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-pl.po-update.patch
+Patch2:                grep-enc-errors.patch
 URL:           http://www.gnu.org/software/grep/grep.html
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.11
-BuildRequires: gettext-devel >= 0.18
+BuildRequires: gettext-tools >= 0.18.2
 %{?with_pcre:BuildRequires:    pcre-devel}
 BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo
@@ -90,6 +91,9 @@ kullanılır.
 %patch0 -p1
 %patch1 -p1
 
+%patch2 -p1
+chmod +x tests/encoding-error tests/unibyte-binary
+
 %{__rm} po/stamp-po
 
 %build
@@ -104,11 +108,10 @@ kullanılır.
        --without-included-regex
 %{__make}
 
-%{?with_tests:%{__make} check}
+%{?with_tests:%{__make} -j1 check-expensive}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/env.d
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -118,10 +121,6 @@ echo .so grep.1 > $RPM_BUILD_ROOT%{_mandir}/man1/fgrep.1
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
-cat << EOF >$RPM_BUILD_ROOT/etc/env.d/GREP_OPTIONS
-#GREP_OPTIONS="--binary-files=without-match --directories=skip --color=auto"
-EOF
-
 %find_lang %{name}
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -133,16 +132,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
--/sbin/env-update -u
 
 %postun -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
--/sbin/env-update -u
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc NEWS README ChangeLog TODO
-%config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/GREP_OPTIONS
 %attr(755,root,root) %{_bindir}/egrep
 %attr(755,root,root) %{_bindir}/fgrep
 %attr(755,root,root) %{_bindir}/grep