From cdb7b66fae035bd162866fa6dd840ce9523e7d10 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: May 16 2011 12:58:05 +0000
Subject: New version: grep-2.8

Resolves: rhbz#704710
Removed const-range-exp patch (upstreamed)
Added coloring to egrep and fgrep
Resolves: rhbz#697895

---

diff --git a/.gitignore b/.gitignore
index 4eacbbc..c8d99e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 grep-2.6.3.tar.xz
 /grep-2.7.tar.xz
+/grep-2.8.tar.xz
diff --git a/colorgrep.csh b/colorgrep.csh
index 82bd09d..0b76c97 100644
--- a/colorgrep.csh
+++ b/colorgrep.csh
@@ -11,3 +11,5 @@ if ( -r /etc/GREP_COLORS ) then
 endif
 
 alias grep 'grep --color=auto'
+alias egrep 'egrep --color=auto'
+alias fgrep 'fgrep --color=auto'
diff --git a/colorgrep.sh b/colorgrep.sh
index 436518f..9b23d61 100644
--- a/colorgrep.sh
+++ b/colorgrep.sh
@@ -8,3 +8,5 @@ if [ -r /etc/GREP_COLORS ]; then
 fi
 
 alias grep='grep --color=auto' 2>/dev/null
+alias egrep='egrep --color=auto' 2>/dev/null
+alias fgrep='fgrep --color=auto' 2>/dev/null
diff --git a/grep.spec b/grep.spec
index f5b591b..dfc1cfe 100644
--- a/grep.spec
+++ b/grep.spec
@@ -2,8 +2,8 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 2.7
-Release: 2%{?dist}
+Version: 2.8
+Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
@@ -67,6 +67,13 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Mon May 16 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 2.8-1
+- New version: grep-2.8
+  Resolves: rhbz#704710
+- Removed const-range-exp patch (upstreamed)
+- Added coloring to egrep and fgrep
+  Resolves: rhbz#697895
+
 * Mon Apr 04 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 2.7-2
 - colorgrep scripts no longer overwrites COLORS envvar (#693058),
   thanks to Ville Skyttä
diff --git a/sources b/sources
index d84d2d0..1a1cc07 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6dd9931a52501519d7779a27cf953326  grep-2.7.tar.xz
+b59003c42b330bdabd417e00d07102da  grep-2.8.tar.xz