X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=grep.spec;h=18919fff0258d30f43068c78cb49c16018a05d00;hb=74d27f14e04f6a79809d63fea6a61482c972d19d;hp=6cc633a3690d4201da0a7f2cd039ce1ff0206651;hpb=cca240cd5e01593b71ee58cf49a0613195c67f5d;p=packages%2Fgrep.git

diff --git a/grep.spec b/grep.spec
index 6cc633a..18919ff 100644
--- a/grep.spec
+++ b/grep.spec
@@ -14,22 +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.16
-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:	502350a6c8f7c2b12ee58829e760b44d
+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-devel >= 0.18
+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
@@ -89,6 +91,7 @@ kullanılır.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__rm} po/stamp-po
 
@@ -104,11 +107,15 @@ kullanılır.
 	--without-included-regex
 %{__make}
 
-%{?with_tests:%{__make} check}
+%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
-install -d $RPM_BUILD_ROOT/etc/env.d
+install -d $RPM_BUILD_ROOT/etc/shrc.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -118,8 +125,11 @@ 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"
+cat << EOF >$RPM_BUILD_ROOT/etc/shrc.d/grep.sh
+#alias grep='/bin/grep --devices=skip --directories=skip --color=auto'
+EOF
+cat << EOF >$RPM_BUILD_ROOT/etc/shrc.d/grep.csh
+#alias grep '/bin/grep --devices=skip --directories=skip --color=auto'
 EOF
 
 %find_lang %{name}
@@ -133,16 +143,14 @@ 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
+%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
 %attr(755,root,root) %{_bindir}/grep