From: Jan Rękorajski <baggins@pld-linux.org>
Date: Tue, 26 Jan 2016 07:24:23 +0000 (+0100)
Subject: - revert one hunk in sidebar patch update to fix off-by-one in sidebar
X-Git-Tag: auto/th/mutt-1.5.24-2
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=commitdiff_plain;h=75a333ecb89499f3cd2e6d04dc024e9d9bd7e32a

- revert one hunk in sidebar patch update to fix off-by-one in sidebar
  display (missing first letter of foler names)
- rel 2
---

diff --git a/mutt-sidebar.patch b/mutt-sidebar.patch
index 0e08bfb..ff5435e 100644
--- a/mutt-sidebar.patch
+++ b/mutt-sidebar.patch
@@ -2197,7 +2197,7 @@
 + 		/* calculate depth of current folder and generate its display name with indented spaces */
 + 		int sidebar_folder_depth = 0;
 + 		char *sidebar_folder_name;
-+ 		sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir) + 1);
++ 		sidebar_folder_name = option(OPTSIDEBARSHORTPATH) ? mutt_basename(tmp->path) : tmp->path + maildir_is_prefix*(strlen(Maildir) + ((Maildir[strlen(Maildir) - 1] == '/' || Maildir[strlen(Maildir) - 1] == '}') ? 0 : 1));
 + 		if ( maildir_is_prefix && option(OPTSIDEBARFOLDERINDENT) ) {
 + 			char *tmp_folder_name;
 + 			int i;
diff --git a/mutt.spec b/mutt.spec
index 4312a58..49fe156 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -29,7 +29,7 @@ Summary(tr.UTF-8):	Mutt elektronik posta programı
 Summary(uk.UTF-8):	Поштова клієнтська програма Mutt
 Name:		mutt
 Version:	1.5.24
-Release:	1
+Release:	2
 Epoch:		6
 License:	GPL v2+
 Group:		Applications/Mail