X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=grep.spec;h=121db219986e6b01d6af9e13e9be195e672e2ff4;hb=14feedec12de52bd0ae1ba0d5cf5669abd6d0be4;hp=9572b55378a01a53354b31267e84c989de6bbe4f;hpb=9f5f7211b2934f6e9f5fe5279bdad07ba4dbe439;p=packages%2Fgrep.git

diff --git a/grep.spec b/grep.spec
index 9572b55..121db21 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,29 +14,25 @@ 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.4
-Release:	1
+Version:	2.21
+Release:	3
 Epoch:		2
 License:	GPL v3+
 Group:		Applications/Text
-Source0:	http://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.gz
-# Source0-md5:	92258031d98d4f12dfc6a6d24057e672
+Source0:	http://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.xz
+# Source0-md5:	43c48064d6409862b8a850db83c8038a
 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}-strerror.patch
-# from debian; very important for multibytes locale; see https://savannah.gnu.org/bugs/?14472
-Patch2:		%{name}-egf-speedup.patch
-Patch3:		%{name}-dfa-optional.patch
-Patch4:		%{name}-match_icase.patch
+Patch1:		%{name}-pl.po-update.patch
 URL:		http://www.gnu.org/software/grep/grep.html
-BuildRequires:	autoconf >= 2.53
-BuildRequires:	automake
-BuildRequires:	gettext-devel
-BuildRequires:	libtool
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	gettext-tools >= 0.18.2
 %{?with_pcre:BuildRequires:	pcre-devel}
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	texinfo
-%{?with_pcre:Requires:	pcre}
+BuildRequires:	xz
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir		/bin
@@ -92,28 +89,25 @@ kullanılır.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
-%patch3 -p0
-%patch4 -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}
 
+%{?with_tests:%{__make} check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/env.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -123,33 +117,30 @@ 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
-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/*
+%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/*
@@ -160,4 +151,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*