diff --git a/glibc-2.15-ru-i18nfixes.patch b/glibc-2.15-ru-i18nfixes.patch new file mode 100644 index 0000000..e05295e --- /dev/null +++ b/glibc-2.15-ru-i18nfixes.patch @@ -0,0 +1,17 @@ +diff -Naur glibc-2.15-a316c1f.orig/po/ru.po glibc-2.15-a316c1f/po/ru.po +--- glibc-2.15-a316c1f.orig/po/ru.po 2013-12-11 08:56:53.067231149 -0500 ++++ glibc-2.15-a316c1f/po/ru.po 2013-12-11 09:03:28.133235667 -0500 +@@ -3033,11 +3033,11 @@ + #: nis/nis_error.h:1 nis/ypclnt.c:833 nis/ypclnt.c:921 posix/regcomp.c:132 + #: sysdeps/gnu/errlist.c:20 + msgid "Success" +-msgstr "Победа" ++msgstr "Выполнено" + + #: nis/nis_error.h:2 + msgid "Probable success" +-msgstr "Вероятный успех" ++msgstr "Вероятно выполнено" + + #: nis/nis_error.h:3 + msgid "Not found" diff --git a/glibc.spec b/glibc.spec index ffbc1e1..d12315b 100644 --- a/glibc.spec +++ b/glibc.spec @@ -74,7 +74,7 @@ Summary: The GNU libc libraries Name: glibc Version: 2.15 -Release: 8 +Release: 9 Epoch: 6 License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ Group: System/Libraries @@ -255,6 +255,10 @@ Patch58: glibc-2.15-chromium-browser-crash.patch # Fix hang with Pulse (re-diff Fedora's patch) Patch59: glibc-rh769421-2.patch +# Backport a couple of localization phrases from upstream +# (users are confused with funny localization from 2.15) +Patch60: glibc-2.15-ru-i18nfixes.patch + # Determine minimum kernel versions (rhbz#619538) %define enablekernel 2.6.32 Conflicts: kernel < %{enablekernel} @@ -690,6 +694,8 @@ cp -a crypt_blowfish-%{crypt_bf_ver}/*.[chS] crypt/ %patch59 -p1 +%patch60 -p1 + find . -type f -size 0 -o -name "*.orig" -exec rm -f {} \; # Remove patch backups from files we ship in glibc packages