From 8a26aec9e64a8f35cd419545e1d0536f22959d0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@fedoraproject.org>
Date: Fri, 26 Mar 2010 06:22:22 +0000
Subject: [PATCH] - New version: grep-2.6.1 - Dropped sigsegv patch (integrated
 upstream)

---
 .cvsignore             |  2 +-
 grep-2.6-sigsegv.patch | 20 --------------------
 grep.spec              |  8 +++++---
 sources                |  2 +-
 4 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 grep-2.6-sigsegv.patch

diff --git a/.cvsignore b/.cvsignore
index 7f63c13..f513b69 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-grep-2.6.tar.xz
+grep-2.6.1.tar.xz
diff --git a/grep-2.6-sigsegv.patch b/grep-2.6-sigsegv.patch
deleted file mode 100644
index 59ab50d..0000000
--- a/grep-2.6-sigsegv.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/dfa.c	2010-03-22 17:22:51.000000000 +0100
-+++ b/src/dfa.c	2010-03-23 16:55:43.974271709 +0100
-@@ -243,7 +243,7 @@
-    For MB_CUR_MAX > 1, one or both of the two cases may not be set,
-    so the resulting charset may only be used as an optimization.  */
- static void
--setbit_case_fold (unsigned int b, charclass c)
-+setbit_case_fold (wint_t b, charclass c)
- {
-   if (case_fold)
-     {
-@@ -691,7 +691,7 @@
- 	  continue;
- 	}
- 
--      setbit_case_fold (c, ccl);
-+      setbit_case_fold (wc, ccl);
- #ifdef MBS_SUPPORT
-       /* Build normal characters.  */
-       if (MB_CUR_MAX > 1)
diff --git a/grep.spec b/grep.spec
index 2ced74f..c89ca21 100644
--- a/grep.spec
+++ b/grep.spec
@@ -2,12 +2,11 @@
 
 Summary: Pattern matching utilities
 Name: grep
-Version: 2.6
+Version: 2.6.1
 Release: 1%{?dist}
 License: GPLv3+
 Group: Applications/Text
 Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
-Patch0: grep-2.6-sigsegv.patch
 URL: http://www.gnu.org/software/grep/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -24,7 +23,6 @@ GNU grep is needed by many scripts, so it shall be installed on every system.
 
 %prep
 %setup -q
-%patch0 -p1 -b .sigsegv
 
 %build
 %configure --without-included-regex CPPFLAGS="-I%{_includedir}/pcre"
@@ -62,6 +60,10 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Fri Mar 26 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 2.6.1-1
+- New version: grep-2.6.1
+- Dropped sigsegv patch (integrated upstream)
+
 * Tue Mar 23 2010 Jaroslav Škarvada <jskarvad@redhat.com> - 2.6-1
 - New version: grep-2.6
 - Added sigsegv patch (after release patch from upstream)
diff --git a/sources b/sources
index 63cd508..b83d093 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a55bd2d80f7b76563f0f069c52aa730e  grep-2.6.tar.xz
+6462c218ad2df7e111206d06bef38363  grep-2.6.1.tar.xz