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

diff --git a/grep.spec b/grep.spec
index cc74f18..18919ff 100644
--- a/grep.spec
+++ b/grep.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
-%bcond_without	pcre	# with PCRE support
+%bcond_without	pcre	# PCRE support
+%bcond_without	tests	# don't perform "make check"
 #
 Summary:	GNU grep Utilities
 Summary(de.UTF-8):	GNU-Version der Pattern-Matching-Utilities
@@ -13,31 +14,27 @@ Summary(ru.UTF-8):	Утилиты поиска по шаблонам GNU grep
 Summary(tr.UTF-8):	Dosyalarda katar arama aracı
 Summary(uk.UTF-8):	Утиліти пошуку по шаблонам GNU grep
 Name:		grep
-Version:	2.5.3
-Release:	3
+Version:	3.6
+Release:	2
 Epoch:		2
 License:	GPL v3+
 Group:		Applications/Text
-Source0:	http://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.gz
-# Source0-md5:	4f371f25f413f700fb1984b878421f9d
+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}-locale-names.patch
-Patch2:		%{name}-pl.po-update.patch
-Patch3:		%{name}-strerror.patch
-# from debian; very important for multibytes locale; see https://savannah.gnu.org/bugs/?14472
-Patch4:		%{name}-egf-speedup.patch
-Patch5:		%{name}-dfa-optional.patch
-Patch6:		%{name}-match_icase.patch
+Patch1:		%{name}-pl.po-update.patch
+Patch2:		disable-unstable-test.patch
 URL:		http://www.gnu.org/software/grep/grep.html
-BuildRequires:	autoconf >= 2.53
-BuildRequires:	automake
-BuildRequires:	gettext-devel
-BuildRequires:	libtool
+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
-%{?with_pcre:Requires:	pcre}
+BuildRequires:	xz
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir		/bin
@@ -95,29 +92,30 @@ kullanılır.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
 
-# outdated, there is already nb.po
-rm -f po/no.po
+%{__rm} po/stamp-po
 
 %build
-%{__libtoolize}
+%{__gettextize}
 %{__aclocal} -I m4
-%{__automake}
-%{__autoheader}
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	%{!?with_pcre:--disable-perl-regexp} \
-	--without-included-regex \
-	--enable-nls
+	--disable-silent-rules \
+	--without-included-regex
 %{__make}
 
+%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
@@ -127,33 +125,38 @@ 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}
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_mandir}/README.grep-non-english-man-pages
-rm -f $RPM_BUILD_ROOT%{_mandir}/ja-grep-nozgrep.diff
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/README.grep-non-english-man-pages
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/ja-grep-nozgrep.diff
 
 %clean
 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/*
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%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
+%{_mandir}/man1/egrep.1*
+%{_mandir}/man1/fgrep.1*
+%{_mandir}/man1/grep.1*
 %lang(cs) %{_mandir}/cs/man1/*
 %lang(de) %{_mandir}/de/man1/*
 %lang(es) %{_mandir}/es/man1/*
@@ -164,4 +167,4 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja) %{_mandir}/ja/man1/*
 %lang(nl) %{_mandir}/nl/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
-%{_infodir}/*info*
+%{_infodir}/grep.info*