Build with gpgme support by default (rhbz#748337)

This commit is contained in:
Honza Horák 2011-11-02 13:10:10 +01:00
parent 62f4c7e8e9
commit cee76c5580
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,26 @@
diff -up mutt-1.5.21/init.c.gpgme-1.2.0 mutt-1.5.21/init.c
--- mutt-1.5.21/init.c.gpgme-1.2.0 2010-08-25 18:31:40.000000000 +0200
+++ mutt-1.5.21/init.c 2011-10-26 10:29:12.166967476 +0200
@@ -52,6 +52,10 @@
#include <sys/wait.h>
#include <sys/time.h>
+#if defined(CRYPT_BACKEND_GPGME)
+#include <gpgme.h>
+#endif
+
#define CHECK_PAGER \
if ((CurrentMenu == MENU_PAGER) && (idx >= 0) && \
(MuttVars[idx].flags & R_RESORT)) \
@@ -3143,6 +3147,11 @@ void mutt_init (int skip_sys_rc, LIST *c
mutt_read_histfile ();
+#ifdef CRYPT_BACKEND_GPGME
+ /* needed since version 1.2.0, ticket #3300 */
+ gpgme_check_version (NULL);
+#endif
+
#if 0
set_option (OPTWEED); /* turn weeding on by default */
#endif

View File

@ -11,7 +11,7 @@
%bcond_with bdb
%bcond_with qdbm
%bcond_with gdbm
%bcond_with gpgme
%bcond_without gpgme
Summary: A text mode mail user agent
Name: mutt
@ -31,6 +31,7 @@ Patch5: mutt-1.5.21-updating.patch
Patch6: mutt-1.5.21-hdrcnt.patch
Patch7: mutt-1.5.21-testcert.patch
Patch8: mutt-1.5.21-cabundle.patch
Patch9: mutt-1.5.21-gpgme-1.2.0.patch
Url: http://www.mutt.org/
Requires: mailcap urlview
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -74,6 +75,7 @@ for selecting groups of messages.
%patch6 -p1 -b .hdrcnt
%patch7 -p1 -b .testcert
%patch8 -p1 -b .cabundle
%patch9 -p1 -b .gpgme-1.2.0
sed -i.gpgerror 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure
@ -158,6 +160,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Oct 27 2011 Honza Horak <hhorak@redhat.com> - 5:1.5.21-7
- Removed ca-bundle.crt since it is outdated (rhbz#734379)
- Build with gpgme support by default (rhbz#748337)
* Wed Jun 29 2011 Honza Horak <hhorak@redhat.com> - 5:1.5.21-6
- Fixed message indexes when skipping fetch response (mutt bug #3288)