grep: update to 2.7

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2671 ec354946-7b23-47d6-9f5a-488ba84defc7

g/grep/grep-vl.spec

@@ -1,30 +1,23 @@
 Summary: The GNU versions of grep pattern matching utilities.
 Summary(ja): GNU版 grep パターンマッチングユーティリティ
 Name: grep
-Version: 2.5.1
-Release: 60%{?_dist_release}
-License: GPLv2+
+Version: 2.7
+Release: 1%{?_dist_release}
+
+License: GPLv3+
 Group: System Environment/Base
-Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}a.tar.bz2
-Patch0: grep-2.5.1-fgrep.patch
-Patch1: grep-2.5.1-bracket.patch
-Patch2: grep-2.5-i18n.patch
-Patch3: grep-2.5.1-oi.patch
-Patch4: grep-2.5.1-manpage.patch
-Patch5: grep-2.5.1-color.patch
-Patch6: grep-2.5.1-icolor.patch
-Patch10: grep-2.5.1-egf-speedup.patch
-Patch11: grep-2.5.1-dfa-optional.patch
-Patch12: grep-2.5.1-tests.patch
-Patch13: grep-2.5.1-w.patch
-Patch14: grep-P.patch
-Patch15: grep-mem-exhausted.patch
-Patch16: grep-empty-pattern.patch
-Patch100: grep-2.5.1-egf-non-utf8-null-break.patch
 URL: http://www.gnu.org/software/grep/
-Prereq: /sbin/install-info
+
+Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
+Source1: colorgrep.sh
+Source2: colorgrep.csh
+Source3: GREP_COLORS
+Patch0: grep-2.7-const-range-exp.patch
+
+Requires(post): install-info
+Requires(preun): install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-Buildrequires: texinfo, gettext, gzip
+BuildRequires: pcre-devel, texinfo, gettext, gzip
 
 %description
 The GNU versions of commonly used grep utilities.  Grep searches
@@ -44,47 +37,26 @@ utility for searching through text.
 してください。 
 
 %prep
-%setup -q -n %{name}-%{version}a
-%patch0 -p1 -b .fgrep
-%patch1 -p1 -b .bracket
-%patch2 -p1 -b .i18n
-%patch3 -p1 -b .oi
-%patch4 -p1 -b .manpage
-%patch5 -p1 -b .color
-%patch6 -p1 -b .icolor
-%patch10 -p1 -b .egf-speedup
-%patch11 -p1 -b .dfa-optional
-%patch12 -p1 -b .tests
-%patch13 -p1 -b .w
-%patch14 -p1 -b .P
-%patch15 -p1 -b .mem-exhausted
-%patch16 -p1 -b .empty-pattern
-%patch100 -p1 -b egf-non-utf8-null-break
-chmod a+x tests/fmbtest.sh
+%setup -q
+%patch0 -p1 -b .const-range-exp
 
 %build
-[ ! -e configure ] && ./autogen.sh
 %configure CPPFLAGS="-I%{_includedir}/pcre" \
-	--prefix=%{_prefix} \
-	--disable-perl-regexp \
 	--without-included-regex
-make
+%__make %{?_smp_mflags}
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-
-%makeinstall prefix=$RPM_BUILD_ROOT%{_prefix} exec_prefix=$RPM_BUILD_ROOT
-%ifos Linux
-mkdir -p $RPM_BUILD_ROOT/bin
-mv $RPM_BUILD_ROOT%{_prefix}/bin/* $RPM_BUILD_ROOT/bin
-rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-%endif
-gzip -9f $RPM_BUILD_ROOT%{_infodir}/grep*
+%__make DESTDIR=$RPM_BUILD_ROOT install
+gzip $RPM_BUILD_ROOT%{_infodir}/grep*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install -pm 644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
+mkdir -p $RPM_BUILD_ROOT/bin
+mv $RPM_BUILD_ROOT%{_prefix}/bin/* $RPM_BUILD_ROOT/bin/
+rm -rf $RPM_BUILD_ROOT%{_bindir}
 
-# Use symlinks for egrep and fgrep
-ln -sf grep $RPM_BUILD_ROOT/bin/egrep
-ln -sf grep $RPM_BUILD_ROOT/bin/fgrep
 
 %find_lang %{name}
 
@@ -104,17 +76,19 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc ABOUT-NLS AUTHORS THANKS TODO NEWS README ChangeLog
-
-%ifos Linux
+%doc ABOUT-NLS AUTHORS THANKS TODO NEWS README ChangeLog COPYING
 /bin/*
-%else
-%{_prefix}/bin/*
-%endif
+%config(noreplace) %{_sysconfdir}/profile.d/colorgrep.*sh
+%config(noreplace) %{_sysconfdir}/GREP_COLORS
 %{_infodir}/*.info.gz
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 10 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.7-1
+- new upstream release
+- drop unneeded old patches
+- add BR: pcre-devel
+
 * Mon Sep 29 2008 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 2.5.1-60
 - rebuilt against current toolchain
 - fix license tag