From 21cc74c46c2ddb758c7e1701da2cc9dbf1168c84fd059058099a2574fc9ea35b Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Sun, 17 Apr 2016 20:07:52 +0000
Subject: [PATCH 1/3] Accepting request 390461 from
 home:AndreasStieger:branches:Base:System

gettext 0.19.7

OBS-URL: https://build.opensuse.org/request/show/390461
OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=121
---
 gettext-0.19.6.tar.xz          |  3 ---
 gettext-0.19.6.tar.xz.sig      | 17 -----------------
 gettext-0.19.7.tar.xz          |  3 +++
 gettext-0.19.7.tar.xz.sig      | 17 +++++++++++++++++
 gettext-csharp.changes         | 11 +++++++++++
 gettext-csharp.spec            |  2 +-
 gettext-dont-test-gnulib.patch | 22 +++++++++++-----------
 gettext-java.changes           | 11 +++++++++++
 gettext-java.spec              |  2 +-
 gettext-runtime-mini.changes   | 11 +++++++++++
 gettext-runtime-mini.spec      |  4 +++-
 gettext-runtime.changes        | 11 +++++++++++
 gettext-runtime.spec           |  4 +++-
 13 files changed, 83 insertions(+), 35 deletions(-)
 delete mode 100644 gettext-0.19.6.tar.xz
 delete mode 100644 gettext-0.19.6.tar.xz.sig
 create mode 100644 gettext-0.19.7.tar.xz
 create mode 100644 gettext-0.19.7.tar.xz.sig

diff --git a/gettext-0.19.6.tar.xz b/gettext-0.19.6.tar.xz
deleted file mode 100644
index b8904f4..0000000
--- a/gettext-0.19.6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b95816620fd1168cb4eeca0e9dc0ffd86e864fc668f76f5e37cc054d6982e51
-size 6878652
diff --git a/gettext-0.19.6.tar.xz.sig b/gettext-0.19.6.tar.xz.sig
deleted file mode 100644
index 0c263ea..0000000
--- a/gettext-0.19.6.tar.xz.sig
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJV8k58AAoJENYFhI7X5phxf7AP/jDpNuWiBT3B4rDibkTQ9wzJ
-uHM7dYniI/5B8MIUgUdl0NABNLMhKN3SI4Nr3EzMvt1vKqaDGA2J7uV+8KcyKGqF
-KUx/bX2gEZ/BaRngsp5cRGpG+Rw5EalpVUvRADeUTJ1pzjAugkjfbAjJ2OGAdVV6
-F+Isbg00Zi8U8Ns+rAw+CkuEk4O1PZt53Y3TjJLUdmX4TEd74cJI8vZkOAUgkhHy
-6wPJ3kvUhfNVYh0f6EU2PXL3E8g8tagICeoSnCm+mO6oWO/a+14ADp28Gh12n9IH
-Ur7azrxS521m+SUfgV4GIL6w0P4Ha5Sp+ArYhVwpofFKyoBkNsHLQpdyTL5Inw6c
-y/eTBHVmhwqWkNKfcuT4m7hEZ2M4D0d8awltDNDuZr0F52zn9m+9QWUL0PWqMlJH
-uLgwBQdcLXl7962Dc1YO+OxBXLo05EgGd/B2b8MXjn0f5NtWpp4PWHKXxw2BVdhR
-CR26+cNbyJ/X66PT3f2ZzY8s900y6liD1KBMxxQGYcJqjftkW07jUG6MZtaW/dV8
-LF9xwOajB96Fk7H31yTg3l3qlK+dPd28nC6H3TjBd+rLQH7XuebNrebNzNMBSjNq
-BqomhJVUcOKqf8aadOQMtugOAMN2At8dDF57vFRu9hzf8MFJ0RQKqMaaGONS6KnW
-tEbSHZHMJg9TutF6WmYl
-=IGDw
------END PGP SIGNATURE-----
diff --git a/gettext-0.19.7.tar.xz b/gettext-0.19.7.tar.xz
new file mode 100644
index 0000000..e365d23
--- /dev/null
+++ b/gettext-0.19.7.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:378fa86a091cec3acdece3c961bb8d8c0689906287809a8daa79dc0c6398d934
+size 7187304
diff --git a/gettext-0.19.7.tar.xz.sig b/gettext-0.19.7.tar.xz.sig
new file mode 100644
index 0000000..f9cb646
--- /dev/null
+++ b/gettext-0.19.7.tar.xz.sig
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJWgJ7bAAoJENYFhI7X5phxjpIP/AxeNFsPjdiFkKW44SQfmXfa
+m20MD6UN2uve/Ol3VECr6BI/texVkdJxIhEiy4KzqKfHTKzHsIFOYRQyg1ID1Jo6
+5hy5SWpFWNh5jw2E4q4Hwx/d6OtHGkk22dyAjgkMYxNRrLQdZ2vLCB1ga7dRCdwv
+0vDH+lW7sDNgW99ym3jnOUCUlii4HvjjRU5IqyylNSDGpzCdw6kZRB88YkCQvnTj
+eQeZxE67ubgKyEdFboMnsY0l+M5GcD38PiZIWNWTYRutlnEPDuYTNPd9ZxT9HPYV
+hBUfGAdW7qALBBUwP/PrMxJtCO527sf3RkVddAq8HmuYhokO3Ed721Ai7pUQ4HEh
+fKL9k8qKy/e6FfNH5OTqIF7v2LasIEA2UkxiHxboFfMw//ps1oUKzsk13FbkGMiw
+rPcTsdrZUXXD8dBhd2OhpGDoqnH3wiHtcnA7PtQrIzv9TX8EDsolFucZImJDlANy
+UUg7Y0fqtTmYgCvhjFPAHZ0Y3+zkaEHhKQfx51U/ZG1QqVVd2HPOWNJGMk3Qyfxd
+g3tWEaS1kc5LUEDp7I6NcBjT+tOoem6UGP+G+sthvMRmLmSHNHeOttk9x2sSesc2
+8qQzojEy01ztNiQnqJ2S4dAGM99g208N3v8YYtAyfDHeFPCl9ner8EVSbIwr9feE
+7pCr66G1TLtAMo22QpM8
+=Oy+9
+-----END PGP SIGNATURE-----
diff --git a/gettext-csharp.changes b/gettext-csharp.changes
index 728b268..ae96b1e 100644
--- a/gettext-csharp.changes
+++ b/gettext-csharp.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Apr  4 19:15:53 UTC 2016 - astieger@suse.com
+
+- GNU gettext 0.19.7:
+  * can now load custom string extraction rules in XML
+    Internationalization Tag Set (ITS) standard
+  * the existing XML-based language scanners (Glade, GSettings, and
+    AppData) rewritten using ITS
+  * Add msgfmt --xml option to merge translations back to the
+    original XML document.
+
 -------------------------------------------------------------------
 Fri Sep 11 18:56:49 UTC 2015 - astieger@suse.com
 
