From 5348f8fc7654f25d010b3e9905a862bd55aa12ab6c3493dc4e42c992d1d8e441 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 29 Dec 2014 09:04:48 +0000 Subject: [PATCH] Accepting request 266569 from home:Ledest:bashisms fix 'echo -e' in cvs.sh script that may be unsupported in some POSIX-complete shells OBS-URL: https://build.opensuse.org/request/show/266569 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=102 --- gettext-0.19.3-fix-bashisms.patch | 17 +++++++++++++++++ gettext-runtime-mini.changes | 8 ++++++++ gettext-runtime-mini.spec | 2 ++ gettext-runtime.changes | 8 ++++++++ gettext-runtime.spec | 2 ++ 5 files changed, 37 insertions(+) create mode 100644 gettext-0.19.3-fix-bashisms.patch diff --git a/gettext-0.19.3-fix-bashisms.patch b/gettext-0.19.3-fix-bashisms.patch new file mode 100644 index 0000000..eec1727 --- /dev/null +++ b/gettext-0.19.3-fix-bashisms.patch @@ -0,0 +1,17 @@ +diff -Ndurp gettext-0.19.3/gettext-tools/examples/hello-c++-kde/admin/cvs.sh gettext-0.19.3-fix-bashisms/gettext-tools/examples/hello-c++-kde/admin/cvs.sh +--- gettext-0.19.3/gettext-tools/examples/hello-c++-kde/admin/cvs.sh 2013-05-02 11:40:04.000000000 +0300 ++++ gettext-0.19.3-fix-bashisms/gettext-tools/examples/hello-c++-kde/admin/cvs.sh 2014-12-28 16:59:45.300732878 +0200 +@@ -423,7 +423,12 @@ for subdir in $dirs; do + fi + fi + if test -n "`grep -r KAboutData *.c* *.C* 2>/dev/null`"; then +- echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp ++ cat > _translatorinfo.cpp <<-EOF ++ i18n("_: NAME OF TRANSLATORS\n" ++ "Your names") ++ i18n("_: EMAIL OF TRANSLATORS\n" ++ "Your emails") ++ EOF + else echo " " > _translatorinfo.cpp + fi + perl -e '$mes=0; while () { next if (/^(if|else|endif)\s/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index 6e34c76..9d264bf 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Dec 28 15:03:00 UTC 2014 - Led + +- fix 'echo -e' in cvs.sh script that may be unsupported in some + POSIX-complete shells +- add patches: + * gettext-0.19.3-fix-bashisms.patch + ------------------------------------------------------------------- Fri Oct 17 21:56:18 UTC 2014 - andreas.stieger@gmx.de diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index 0263b50..71a7806 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -61,6 +61,7 @@ Source4: baselibs.conf Source5: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz.sig Source6: %name.keyring Patch: gettext-0.12.1-sigfpe.patch +Patch1: gettext-0.19.3-fix-bashisms.patch Patch2: gettext-0.12.1-gettextize.patch Patch4: gettext-po-mode.diff Patch5: gettext-initialize_vars.patch @@ -118,6 +119,7 @@ as well as project examples. %prep %setup -q -n %{pacname}-%{version} %patch +%patch1 -p1 %patch2 %patch4 %patch5 diff --git a/gettext-runtime.changes b/gettext-runtime.changes index 6e34c76..9d264bf 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Dec 28 15:03:00 UTC 2014 - Led + +- fix 'echo -e' in cvs.sh script that may be unsupported in some + POSIX-complete shells +- add patches: + * gettext-0.19.3-fix-bashisms.patch + ------------------------------------------------------------------- Fri Oct 17 21:56:18 UTC 2014 - andreas.stieger@gmx.de diff --git a/gettext-runtime.spec b/gettext-runtime.spec index a5a045b..c0e5e04 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -61,6 +61,7 @@ Source4: baselibs.conf Source5: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz.sig Source6: %name.keyring Patch: gettext-0.12.1-sigfpe.patch +Patch1: gettext-0.19.3-fix-bashisms.patch Patch2: gettext-0.12.1-gettextize.patch Patch4: gettext-po-mode.diff Patch5: gettext-initialize_vars.patch @@ -118,6 +119,7 @@ as well as project examples. %prep %setup -q -n %{pacname}-%{version} %patch +%patch1 -p1 %patch2 %patch4 %patch5