- rediffed

[packages/grep.git] / grep.spec

diff --git a/grep.spec b/grep.spec
index 93c56169f165aa552160818de6a8b197bdc070e6..18919fff0258d30f43068c78cb49c16018a05d00 100644 (file)
--- a/grep.spec
+++ b/grep.spec
@@ -14,23 +14,24 @@ Summary(ru.UTF-8):  Утилиты поиска по шаблонам GNU grep
 Summary(tr.UTF-8):     Dosyalarda katar arama aracı
 Summary(uk.UTF-8):     Утиліти пошуку по шаблонам GNU grep
 Name:          grep
-Version:       2.25
-Release:       1
+Version:       3.6
+Release:       2
 Epoch:         2
 License:       GPL v3+
 Group:         Applications/Text
-Source0:       http://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.xz
-# Source0-md5: 04e96b0e6f0fe6a180ae62c88fcd0af6
+Source0:       https://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.xz
+# Source0-md5: f47fe27049510b2249dba7f862ac1b51
 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:                disable-unstable-test.patch
 URL:           http://www.gnu.org/software/grep/grep.html
-BuildRequires: autoconf >= 2.59
+BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
 BuildRequires: gettext-tools >= 0.18.2
 %{?with_pcre:BuildRequires:    pcre-devel}
+BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: texinfo
 BuildRequires: xz
@@ -106,7 +107,11 @@ kullanılır.
        --without-included-regex
 %{__make}
 
-%{?with_tests:%{__make} -j1 check-expensive}
+%if %{with tests}
+# mksh fails "unset columns" check (bash and pdksh are OK)
+%{__make} -j1 check-expensive \
+       SHELL=/bin/bash
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -144,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc NEWS README ChangeLog TODO
+%doc AUTHORS ChangeLog NEWS README THANKS TODO
 %config(noreplace) %verify(not md5 mtime size) /etc/shrc.d/grep.*sh
 %attr(755,root,root) %{_bindir}/egrep
 %attr(755,root,root) %{_bindir}/fgrep