From 2e5bb459b69cd1eff3453d8cf76943dc84a35dde51a7e9fd290bb12b7072d892 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 21 Apr 2016 10:10:33 +0000
Subject: [PATCH] Accepting request 390542 from
 home:AndreasStieger:branches:Base:System

grep 2.24 fix for xgettext-glade-2 test omitted from previous submission

OBS-URL: https://build.opensuse.org/request/show/390542
OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=123
---
 gettext-runtime-grep-2.24.patch | 61 ++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/gettext-runtime-grep-2.24.patch b/gettext-runtime-grep-2.24.patch
index 4da05b7..3b98797 100644
--- a/gettext-runtime-grep-2.24.patch
+++ b/gettext-runtime-grep-2.24.patch
@@ -1,7 +1,7 @@
-Index: gettext-0.19.6/gettext-tools/tests/xgettext-vala-1
+Index: gettext-0.19.7/gettext-tools/tests/xgettext-vala-1
 ===================================================================
---- gettext-0.19.6.orig/gettext-tools/tests/xgettext-vala-1
-+++ gettext-0.19.6/gettext-tools/tests/xgettext-vala-1
+--- gettext-0.19.7.orig/gettext-tools/tests/xgettext-vala-1
++++ gettext-0.19.7/gettext-tools/tests/xgettext-vala-1
 @@ -95,7 +95,7 @@ ${XGETTEXT} --add-comments --no-location
  test $? = 0 || { cat xg-vala-1.err; exit 1; }
  # Don't simplify this to "grep ... < xg-vala-1.tmp", otherwise OpenBSD 4.0 grep
@@ -20,10 +20,10 @@ Index: gettext-0.19.6/gettext-tools/tests/xgettext-vala-1
  
  cat <<\EOF > xg-vala-1.all.ok
  # SOME DESCRIPTIVE TITLE.
-Index: gettext-0.19.6/gettext-tools/tests/xgettext-c-19
+Index: gettext-0.19.7/gettext-tools/tests/xgettext-c-19
 ===================================================================
---- gettext-0.19.6.orig/gettext-tools/tests/xgettext-c-19
-+++ gettext-0.19.6/gettext-tools/tests/xgettext-c-19
+--- gettext-0.19.7.orig/gettext-tools/tests/xgettext-c-19
++++ gettext-0.19.7/gettext-tools/tests/xgettext-c-19
 @@ -11,7 +11,7 @@ cat <<\EOF > err1.c
  gettext ("\U00110000");
  EOF
@@ -42,10 +42,10 @@ Index: gettext-0.19.6/gettext-tools/tests/xgettext-c-19
  	    || exit 1
  LC_ALL=C tr -d '\r' < xg-c-19.tmp.po > xg-c-19.po || exit 1
  
-Index: gettext-0.19.6/gettext-tools/tests/xgettext-javascript-4
+Index: gettext-0.19.7/gettext-tools/tests/xgettext-javascript-4
 ===================================================================
---- gettext-0.19.6.orig/gettext-tools/tests/xgettext-javascript-4
-+++ gettext-0.19.6/gettext-tools/tests/xgettext-javascript-4
+--- gettext-0.19.7.orig/gettext-tools/tests/xgettext-javascript-4
++++ gettext-0.19.7/gettext-tools/tests/xgettext-javascript-4
 @@ -14,7 +14,7 @@ ${XGETTEXT} --add-comments --no-location
  test $? = 0 || { cat xg-js-4.err; exit 1; }
  # Don't simplify this to "grep ... < xg-js-4.tmp", otherwise OpenBSD 4.0 grep
@@ -55,10 +55,10 @@ Index: gettext-0.19.6/gettext-tools/tests/xgettext-javascript-4
  
  cat <<\EOF > xg-js-4.ok
  # SOME DESCRIPTIVE TITLE.
-Index: gettext-0.19.6/gettext-tools/tests/xgettext-python-1
+Index: gettext-0.19.7/gettext-tools/tests/xgettext-python-1
 ===================================================================
---- gettext-0.19.6.orig/gettext-tools/tests/xgettext-python-1
-+++ gettext-0.19.6/gettext-tools/tests/xgettext-python-1
+--- gettext-0.19.7.orig/gettext-tools/tests/xgettext-python-1
++++ gettext-0.19.7/gettext-tools/tests/xgettext-python-1
 @@ -33,7 +33,7 @@ ${XGETTEXT} --add-comments --no-location
  test $? = 0 || { cat xg-py-1.err; exit 1; }
  # Don't simplify this to "grep ... < xg-py-1.tmp", otherwise OpenBSD 4.0 grep
@@ -68,10 +68,10 @@ Index: gettext-0.19.6/gettext-tools/tests/xgettext-python-1
  
  cat <<\EOF > xg-py-1.ok
  # SOME DESCRIPTIVE TITLE.
-Index: gettext-0.19.6/gettext-tools/tests/xgettext-python-3
+Index: gettext-0.19.7/gettext-tools/tests/xgettext-python-3
 ===================================================================
