- rediffed

[packages/grep.git] / grep.spec

diff --git a/grep.spec b/grep.spec
index ebc3423d8cb1168e1f5ea7dde5b4be694868ed49..18919fff0258d30f43068c78cb49c16018a05d00 100644 (file)
--- a/grep.spec
+++ b/grep.spec
@@ -1,35 +1,40 @@
 #
 # Conditional build:
 #
 # Conditional build:

-%bcond_with    pcre    # PCRE support
+%bcond_without pcre    # PCRE support
+%bcond_without tests   # don't perform "make check"

 #
 Summary:       GNU grep Utilities
 #
 Summary:       GNU grep Utilities

-Summary(de):   GNU-Version der Pattern-Matching-Utilities
-Summary(es):   Utilitarios grep GNU
-Summary(fr):   Utilitaires grep de GNU
-Summary(ja):   GNU grep ¤ÎÆüËܸìÂбþÈǤǤ¹.
-Summary(pl):   GNU grep
-Summary(pt_BR):        Utilitários grep GNU
-Summary(ru):   õÔÉÌÉÔÙ ÐÏÉÓËÁ ÐÏ ÛÁÂÌÏÎÁÍ GNU grep
-Summary(tr):   Dosyalarda katar arama aracý
-Summary(uk):   õÔÉ̦ÔÉ ÐÏÛÕËÕ ÐÏ ÛÁÂÌÏÎÁÍ GNU grep
+Summary(de.UTF-8):     GNU-Version der Pattern-Matching-Utilities
+Summary(es.UTF-8):     Utilitarios grep GNU
+Summary(fr.UTF-8):     Utilitaires grep de GNU
+Summary(ja.UTF-8):     GNU grep の日本語対応版です.
+Summary(pl.UTF-8):     GNU grep
+Summary(pt_BR.UTF-8):  Utilitários grep GNU
+Summary(ru.UTF-8):     Утилиты поиска по шаблонам GNU grep
+Summary(tr.UTF-8):     Dosyalarda katar arama aracı
+Summary(uk.UTF-8):     Утиліти пошуку по шаблонам GNU grep

 Name:          grep
 Name:          grep

-Version:       2.5.1
-Release:       10
+Version:       3.6
+Release:       2

 Epoch:         2
 Epoch:         2

-License:       GPL
+License:       GPL v3+

 Group:         Applications/Text
 Group:         Applications/Text

-Source0:       ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5: ae69f8112cdc63615cefe944f38bbee7
+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
 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}-egrep.patch
+Patch1:                %{name}-pl.po-update.patch
+Patch2:                disable-unstable-test.patch
+URL:           http://www.gnu.org/software/grep/grep.html
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.11
+BuildRequires: gettext-tools >= 0.18.2

 %{?with_pcre:BuildRequires:    pcre-devel}
 %{?with_pcre:BuildRequires:    pcre-devel}

-%{?with_pcre:Requires: pcre}
-BuildRequires: gettext-devel
-BuildRequires: gettext-devel
-BuildRequires: automake
-BuildRequires: autoconf
+BuildRequires: pkgconfig >= 1:0.9.0
+BuildRequires: tar >= 1:1.22
+BuildRequires: texinfo
+BuildRequires: xz

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _bindir         /bin
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _bindir         /bin


@@ -41,79 +46,76 @@ more input files for lines which contain a match to a specified
 pattern and then prints the matching lines. GNU's grep utilities
 include grep, egrep and fgrep.
 
 pattern and then prints the matching lines. GNU's grep utilities
 include grep, egrep and fgrep.
 

-%description -l de
-Die GNU-Versionen der häufig benutzten grep-Utilities. Grep durchsucht
+%description -l de.UTF-8
+Die GNU-Versionen der häufig benutzten grep-Utilities. Grep durchsucht

 eine oder mehrere Eingabedateien nach Zeilen, die auf ein angegebenes
 Muster passen, und zeigt dann die entsprechenden Zeilen an. GNUs grep
 eine oder mehrere Eingabedateien nach Zeilen, die auf ein angegebenes
 Muster passen, und zeigt dann die entsprechenden Zeilen an. GNUs grep

-enthält grep, egrep und fgrep.
+enthält grep, egrep und fgrep.

 
 

-%description -l es
-Esta es la implementación GNU del popular utilitario grep. Permite la
-localización rápida de strings en archivos texto.
+%description -l es.UTF-8
+Esta es la implementación GNU del popular utilitario grep. Permite la
+localización rápida de strings en archivos texto.

 
 

-%description -l fr
-Ceci est l'implémentation par GNU du populaire l'utilitaire grep su
-Unix. Il permet de localiser rapidement des chaînes de caractéres dans
+%description -l fr.UTF-8
+Ceci est l'implémentation par GNU du populaire l'utilitaire grep su
+Unix. Il permet de localiser rapidement des chaînes de caractéres dans

 les fichiers.
 
 les fichiers.
 

-%description -l ja
-GNU ¥×¥í¥¸¥§¥¯¥È¤Ë¤è¤ë grep, egrep, fgrep (°Ê²¼Ã±¤Ë grep) ¤ò¥Þ¥ë¥Á¥Ð
-¥¤¥È¥Ñ¥Ã¥Á(mb1.04)¤Ë¤è¤Ã¤ÆÆüËܸìÂбþ¤Ë¤·¤¿¤â¤Î¤Ç¤¹.
+%description -l ja.UTF-8
+GNU プロジェクトによる grep, egrep, fgrep (以下単に grep) をマルチバ
+イトパッチ(mb1.04)によって日本語対応にしたものです.

 
 

