- do not apply mutt-folder_column.patch by default. It looks like this patch

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index 147eb7ec7c6058e5c698a1205f4e159e6ab606e0..d4fadc2a3776d724c68f3705b8261ae337bb1fb8 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -3,6 +3,7 @@
 %bcond_with    slang           # use slang library instead of ncurses
 %bcond_with    nntp            # use VVV's NNTP patch
 %bcond_with    esmtp           # use esmtp patch
+%bcond_with    folder_column   # build with folder_column patch
 %bcond_without sasl            # don't use sasl
 %bcond_without home_etc        # don't use home_etc
 #
@@ -18,7 +19,7 @@ Summary(tr):  Mutt elektronik posta program
 Summary(uk):   ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:          mutt
 Version:       1.4.2.1
-Release:       6
+Release:       8.1
 Epoch:         6
 License:       GPL
 Group:         Applications/Mail
@@ -50,6 +51,7 @@ Patch20:      %{name}-esmtp.patch
 Patch21:       %{name}-home_etc.patch
 Patch22:       %{name}-kill_warnings.patch
 Patch23:       %{name}-Muttrc_mbox_path.patch
+Patch24:       %{name}-po.patch
 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -139,7 +141,8 @@ Mutt - 
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
+# breaks display if arrow_cursor is set
+%{?with_folder_column:%patch12 -p1}
 # disabled - changes default behaviour
 ##%patch13 -p0
 %patch14 -p1
@@ -152,6 +155,7 @@ Mutt - 
 %{?with_home_etc:%patch21 -p1}
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}