---- gettext-0.19.6.orig/gettext-tools/tests/xgettext-python-3
-+++ gettext-0.19.6/gettext-tools/tests/xgettext-python-3
+--- gettext-0.19.7.orig/gettext-tools/tests/xgettext-python-3
++++ gettext-0.19.7/gettext-tools/tests/xgettext-python-3
 @@ -50,7 +50,7 @@ ${XGETTEXT} --add-comments=TRANSLATORS:
    -o xg-py-3a.tmp xg-py-3a.py || exit 1
  # Don't simplify this to "grep ... < xg-py-3a.tmp", otherwise OpenBSD 4.0 grep
@@ -108,10 +108,10 @@ Index: gettext-0.19.6/gettext-tools/tests/xgettext-python-3
  
  cat <<\EOF > xg-py-3d.ok
  # SOME DESCRIPTIVE TITLE.
-Index: gettext-0.19.6/gettext-tools/tests/xgettext-stringtable-1
+Index: gettext-0.19.7/gettext-tools/tests/xgettext-stringtable-1
 ===================================================================
---- gettext-0.19.6.orig/gettext-tools/tests/xgettext-stringtable-1
-+++ gettext-0.19.6/gettext-tools/tests/xgettext-stringtable-1
+--- gettext-0.19.7.orig/gettext-tools/tests/xgettext-stringtable-1
++++ gettext-0.19.7/gettext-tools/tests/xgettext-stringtable-1
 @@ -24,7 +24,7 @@ EOF
  ${XGETTEXT} -o xg-stbl-1.tmp xg-stbl-1.strings || exit 1
  # Don't simplify this to "grep ... < xg-stbl-1.tmp", otherwise OpenBSD 4.0 grep
@@ -121,10 +121,10 @@ Index: gettext-0.19.6/gettext-tools/tests/xgettext-stringtable-1
  
  cat <<\EOF > xg-stbl-1.ok
  # SOME DESCRIPTIVE TITLE.
-Index: gettext-0.19.6/gettext-tools/tests/xgettext-tcl-4
+Index: gettext-0.19.7/gettext-tools/tests/xgettext-tcl-4
 ===================================================================
---- gettext-0.19.6.orig/gettext-tools/tests/xgettext-tcl-4
-+++ gettext-0.19.6/gettext-tools/tests/xgettext-tcl-4
+--- gettext-0.19.7.orig/gettext-tools/tests/xgettext-tcl-4
++++ gettext-0.19.7/gettext-tools/tests/xgettext-tcl-4
 @@ -14,7 +14,7 @@ ${XGETTEXT} --add-comments --no-location
  test $? = 0 || { cat xg-t-4.err; exit 1; }
  # Don't simplify this to "grep ... < xg-t-4.tmp", otherwise OpenBSD 4.0 grep
@@ -134,10 +134,10 @@ Index: gettext-0.19.6/gettext-tools/tests/xgettext-tcl-4
  
  cat <<\EOF > xg-t-4.ok
  # SOME DESCRIPTIVE TITLE.
-Index: gettext-0.19.6/gettext-tools/tests/xgettext-java-2
+Index: gettext-0.19.7/gettext-tools/tests/xgettext-java-2
 ===================================================================
---- gettext-0.19.6.orig/gettext-tools/tests/xgettext-java-2
-+++ gettext-0.19.6/gettext-tools/tests/xgettext-java-2
+--- gettext-0.19.7.orig/gettext-tools/tests/xgettext-java-2
++++ gettext-0.19.7/gettext-tools/tests/xgettext-java-2
 @@ -59,7 +59,7 @@ EOF
  ${XGETTEXT} --from-code=ISO-8859-1 -c -o xg-j-2.tmp xg-j-2.java 2>/dev/null || exit 1
  # Don't simplify this to "grep ... < xg-j-2.tmp", otherwise OpenBSD 4.0 grep
@@ -147,3 +147,16 @@ Index: gettext-0.19.6/gettext-tools/tests/xgettext-java-2
  
  cat <<\EOF > xg-j-2.ok
  # SOME DESCRIPTIVE TITLE.
+Index: gettext-0.19.7/gettext-tools/tests/xgettext-glade-2
+===================================================================
+--- gettext-0.19.7.orig/gettext-tools/tests/xgettext-glade-2
++++ gettext-0.19.7/gettext-tools/tests/xgettext-glade-2
+@@ -58,7 +58,7 @@ EOF
+ ${XGETTEXT} --add-comments -o xg-gl-2.tmp xg-gl-2-simple.glade  || exit 1
+ # Don't simplify this to "grep ... < xg-gl-2.tmp", otherwise OpenBSD 4.0 grep
+ # only outputs "Binary file (standard input) matches".
+-cat xg-gl-2.tmp | grep -v 'POT-Creation-Date' > xg-gl-2.pot
++cat xg-gl-2.tmp | grep -a -v 'POT-Creation-Date' > xg-gl-2.pot
+ 
+ cat <<\EOF > xg-gl-2.ok
+ # SOME DESCRIPTIVE TITLE.