rpm/gettext-runtime
SHA256
1
0
Fork 0
forked from pool/gettext-runtime
Code Pull Requests Activity

Accepting request 387993 from home:dimstar:Factory

Browse Source 
Fix build / test suite with grep 2.24

OBS-URL: https://build.opensuse.org/request/show/387993
OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=120
This commit is contained in:
Dirk Mueller 2016-04-12 14:14:40 +00:00 committed by Git OBS Bridge
parent 66fa021529
commit f4892af625
7 changed files with 171 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gettext-csharp.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gettext-csharp
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed

2
gettext-java.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gettext-java
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed

149
gettext-runtime-grep-2.24.patch Normal file
View File

@ -0,0 +1,149 @@
Index: gettext-0.19.6/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
@@ -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.6/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
@@ -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.6/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
@@ -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.6/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
@@ -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.6/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
@@ -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.6/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
@@ -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.6/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
@@ -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.6/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
@@ -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.

6
gettext-runtime-mini.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 12 11:27:37 UTC 2016 - dimstar@opensuse.org
- Add gettext-runtime-grep-2.24.patch: Fix test suite with
grep 2.24 (https://savannah.gnu.org/bugs/index.php?47674).
-------------------------------------------------------------------
Tue Dec 8 16:57:37 CET 2015 - sbrabec@suse.com

5
gettext-runtime-mini.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gettext-runtime-mini
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -70,6 +70,8 @@ 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
@ -130,6 +132,7 @@ 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."

6
gettext-runtime.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Apr 12 11:27:37 UTC 2016 - dimstar@opensuse.org
- Add gettext-runtime-grep-2.24.patch: Fix test suite with
grep 2.24 (https://savannah.gnu.org/bugs/index.php?47674).
-------------------------------------------------------------------
Tue Dec 8 16:57:37 CET 2015 - sbrabec@suse.com

5
gettext-runtime.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gettext-runtime
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -70,6 +70,8 @@ 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
@ -130,6 +132,7 @@ 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."