- updated to 2.23

[packages/grep.git] / grep.spec

diff --git a/grep.spec b/grep.spec
index 05c034a424935322a4b3fce7f1973a611d95b7c4..2a088f6683bca4460016825d173f9f4155c70aea 100644 (file)
--- a/grep.spec
+++ b/grep.spec
@@ -14,20 +14,21 @@ Summary(ru.UTF-8):  Утилиты поиска по шаблонам GNU grep
 Summary(tr.UTF-8):     Dosyalarda katar arama aracı
 Summary(uk.UTF-8):     Утиліти пошуку по шаблонам GNU grep
 Name:          grep
-Version:       2.11
+Version:       2.23
 Release:       1
 Epoch:         2
 License:       GPL v3+
 Group:         Applications/Text
 Source0:       http://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.xz
-# Source0-md5: ad9c6dbdeab93e50d2bc380f10ed3643
+# Source0-md5: f46aa9d0d2577b9212a104348a286787
 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
 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
@@ -87,6 +88,7 @@ kullanılır.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__rm} po/stamp-po
 
@@ -102,11 +104,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
@@ -116,10 +117,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
@@ -131,16 +128,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