1
0

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
This commit is contained in:
Marcus Meissner 2014-12-29 09:04:48 +00:00 committed by Git OBS Bridge
parent 45be961526
commit 5348f8fc76
5 changed files with 37 additions and 0 deletions

View File

@ -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 (<STDIN>) { 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

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Dec 28 15:03:00 UTC 2014 - Led <ledest@gmail.com>
- 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

View File

@ -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

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Dec 28 15:03:00 UTC 2014 - Led <ledest@gmail.com>
- 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

View File

@ -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