-%description -l pl
-GNU grep jest implementacj± popularnego programu uniksowego `grep'.
-Grep jest jednym z podstawowych narzêdzi, korzysta z niego prawie
-ka¿dy skrypt shella.
+%description -l pl.UTF-8
+GNU grep jest implementacją popularnego programu uniksowego `grep'.
+Grep jest jednym z podstawowych narzędzi, korzysta z niego prawie
+każdy skrypt shella.

 
 

-%description -l pt_BR
-Esta é a implementação GNU do popular utilitário grep. Permite a
-localização rápida de strings em arquivos texto.
+%description -l pt_BR.UTF-8
+Esta é a implementação GNU do popular utilitário grep. Permite a
+localização rápida de strings em arquivos texto.

 
 

-%description -l ru
-üÔÏ ÒÅÁÌÉÚÁÃÉÑ GNU ÕÔÉÌÉÔÙ grep, ÐÒÅÄÎÁÚÎÁÞÅÎÎÏÊ ÄÌÑ ÂÙÓÔÒÏÇÏ ÐÏÉÓËÁ
-ÐÏ ÏÂÒÁÚÃÕ × ÔÅËÓÔÏ×ÙÈ ÆÁÊÌÁÈ.
+%description -l ru.UTF-8
+Это реализация GNU утилиты grep, предназначенной для быстрого поиска
+по обÑ\80азÑ\86Ñ\83 в Ñ\82екÑ\81Ñ\82овÑ\8bÑ\85 Ñ\84айлаÑ\85.

 
 

-%description -l tr
-Bu, bütün Unix'lerde bulunan ve yaygýn olarak kullanýlan grep aracýnýn
-GNU sürümüdür. Metin dosyalarý içinde bulunan katarlarý aramada
-kullanýlýr.
+%description -l tr.UTF-8
+Bu, bütün Unix'lerde bulunan ve yaygın olarak kullanılan grep aracının
+GNU sürümüdür. Metin dosyaları içinde bulunan katarları aramada
+kullanılır.

 
 

-%description -l uk
-ãÅ GNU ÒÅÁ̦ÚÁÃ¦Ñ ÐÏÐÕÌÑÒÎϧ ÕÔÉ̦ÔÉ grep, ÐÒÉÚÎÁÞÅÎϧ ÄÌÑ Û×ÉÄËÏÇÏ
-ÐÏÛÕËÕ ÐÏ ÛÁÂÌÏÎÕ × ÔÅËÓÔÏ×ÉÈ ÆÁÊÌÁÈ.
+%description -l uk.UTF-8
+Це GNU реалізація популярної утиліти grep, призначеної для швидкого
+поÑ\88Ñ\83кÑ\83 по Ñ\88аблонÑ\83 в Ñ\82екÑ\81Ñ\82овиÑ\85 Ñ\84айлаÑ\85.

 
 %prep
 
 %prep

-%setup  -q
+%setup -q

 %patch0 -p1
 %patch1 -p1
 %patch0 -p1
 %patch1 -p1

+%patch2 -p1

 
 

-rm -f m4/{header,init}.m4
-
-# hack: AC_FUNC_STRERROR_R from strerror_r.m4 must override autoconf's version
-# (it contains HAVE_WORKING_STRERROR_R define, needed with glibc 2.x, as
-#  glibc version returns pointer to string and doesn't seem to store string in
-#  supplied buffer(???))
-cat m4/strerror_r.m4 >> acinclude.m4
-touch m4/{header,init}.m4
+%{__rm} po/stamp-po

 
 %build
 
 %build

-%{__libtoolize}
+%{__gettextize}

 %{__aclocal} -I m4
 %{__aclocal} -I m4

-%{__automake}

 %{__autoconf}
 %{__autoconf}

-%ifarch sparc sparc64
-CPPFLAGS=""
-export CPPFLAGS
-%endif
+%{__autoheader}
+%{__automake}

 %configure \
        %{!?with_pcre:--disable-perl-regexp} \
 %configure \
        %{!?with_pcre:--disable-perl-regexp} \

-       --without-included-regex \
-       --enable-nls
+       --disable-silent-rules \
+       --without-included-regex

 %{__make}
 
 %{__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
 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
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT


@@ -123,27 +125,38 @@ echo .so grep.1 > $RPM_BUILD_ROOT%{_mandir}/man1/fgrep.1
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 
 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}
 
 EOF
 
 %find_lang %{name}
 

+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+%{__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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%post
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%post -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}

 
 

-%postun
-[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+%postun -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}

 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)

-%doc NEWS README ChangeLog TODO
-%attr(644,root,root) %config(noreplace,missingok) %verify(not md5 size mtime) /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/*
 %lang(cs) %{_mandir}/cs/man1/*
 %lang(de) %{_mandir}/de/man1/*
 %lang(es) %{_mandir}/es/man1/*


@@ -154,4 +167,4 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja) %{_mandir}/ja/man1/*
 %lang(nl) %{_mandir}/nl/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
 %lang(ja) %{_mandir}/ja/man1/*
 %lang(nl) %{_mandir}/nl/man1/*
 %lang(pl) %{_mandir}/pl/man1/*

-%{_infodir}/*info*
+%{_infodir}/grep.info*