From e67474fe808bbdc9fc828418e7c25fd2a6b64b6d Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <fale@redhat.com>
Date: Sat, 20 Aug 2016 11:52:38 +0100
Subject: [PATCH] Update to 1.7.0 and enable the sidebar

---
 .gitignore                 |  1 +
 mutt-1.6.0-syncdebug.patch | 12 ------------
 mutt-1.7.0-syncdebug.patch | 12 ++++++++++++
 mutt.spec                  | 12 ++++++++----
 sources                    |  2 +-
 5 files changed, 22 insertions(+), 17 deletions(-)
 delete mode 100644 mutt-1.6.0-syncdebug.patch
 create mode 100644 mutt-1.7.0-syncdebug.patch

diff --git a/.gitignore b/.gitignore
index bb89cd3..e48cfab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ mutt-1.5.23.tar.gz
 /mutt-1.6.0.tar.gz
 /mutt-1.6.1.tar.gz
 /mutt-1.6.2.tar.gz
+/mutt-1.7.0.tar.gz
diff --git a/mutt-1.6.0-syncdebug.patch b/mutt-1.6.0-syncdebug.patch
deleted file mode 100644
index d67a94a..0000000
--- a/mutt-1.6.0-syncdebug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur mutt-1.6.0-orig/imap/imap.c mutt-1.6.0/imap/imap.c
---- mutt-1.6.0-orig/imap/imap.c	2016-04-02 19:12:22.000000000 +0100
-+++ mutt-1.6.0/imap/imap.c	2016-04-18 14:08:01.016584276 +0100
-@@ -1125,7 +1125,7 @@
-   if (!idata->ctx)
-     return -1;
- 
--  if (!mutt_bit_isset (idata->ctx->rights, right))
-+  if (!idata->ctx || !mutt_bit_isset (idata->ctx->rights, right))
-     return 0;
- 
-   if (right == M_ACL_WRITE && !imap_has_flag (idata->flags, name))
diff --git a/mutt-1.7.0-syncdebug.patch b/mutt-1.7.0-syncdebug.patch
new file mode 100644
index 0000000..4b757b1
--- /dev/null
+++ b/mutt-1.7.0-syncdebug.patch
@@ -0,0 +1,12 @@
+diff -ur mutt-1.7.0-orig/imap/imap.c mutt-1.7.0/imap/imap.c
+--- mutt-1.7.0-orig/imap/imap.c	2016-08-20 11:06:26.266272415 +0100
++++ mutt-1.7.0/imap/imap.c	2016-08-20 11:07:42.874509429 +0100
+@@ -1143,7 +1143,7 @@
+   if (!idata->ctx)
+     return -1;
+ 
+-  if (!mutt_bit_isset (idata->ctx->rights, right))
++  if (!idata->ctx || !mutt_bit_isset (idata->ctx->rights, right))
+     return 0;
+ 
+   if (right == MUTT_ACL_WRITE && !imap_has_flag (idata->flags, name))
diff --git a/mutt.spec b/mutt.spec
index 1b6072f..5315775 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -17,7 +17,7 @@
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 1.6.2
+Version: 1.7.0
 Release: 1%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
@@ -30,7 +30,7 @@ Source1: mutt_ldap_query
 Patch1: mutt-1.5.18-muttrc.patch
 Patch2: mutt-1.5.21-cabundle.patch
 # https://dev.mutt.org/trac/ticket/3569
-Patch3: mutt-1.6.0-syncdebug.patch
+Patch3: mutt-1.7.0-syncdebug.patch
 # FIXME make it to upstream
 Patch8: mutt-1.5.23-system_certs.patch
 Patch9: mutt-1.5.23-ssl_ciphers.patch
@@ -129,6 +129,7 @@ rm -f mutt_ssl.c
 \
     %{!?with_idn:	--without-idn} \
     %{?with_gpgme:	--enable-gpgme} \
+    --enable-sidebar \
     --with-docdir=%{_pkgdocdir}
 
 make %{?_smp_mflags}
@@ -192,13 +193,16 @@ ln -sf ./muttrc.5 $RPM_BUILD_ROOT%{_mandir}/man5/muttrc.local.5
 
 
 %changelog
+* Sat Aug 20 2016 Fabio Alessandro Locati <fale@redhat.com> - 5:1.7.0-1
+- Upgrade to 1.7.0
+
 * Thu Jul 07 2016 Jon Ciesla <limburgher@gmail.com> - 5:1.6.2-1
 - Upgrade to 1.6.2
 
-* Mon May 02 2016 Fabio Alessandro Locati <fabio@locati.cc> - 5:1.6.1-1
+* Mon May 02 2016 Fabio Alessandro Locati <fale@redhat.com> - 5:1.6.1-1
 - Upgrade to 1.6.1
 
-* Mon Apr 18 2016 Fabio Alessandro Locati <fabio@locati.cc> - 5:1.6.0-1
+* Mon Apr 18 2016 Fabio Alessandro Locati <fale@redhat.com> - 5:1.6.0-1
 - Upgrade to 1.6.0
 - Drop patch domainname since it should not be needed any more
 
diff --git a/sources b/sources
index 1af6a54..b4365ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f0f9cc35878987d7cdc7df6a1967376  mutt-1.6.2.tar.gz
+2897069ce71e52bf9549e9317fcb9ffa  mutt-1.7.0.tar.gz