From 66033cea9a2a4c5f7656e1493e220e82f357bc94 Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <fale@redhat.com>
Date: Sun, 9 Oct 2016 12:15:36 +0100
Subject: [PATCH] Update to 1.7.1

---
 .gitignore                                    |  1 +
 ...abundle.patch => mutt-1.7.1-cabundle.patch | 20 +++++++++----------
 mutt.spec                                     |  8 ++++++--
 sources                                       |  2 +-
 4 files changed, 18 insertions(+), 13 deletions(-)
 rename mutt-1.5.21-cabundle.patch => mutt-1.7.1-cabundle.patch (56%)

diff --git a/.gitignore b/.gitignore
index e48cfab..a8b1867 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ mutt-1.5.23.tar.gz
 /mutt-1.6.1.tar.gz
 /mutt-1.6.2.tar.gz
 /mutt-1.7.0.tar.gz
+/mutt-1.7.1.tar.gz
diff --git a/mutt-1.5.21-cabundle.patch b/mutt-1.7.1-cabundle.patch
similarity index 56%
rename from mutt-1.5.21-cabundle.patch
rename to mutt-1.7.1-cabundle.patch
index 0369523..76193ba 100644
--- a/mutt-1.5.21-cabundle.patch
+++ b/mutt-1.7.1-cabundle.patch
@@ -1,19 +1,19 @@
-diff -up mutt-1.5.21/contrib/Makefile.am.cabundle mutt-1.5.21/contrib/Makefile.am
---- mutt-1.5.21/contrib/Makefile.am.cabundle	2008-03-19 21:07:06.000000000 +0100
-+++ mutt-1.5.21/contrib/Makefile.am	2011-11-02 12:47:34.143534053 +0100
-@@ -5,7 +5,7 @@ subdir = contrib
+diff -ur mutt-1.7.1.orig/contrib/Makefile.am mutt-1.7.1/contrib/Makefile.am
+--- mutt-1.7.1.orig/contrib/Makefile.am	2016-10-09 12:08:41.081976100 +0100
++++ mutt-1.7.1/contrib/Makefile.am	2016-10-09 12:10:16.019451571 +0100
+@@ -5,7 +5,7 @@
  SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
- 	sample.muttrc  sample.mailcap sample.muttrc-tlr \
- 	colors.default colors.linux smime.rc \
+ 	sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \
+ 	sample.vimrc-sidebar colors.default colors.linux smime.rc \
 -	ca-bundle.crt smime_keys_test.pl mutt_xtitle
 +	smime_keys_test.pl mutt_xtitle
  
  EXTRA_DIST = language.txt language50.txt  \
  	patch.slang-1.2.2.keypad.1	\
-diff -up mutt-1.5.21/doc/smime-notes.txt.cabundle mutt-1.5.21/doc/smime-notes.txt
---- mutt-1.5.21/doc/smime-notes.txt.cabundle	2011-11-02 12:53:56.808750080 +0100
-+++ mutt-1.5.21/doc/smime-notes.txt	2011-11-02 12:57:46.225881970 +0100
-@@ -40,8 +40,10 @@ How to add use mutt's S/MIME capabilitie
+diff -ur mutt-1.7.1.orig/doc/smime-notes.txt mutt-1.7.1/doc/smime-notes.txt
+--- mutt-1.7.1.orig/doc/smime-notes.txt	2016-10-09 12:08:41.071976366 +0100
++++ mutt-1.7.1/doc/smime-notes.txt	2016-10-09 12:11:11.964963896 +0100
+@@ -40,8 +40,10 @@
  - Edit the smime_sign_as line in your muttrc, replacing the keyid with your
    own.
  
diff --git a/mutt.spec b/mutt.spec
index c539f8c..c2f2b3c 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -18,7 +18,7 @@
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 1.7.0
+Version: 1.7.1
 Release: 1%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
@@ -29,7 +29,7 @@ Group: Applications/Internet
 Source: ftp://ftp.mutt.org/pub/%{name}/%{name}-%{version}.tar.gz
 Source1: mutt_ldap_query
 Patch1: mutt-1.5.18-muttrc.patch
-Patch2: mutt-1.5.21-cabundle.patch
+Patch2: mutt-1.7.1-cabundle.patch
 # https://dev.mutt.org/trac/ticket/3569
 Patch3: mutt-1.7.0-syncdebug.patch
 # FIXME make it to upstream
@@ -196,6 +196,10 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5
 
 
 %changelog
+* Sun Oct 09 2016 Fabio Alessandro Locati <fale@redhat.com> - 5:1.7.1-1
+- Upgrade to 1.7.1
+- Rebase cabundle patch
+
 * Sat Aug 20 2016 Fabio Alessandro Locati <fale@redhat.com> - 5:1.7.0-1
 - Upgrade to 1.7.0
 
diff --git a/sources b/sources
index b4365ed..5c641ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2897069ce71e52bf9549e9317fcb9ffa  mutt-1.7.0.tar.gz
+04ae5b20cee7d746a246968e4a8cb9fa  mutt-1.7.1.tar.gz