diff --git a/gettext-csharp.spec b/gettext-csharp.spec
index eb37443..725d048 100644
--- a/gettext-csharp.spec
+++ b/gettext-csharp.spec
@@ -29,7 +29,7 @@ BuildRequires:  tcl
 BuildRequires:  xz
 Requires:       mono
 Url:            http://www.gnu.org/software/gettext/
-Version:        0.19.6
+Version:        0.19.7
 Release:        0
 Summary:        Native Language Support (NLS) for C#
 License:        LGPL-2.1+
diff --git a/gettext-dont-test-gnulib.patch b/gettext-dont-test-gnulib.patch
index 7a5a1bc..dd38180 100644
--- a/gettext-dont-test-gnulib.patch
+++ b/gettext-dont-test-gnulib.patch
@@ -1,29 +1,29 @@
 Subject: This is not gnulib, so don't test it
 From: Stephan Kulow <coolo@suse.de>
 
-Index: gettext-0.18.3.1/gettext-tools/Makefile.am
+Index: gettext-0.19.7/gettext-tools/Makefile.am
 ===================================================================
---- gettext-0.18.3.1.orig/gettext-tools/Makefile.am
-+++ gettext-0.18.3.1/gettext-tools/Makefile.am
+--- gettext-0.19.7.orig/gettext-tools/Makefile.am
++++ gettext-0.19.7/gettext-tools/Makefile.am
 @@ -19,7 +19,7 @@
  AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
  ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
  
--SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
-+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests examples
+-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples its
++SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests examples its
  
  EXTRA_DIST = misc/DISCLAIM
  MOSTLYCLEANFILES = core *.stackdump
-Index: gettext-0.18.3.1/gettext-tools/Makefile.in
+Index: gettext-0.19.7/gettext-tools/Makefile.in
 ===================================================================
---- gettext-0.18.3.1.orig/gettext-tools/Makefile.in
-+++ gettext-0.18.3.1/gettext-tools/Makefile.in
-@@ -1551,7 +1551,7 @@ top_builddir = @top_builddir@
+--- gettext-0.19.7.orig/gettext-tools/Makefile.in
++++ gettext-0.19.7/gettext-tools/Makefile.in
+@@ -1865,7 +1865,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
  ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
--SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
-+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests examples
+-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples its
++SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests examples its
  
  # Allow users to use "gnulib-tool --update".
  
diff --git a/gettext-java.changes b/gettext-java.changes
index 5a1d544..34e7504 100644
--- a/gettext-java.changes
+++ b/gettext-java.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Apr  4 19:15:53 UTC 2016 - astieger@suse.com
+
+- GNU gettext 0.19.7:
+  * can now load custom string extraction rules in XML
+    Internationalization Tag Set (ITS) standard
+  * the existing XML-based language scanners (Glade, GSettings, and
+    AppData) rewritten using ITS
+  * Add msgfmt --xml option to merge translations back to the
+    original XML document.
+
 -------------------------------------------------------------------
 Fri Sep 11 18:56:49 UTC 2015 - astieger@suse.com
 
diff --git a/gettext-java.spec b/gettext-java.spec
index 7188be8..7f7f036 100644
--- a/gettext-java.spec
+++ b/gettext-java.spec
@@ -28,7 +28,7 @@ BuildRequires:  perl-libintl-perl
 BuildRequires:  tcl
 BuildRequires:  xz
 Url:            http://www.gnu.org/software/gettext/
-Version:        0.19.6
+Version:        0.19.7
 Release:        0
 Summary:        Java Support for Native Language Support (NLS)
 License:        LGPL-2.1+
diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes
index d869bc0..4431738 100644
--- a/gettext-runtime-mini.changes
+++ b/gettext-runtime-mini.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Apr 17 17:56:27 UTC 2016 - astieger@suse.com
+
+- GNU gettext 0.19.7:
+  * can now load custom string extraction rules in XML
+    Internationalization Tag Set (ITS) standard
+  * the existing XML-based language scanners (Glade, GSettings, and
+    AppData) rewritten using ITS
+  * Add msgfmt --xml option to merge translations back to the
+    original XML document.
+
 -------------------------------------------------------------------
 Tue Apr 12 11:27:37 UTC 2016 - dimstar@opensuse.org
 
diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec
index 0ca8868..a00ba03 100644
--- a/gettext-runtime-mini.spec
+++ b/gettext-runtime-mini.spec
@@ -20,7 +20,7 @@
 %bcond_without mini
 
 Name:           gettext-runtime-mini
