From 655af6d587325b3d6e77f1f20acebfbb26a545d6 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 16 Jul 2009 16:09:08 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mutt?expand=0&rev=16 --- mutt-1.5.20-gpgme_set_locale.patch | 12 ++++++++++++ mutt.changes | 6 ++++++ mutt.spec | 4 +++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 mutt-1.5.20-gpgme_set_locale.patch diff --git a/mutt-1.5.20-gpgme_set_locale.patch b/mutt-1.5.20-gpgme_set_locale.patch new file mode 100644 index 0000000..444a288 --- /dev/null +++ b/mutt-1.5.20-gpgme_set_locale.patch @@ -0,0 +1,12 @@ +Index: mutt-1.5.20/crypt-gpgme.c +=================================================================== +--- mutt-1.5.20/crypt-gpgme.c 2009-05-19 02:11:35.000000000 +0200 ++++ mutt-1.5.20/crypt-gpgme.c 2009-07-14 14:43:43.000000000 +0200 +@@ -344,6 +344,7 @@ static gpgme_ctx_t create_gpgme_context + + if (!GpgmeLocaleSet) + { ++ gpgme_check_version(NULL); + gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL)); + #ifdef ENABLE_NLS + gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL)); diff --git a/mutt.changes b/mutt.changes index c27e629..6b8bb26 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 15 13:46:07 CEST 2009 - werner@suse.de + +- Make gpgme work even with locale, patch from Evan McClain + (bnc#519628) + ------------------------------------------------------------------- Fri Jun 26 13:12:09 CEST 2009 - werner@suse.de diff --git a/mutt.spec b/mutt.spec index dd28c2f..8681816 100644 --- a/mutt.spec +++ b/mutt.spec @@ -32,7 +32,7 @@ Requires: smtp_daemon #Requires: desktop-data-SuSE AutoReqProv: on Version: 1.5.20 -Release: 1 +Release: 2 Summary: Mail Program # ftp://ftp.mutt.org/mutt/devel/ Source0: %name-%version.tar.bz2 @@ -53,6 +53,7 @@ Patch5: patch-1.5.5.1.nt.xtitles.3.ab.1 Patch6: patch-%version.sidebar.20090619.txt.bz2 Patch7: mutt-1.5.20.sidebar-fix.dif Patch8: mutt-1.5.19-opennfs.dif +Patch9: mutt-1.5.20-gpgme_set_locale.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -79,6 +80,7 @@ Authors: %patch6 -p1 %patch7 -p0 %patch8 -p0 +%patch9 -p1 cp doc/Muttrc Muttrc.SuSE cp %{S:2} .