diff --git a/bash-4.2-error-getpwd.patch b/bash-4.2-error-getpwd.patch new file mode 100644 index 00000000..2e8a501f --- /dev/null +++ b/bash-4.2-error-getpwd.patch @@ -0,0 +1,16 @@ +Backport of the corrected error message for a failing getpwd (bnc#895475) +--- + po/de.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- po/de.po ++++ po/de.po 2014-09-15 08:46:03.482235134 +0000 +@@ -267,7 +267,7 @@ msgstr "Fehler beim Ermitteln der Termin + #: builtins/common.c:563 + #, c-format + msgid "%s: error retrieving current directory: %s: %s\n" +-msgstr "%s: Kann das nicht aktuelle Verzeichnis wiederfinden: %s: %s\n" ++msgstr "%s: Kann das aktuelle Verzeichnis nicht wiederfinden: %s: %s\n" + + #: builtins/common.c:629 builtins/common.c:631 + #, c-format diff --git a/bash.changes b/bash.changes index edaca38c..1bc1351b 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Sep 15 08:52:13 UTC 2014 - werner@suse.de + +- Add patch bash-4.2-error-getpwd.patch + which is the backport of the corrected german error message for + a failing getpwd (bnc#895475) + ------------------------------------------------------------------- Sun Jun 29 13:24:47 UTC 2014 - schwab@linux-m68k.org diff --git a/bash.spec b/bash.spec index c50f2e3c..e5533022 100644 --- a/bash.spec +++ b/bash.spec @@ -93,6 +93,8 @@ Patch27: readline-6.2-xmalloc.dif Patch30: readline-6.2-destdir.patch Patch31: readline-6.2-rltrace.patch Patch40: bash-4.1-bash.bashrc.dif +# PATCH-FIX-UPSTREAM bnc#895475 -- locale de_DE.utf8 has wrong translations +Patch41: bash-4.2-error-getpwd.patch Patch42: audit-patch Patch43: audit-rl-patch Patch46: man2html-no-timestamp.patch @@ -312,6 +314,7 @@ done %patch26 -p0 -b .msgdy %patch31 -p0 -b .tmp %patch40 -p0 -b .bashrc +%patch41 -p0 -b .errgetpwd %if 0%suse_version >= 1100 %patch42 -p1 -b .audit %endif