[grep] - New version: grep-2.7 - Removed patches (already in upstream): dfa-optimize-period, glibc-matche

[Jaroslav Škarvada]

commit 5ec5b7c5f8058589ad8b57648f8a22f8eddce142
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Sep 21 15:04:45 2010 +0200

    - New version: grep-2.7
    - Removed patches (already in upstream): dfa-optimize-period,
      glibc-matcher-fallback, mmap-option-fix, dfa-convert-to-wide-char,
      dfa-speedup-digit-xdigit

 .gitignore                                |    1 +
 grep-2.6.3-dfa-convert-to-wide-char.patch |  162 ----------------------------
 grep-2.6.3-dfa-optimize-period.patch      |  165 -----------------------------
 grep-2.6.3-dfa-speedup-digit-xdigit.patch |  114 --------------------
 grep-2.6.3-glibc-matcher-fallback.patch   |   38 -------
 grep-2.6.3-mmap-option-fix.patch          |   26 -----
 grep.spec                                 |   30 ++----
 sources                                   |    2 +-
 8 files changed, 10 insertions(+), 528 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cba6b1a..4eacbbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 grep-2.6.3.tar.xz
+/grep-2.7.tar.xz
diff --git a/grep.spec b/grep.spec
index 02aebf2..9464f9f 100644
--- a/grep.spec
+++ b/grep.spec
@@ -2,8 +2,8 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 2.6.3
-Release: 4%{?dist}
+Version: 2.7
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
@@ -16,21 +16,6 @@ Requires(preun): /sbin/install-info
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: pcre-devel >= 3.9-10, texinfo, gettext
 BuildRequires: autoconf automake
-# Speedups DFA UTF-8 period patterns.
-# original name: 0001-dfa-optimize-UTF-8-period.patch
-Patch0: grep-2.6.3-dfa-optimize-period.patch
-# Speedups MBCSET ([a-z]) UTF-8 patterns.
-# original name: 0002-fall-back-to-glibc-matcher-if-a-MBCSET-is-found.patch
-Patch1: grep-2.6.3-glibc-matcher-fallback.patch
-# Deprecated --mmap option is now properly ignored.
-# 0003-grep-fix-mmap-not-being-ignored.patch
-Patch2: grep-2.6.3-mmap-option-fix.patch
-# Speedups -m and removes quadratic complexity when going to glibc.
-# 0004-dfa-convert-to-wide-character-line-by-line.patch
-Patch3: grep-2.6.3-dfa-convert-to-wide-char.patch
-# Speedups DFA [[:digit:]] and [[:xdigit:]] patterns.
-# 0005-dfa-speed-up-digit-and-xdigit.patch
-Patch4: grep-2.6.3-dfa-speedup-digit-xdigit.patch
 
 %description
 The GNU versions of commonly used grep utilities. Grep searches through
@@ -41,11 +26,6 @@ GNU grep is needed by many scripts, so it shall be installed on every system.
 
 %prep
 %setup -q
-%patch0 -p1 -b .dfa-optimize-period
-%patch1 -p1 -b .glibc-matcher-fallback
-%patch2 -p1 -b .mmap-option-fix
-%patch3 -p1 -b .dfa-convert-to-wide-char
-%patch4 -p1 -b .speedup-digit-xdigit
 
 %build
 %configure --without-included-regex CPPFLAGS="-I%{_includedir}/pcre"
@@ -87,6 +67,12 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Tue Sep 21 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 2.7-1
+- New version: grep-2.7
+- Removed patches (already in upstream): dfa-optimize-period,
+  glibc-matcher-fallback, mmap-option-fix, dfa-convert-to-wide-char,
+  dfa-speedup-digit-xdigit
+
 * Fri Jun 11 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 2.6.3-4
 - Colors can be globally disabled via /etc/GREP_COLORS (#602867)
 - Fixed indentation in spec
diff --git a/sources b/sources
index bcbaed1..d84d2d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-69a3bf508a3f14d12369e0e1c7a92763  grep-2.6.3.tar.xz
+6dd9931a52501519d7779a27cf953326  grep-2.7.tar.xz