From cae5da8ad47aec20f03a80e5569ccda47a40bf3d2081c9b806f829fded50f46b Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 27 Sep 2011 10:43:28 +0000
Subject: [PATCH] Accepting request 85060 from
 home:dirkmueller:branches:Base:System

- fix testsuite to build properly against locally built grep

OBS-URL: https://build.opensuse.org/request/show/85060
OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=13
---
 fix-testsuite.diff | 30 ++++++++++++++++++++++++++++++
 grep.changes       |  5 +++++
 grep.spec          |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 fix-testsuite.diff

diff --git a/fix-testsuite.diff b/fix-testsuite.diff
new file mode 100644
index 0000000..c05b1af
--- /dev/null
+++ b/fix-testsuite.diff
@@ -0,0 +1,30 @@
+--- tests/reversed-range-endpoints
++++ tests/reversed-range-endpoints
+@@ -11,7 +11,7 @@
+   test $? = 2 || fail=1
+ 
+   # Remove "program_name: " prefix from actual output.
+-  sed 's/^[a-z]*: //' out > k && mv k out
++  sed 's/^[^ ]*: //' out > k && mv k out
+ 
+   compare out exp || fail=1
+ done
+--- tests/warn-char-classes
++++ tests/warn-char-classes
+@@ -5,13 +5,15 @@
+ echo f > x || framework_failure_
+ echo b >> x || framework_failure_
+ echo h >> x || framework_failure_
+-printf 'grep: character class syntax is [[:space:]], not [:space:]\n' \
++printf 'character class syntax is [[:space:]], not [:space:]\n' \
+   > exp-err || framework_failure_
+ 
+ # basic cases
+ 
+ grep '[:space:]' x 2> err
+ test $? = 2 || fail=1
++# Remove "program_name: " prefix from actual output.
++sed 's/^[^ ]*: //' err > k && mv k err
+ compare err exp-err || fail=1
+ 
+ grep '[[:space:]]' x 2> err
diff --git a/grep.changes b/grep.changes
index 42a3ad3..fe403fe 100644
--- a/grep.changes
+++ b/grep.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 27 12:42:54 CEST 2011 - dmueller@suse.de
+
+- fix testsuite to build properly against locally built grep
+
 -------------------------------------------------------------------
 Wed Aug 10 03:17:41 UTC 2011 - crrodriguez@opensuse.org
 
diff --git a/grep.spec b/grep.spec
index 12a3c98..4f9f4f5 100644
--- a/grep.spec
+++ b/grep.spec
@@ -32,6 +32,7 @@ Version:        2.9
 Release:        1
 Summary:        Print lines matching a pattern
 Source:         grep-%{version}.tar.bz2
+Patch0:         fix-testsuite.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -44,6 +45,7 @@ By default, grep prints the matching lines.
 %if 0%{?suse_version} < 1120
 echo "ac_cv_search_pcre_compile=\${ac_cv_search_pcre_compile=%{_libdir}/libpcre.a}" >config.cache
 %endif
+%patch0
 
 %build
 %if 0%{?suse_version} < 1120