- updated to 2.20 (bugfixes)

[packages/grep.git] / grep.spec

diff --git a/grep.spec b/grep.spec
index 8dbefb783fabc8d24e056d34156d0a1e54d19127..b42047aee0a8c187c00f37efec475a98d5df917d 100644 (file)
--- a/grep.spec
+++ b/grep.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
-%bcond_with    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,27 +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.3
+Version:       2.20
 Release:       1
 Epoch:         2
 License:       GPL v3+
 Group:         Applications/Text
-Source0:       ftp://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.gz
-# Source0-md5: 4f371f25f413f700fb1984b878421f9d
+Source0:       http://ftp.gnu.org/gnu/grep/%{name}-%{version}.tar.xz
+# Source0-md5: 2cbea44a4f1548aee20b9ff2d3076908
 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
+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-devel >= 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
@@ -90,24 +89,23 @@ kullanılır.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
-# 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
@@ -127,8 +125,8 @@ 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
@@ -144,9 +142,13 @@ rm -rf $RPM_BUILD_ROOT
 %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/*
+%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
+%{_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/*
@@ -157,4 +159,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*