- bugfix

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index c5a9e4f0e4c0b1cdd95ae835af559c5048d45844..5855b58f9157c741da7d1d31780f2f39a4fe6c82 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,8 +1,13 @@
 #
+# TODO:
+# - rework -cd.signatures_menu.patch 
+# - finish -folder_columns.patch
+#
 # Conditional build:
 %bcond_with    slang           # use slang library instead of ncurses
 %bcond_with    nntp            # use VVV's NNTP patch
 %bcond_with    folder_column   # build with folder_column patch
+%bcond_with    imap_recent     # show IMAP RECENT messages as new (instead of UNSEEN)
 %bcond_without sasl            # don't use sasl
 %bcond_without home_etc        # don't use home_etc
 #
@@ -17,13 +22,13 @@ Summary(ru.UTF-8):  Почтовая клиентская программа Mutt
 Summary(tr.UTF-8):     Mutt elektronik posta programı
 Summary(uk.UTF-8):     Поштова клієнтська програма Mutt
 Name:          mutt
-Version:       1.5.16
-Release:       1
+Version:       1.5.19
+Release:       0.1
 Epoch:         6
-License:       GPL
+License:       GPL v2+
 Group:         Applications/Mail
 Source0:       ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz
-# Source0-md5: 10eff7024dbb7ce1f773d688a69ea9db
+# Source0-md5: 73b3747bc7f7c805921e8d24ebac693f
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl
@@ -54,6 +59,8 @@ Patch18:      %{name}-Muttrc.patch
 Patch19:       %{name}-muttbug-tmp.patch
 Patch20:       %{name}-folder_columns.patch
 Patch21:       %{name}-nr.tag_prefix_cond.patch
+Patch22:       %{name}-imap_mxcmp.patch
+Patch23:       %{name}-imap_recent.patch
 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -71,8 +78,8 @@ BuildRequires:        openssl-devel >= 0.9.7d
 %{?with_slang:BuildRequires:   slang-devel}
 BuildRequires: libxslt-progs
 Requires:      iconv
-Requires:      mailcap
 %{?with_home_etc:Requires:     home-etc >= 1.0.8}
+Suggests:      mailcap
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                specflags_ia32   -fomit-frame-pointer 
@@ -144,7 +151,8 @@ Mutt - це невеликий, але потужний повноекранни
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
+# XXX: needs update (searchBuf was removed from MUTTMENU struct in 1.5.19)
+#%%patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
@@ -160,6 +168,8 @@ Mutt - це невеликий, але потужний повноекранни
 %{?with_folder_column:%patch20 -p1}
 # disabled - changes default behaviour
 #%patch21 -p0
+%patch22 -p1
+%{?with_imap_recent:%patch23 -p1}
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}
@@ -190,12 +200,12 @@ rm -f doc/{manual*.html,manual.txt}
        --with-mailpath=/var/mail \
        --with-mixmaster \
        --with-regex \
-       %{?with_sasl:--with-sasl2} \
+       %{?with_sasl:--with-sasl} \
        %{?with_slang:--with-slang} \
        --with-ssl
 
+%{__make} -j1 -C doc
 %{__make}
-%{__make} manual.txt -C doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -205,7 +215,7 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1}
        DESTDIR=$RPM_BUILD_ROOT \
        DOTLOCK_GROUP=
 
-%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH12}
+%{__patch} -p2 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH12}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}