From 7ec675fa63bed9ac52cd108271aad251f56de8dea217f6491d55f6bfc69301fe Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 22 Jun 2008 00:49:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gpg2?expand=0&rev=22 --- gnupg-2.0.9-langinfo.patch | 11 +++++++++++ gpg2.changes | 6 ++++++ gpg2.spec | 7 ++++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gnupg-2.0.9-langinfo.patch diff --git a/gnupg-2.0.9-langinfo.patch b/gnupg-2.0.9-langinfo.patch new file mode 100644 index 0000000..87a515f --- /dev/null +++ b/gnupg-2.0.9-langinfo.patch @@ -0,0 +1,11 @@ +# fix [bnc#305725] - non latin characters displayed incorrectly by pinentry +--- jnlib/utf8conv.c ++++ jnlib/utf8conv.c +@@ -205,6 +205,7 @@ + #else /*!HAVE_W32_SYSTEM*/ + + #ifdef HAVE_LANGINFO_CODESET ++ setlocale(LC_ALL, ""); + newset = nl_langinfo (CODESET); + #else /*!HAVE_LANGINFO_CODESET*/ + /* Try to get the used charset from environment variables. */ diff --git a/gpg2.changes b/gpg2.changes index 8bc81b5..1befc3c 100644 --- a/gpg2.changes +++ b/gpg2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 11 11:06:09 CEST 2008 - puzel@suse.cz + +- fix [bnc#305725] - UTF-8 problems + * non latin characters displayed incorrectly by pinentry-* + ------------------------------------------------------------------- Wed May 21 14:01:14 CEST 2008 - puzel@suse.cz diff --git a/gpg2.spec b/gpg2.spec index 9a72816..aaff498 100644 --- a/gpg2.spec +++ b/gpg2.spec @@ -13,7 +13,7 @@ Name: gpg2 Version: 2.0.9 -Release: 17 +Release: 25 #krb5 BuildRequires: expect fdupes libassuan-devel pth BuildRequires: libgcrypt-devel libksba-devel opensc-devel @@ -35,6 +35,7 @@ Patch6: gnupg-1.9.18-tmpdir.diff Patch7: gnupg-2.0.4-install_tools.diff Patch9: gnupg-2.0.4-default-tty.diff Patch10: gnupg-2.0.9-RSA_ES.patch +Patch11: gnupg-2.0.9-langinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,6 +58,7 @@ Authors: %patch7 %patch9 %patch10 -p1 +%patch11 %build # Required for patch7: @@ -136,6 +138,9 @@ $RPM_BUILD_ROOT/usr/bin/gpgsplit -v -p secsplit- --secret-to-public --uncompress %config /etc/gnupg/gpgconf.conf %changelog +* Wed Jun 11 2008 puzel@suse.cz +- fix [bnc#305725] - UTF-8 problems + * non latin characters displayed incorrectly by pinentry-* * Wed May 21 2008 puzel@suse.cz - added missing gpgconf.conf (bnc#391347) * Fri Mar 28 2008 pcerny@suse.cz