-Version:        0.19.6
+Version:        0.19.7
 Release:        0
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
@@ -286,6 +286,8 @@ rm -rf %{buildroot}
 %_datadir/%pacname/styles
 %_datadir/%pacname/archive.dir.tar.xz
 %_datadir/aclocal/*
+%dir %{_datadir}/%{pacname}-%{version}
+%{_datadir}/%{pacname}-%{version}/its
 
 %files tools-doc
 %defattr(-,root,root)
diff --git a/gettext-runtime.changes b/gettext-runtime.changes
index d869bc0..4431738 100644
--- a/gettext-runtime.changes
+++ b/gettext-runtime.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Apr 17 17:56:27 UTC 2016 - astieger@suse.com
+
+- GNU gettext 0.19.7:
+  * can now load custom string extraction rules in XML
+    Internationalization Tag Set (ITS) standard
+  * the existing XML-based language scanners (Glade, GSettings, and
+    AppData) rewritten using ITS
+  * Add msgfmt --xml option to merge translations back to the
+    original XML document.
+
 -------------------------------------------------------------------
 Tue Apr 12 11:27:37 UTC 2016 - dimstar@opensuse.org
 
diff --git a/gettext-runtime.spec b/gettext-runtime.spec
index 9bbbb27..3fa0090 100644
--- a/gettext-runtime.spec
+++ b/gettext-runtime.spec
@@ -20,7 +20,7 @@
 %bcond_with mini
 
 Name:           gettext-runtime
-Version:        0.19.6
+Version:        0.19.7
 Release:        0
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
@@ -286,6 +286,8 @@ rm -rf %{buildroot}
 %_datadir/%pacname/styles
 %_datadir/%pacname/archive.dir.tar.xz
 %_datadir/aclocal/*
+%dir %{_datadir}/%{pacname}-%{version}
+%{_datadir}/%{pacname}-%{version}/its
 
 %files tools-doc
 %defattr(-,root,root)

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 2/3] 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.

From 0ed9b2ba7a4e6ea91068515c98580bee9a9b5329f033e38842c0555bf42d4702 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 26 Apr 2016 14:23:40 +0000
Subject: [PATCH 3/3] Accepting request 391334 from
 home:AndreasStieger:branches:Base:System

- drop gettext-runtime-grep-2.24.patch, no longer required for 2.25

OBS-URL: https://build.opensuse.org/request/show/391334
OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=124
---
 gettext-runtime-grep-2.24.patch | 162 --------------------------------
 gettext-runtime-mini.changes    |   5 +
 gettext-runtime-mini.spec       |   3 -
 gettext-runtime.changes         |   5 +
 gettext-runtime.spec            |   3 -
 5 files changed, 10 insertions(+), 168 deletions(-)
 delete mode 100644 gettext-runtime-grep-2.24.patch

diff --git a/gettext-runtime-grep-2.24.patch b/gettext-runtime-grep-2.24.patch
deleted file mode 100644
index 3b98797..0000000
--- a/gettext-runtime-grep-2.24.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-Index: gettext-0.19.7/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
- # only outputs "Binary file (standard input) matches".
--cat xg-vala-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-vala-1.pot
-+cat xg-vala-1.tmp | grep -a -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-vala-1.pot
- 
- cat <<\EOF > xg-vala-1.ok
- # SOME DESCRIPTIVE TITLE.
-@@ -151,7 +151,7 @@ ${XGETTEXT} --extract-all --add-comments
- test $? = 0 || { cat xg-vala-1.err; exit 1; }
- # Don't simplify this to "grep ... < xg-vala-1.tmp", otherwise OpenBSD 4.0 grep
- # only outputs "Binary file (standard input) matches".
--cat xg-vala-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-vala-1.pot
-+cat xg-vala-1.tmp | grep -a -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-vala-1.pot
- 
- cat <<\EOF > xg-vala-1.all.ok
- # SOME DESCRIPTIVE TITLE.
-Index: gettext-0.19.7/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
- 
--(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err1.c 2>&1; exit) | grep 'invalid Unicode character' || exit 1
-+(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err1.c 2>&1; exit) | grep -a 'invalid Unicode character' || exit 1
- 
- cat <<\EOF > xg-c-19.in.c
- /* 最初のコメント */
-@@ -32,7 +32,7 @@ iconv -f UTF-8 -t EUC-JP < xg-c-19.in.c
-   || { echo "Skipping test: iconv does not work for EUC-JP"; exit 77; }
- 
- ${XGETTEXT} --from-code=EUC-JP --add-comments --no-location --no-wrap \
--	    -o - xg-c-19.c | grep -v 'POT-Creation-Date' > xg-c-19.tmp.po \
-+	    -o - xg-c-19.c | grep -a -v 'POT-Creation-Date' > xg-c-19.tmp.po \
- 	    || exit 1
- LC_ALL=C tr -d '\r' < xg-c-19.tmp.po > xg-c-19.po || exit 1
- 
-Index: gettext-0.19.7/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
- # only outputs "Binary file (standard input) matches".
--cat xg-js-4.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-4.pot
-+cat xg-js-4.tmp | grep -a -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-4.pot
- 
- cat <<\EOF > xg-js-4.ok
- # SOME DESCRIPTIVE TITLE.
-Index: gettext-0.19.7/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
- # only outputs "Binary file (standard input) matches".
--cat xg-py-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-1.pot
-+cat xg-py-1.tmp | grep -a -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-1.pot
- 
- cat <<\EOF > xg-py-1.ok
- # SOME DESCRIPTIVE TITLE.
-Index: gettext-0.19.7/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
- # only outputs "Binary file (standard input) matches".
--cat xg-py-3a.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3a.pot
-+cat xg-py-3a.tmp | grep -a -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3a.pot
- 
- : ${DIFF=diff}
- ${DIFF} xg-py-3.ok xg-py-3a.pot || exit 1
-@@ -61,7 +61,7 @@ ${XGETTEXT} --add-comments=TRANSLATORS:
-   -o xg-py-3b.tmp xg-py-3b.py || exit 1
- # Don't simplify this to "grep ... < xg-py-3b.tmp", otherwise OpenBSD 4.0 grep
- # only outputs "Binary file (standard input) matches".
--cat xg-py-3b.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3b.pot
-+cat xg-py-3b.tmp | grep -a -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3b.pot
- 
- ${DIFF} xg-py-3.ok xg-py-3b.pot || exit 1
- 
-@@ -72,7 +72,7 @@ ${XGETTEXT} --add-comments=TRANSLATORS:
-   -o xg-py-3c.tmp xg-py-3b.py || exit 1
- # Don't simplify this to "grep ... < xg-py-3c.tmp", otherwise OpenBSD 4.0 grep
- # only outputs "Binary file (standard input) matches".
--cat xg-py-3c.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3c.pot
-+cat xg-py-3c.tmp | grep -a -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3c.pot
- 
- ${DIFF} xg-py-3.ok xg-py-3c.pot || exit 1
- 
-@@ -90,7 +90,7 @@ ${XGETTEXT} --add-comments=TRANSLATORS:
-   -o xg-py-3d.tmp xg-py-3d.py || exit 1
- # Don't simplify this to "grep ... < xg-py-3d.tmp", otherwise OpenBSD 4.0 grep
- # only outputs "Binary file (standard input) matches".
--cat xg-py-3d.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3d.pot
-+cat xg-py-3d.tmp | grep -a -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3d.pot
- 
- cat <<\EOF > xg-py-3d.ok
- # SOME DESCRIPTIVE TITLE.
-Index: gettext-0.19.7/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
- # only outputs "Binary file (standard input) matches".
--cat xg-stbl-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-stbl-1.po
-+cat xg-stbl-1.tmp | grep -a -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-stbl-1.po
- 
- cat <<\EOF > xg-stbl-1.ok
- # SOME DESCRIPTIVE TITLE.
-Index: gettext-0.19.7/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
- # only outputs "Binary file (standard input) matches".
--cat xg-t-4.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-t-4.pot
-+cat xg-t-4.tmp | grep -a -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-t-4.pot
- 
- cat <<\EOF > xg-t-4.ok
- # SOME DESCRIPTIVE TITLE.
-Index: gettext-0.19.7/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
- # only outputs "Binary file (standard input) matches".
--cat xg-j-2.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-j-2.pot
-+cat xg-j-2.tmp | grep -a -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-j-2.pot
- 
- 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.
diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes
index 4431738..bdf1402 100644
--- a/gettext-runtime-mini.changes
+++ b/gettext-runtime-mini.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr 22 19:34:10 UTC 2016 - astieger@suse.com
+
+- drop gettext-runtime-grep-2.24.patch, no longer required for 2.25
+
 -------------------------------------------------------------------
 Sun Apr 17 17:56:27 UTC 2016 - astieger@suse.com
 
diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec
index a00ba03..c426d20 100644
--- a/gettext-runtime-mini.spec
+++ b/gettext-runtime-mini.spec
@@ -70,8 +70,6 @@ Patch6:         gettext-dont-test-gnulib.patch
 Patch9:         gettext-needlessly_init_vars.patch
 # PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com
 Patch11:        boo941629-unnessary-rpath-on-standard-path.patch
-# PATCH-FIX-UPSTREAM gettext-runtime-grep-2.24.patch dimstar@opensuse.org -- Fix testsuite execution with grep 2.24
-Patch12:        gettext-runtime-grep-2.24.patch
 
 %description
 This package contains the intl library as well as tools that ease the
@@ -132,7 +130,6 @@ as well as project examples.
 %patch6 -p1
 %patch9
 %patch11 -p1
-%patch12 -p1
 
 %build
 # expect a couple "You should update your `aclocal.m4' by running aclocal."
diff --git a/gettext-runtime.changes b/gettext-runtime.changes
index 4431738..bdf1402 100644
--- a/gettext-runtime.changes
+++ b/gettext-runtime.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr 22 19:34:10 UTC 2016 - astieger@suse.com
+
+- drop gettext-runtime-grep-2.24.patch, no longer required for 2.25
+
 -------------------------------------------------------------------
 Sun Apr 17 17:56:27 UTC 2016 - astieger@suse.com
 
diff --git a/gettext-runtime.spec b/gettext-runtime.spec
index 3fa0090..c6df9f6 100644
--- a/gettext-runtime.spec
+++ b/gettext-runtime.spec
@@ -70,8 +70,6 @@ Patch6:         gettext-dont-test-gnulib.patch
 Patch9:         gettext-needlessly_init_vars.patch
 # PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com
 Patch11:        boo941629-unnessary-rpath-on-standard-path.patch
-# PATCH-FIX-UPSTREAM gettext-runtime-grep-2.24.patch dimstar@opensuse.org -- Fix testsuite execution with grep 2.24
-Patch12:        gettext-runtime-grep-2.24.patch
 
 %description
 This package contains the intl library as well as tools that ease the
@@ -132,7 +130,6 @@ as well as project examples.
 %patch6 -p1
 %patch9
 %patch11 -p1
-%patch12 -p1
 
 %build
 # expect a couple "You should update your `aclocal.m4' by running aclocal."