- updated to 1.5.17

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index aaf32abd2c3f94733657a8c99532914789aa18c8..11986057cbc11b8efaec5a21cb956ed8ffb40b68 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -17,37 +17,43 @@ Summary(ru.UTF-8):  Почтовая клиентская программа Mutt
 Summary(tr.UTF-8):     Mutt elektronik posta programı
 Summary(uk.UTF-8):     Поштова клієнтська програма Mutt
 Name:          mutt
-Version:       1.5.15
+Version:       1.5.17
 Release:       1
 Epoch:         6
 License:       GPL
 Group:         Applications/Mail
 Source0:       ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz
-# Source0-md5: b2c1eb45fd958f6589ee52a98f2a3ce1
+# Source0-md5: 49387458be0cb52b85ae0d73af699aae
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl
 Patch0:                %{name}-pl.po-update.patch
 Patch1:                %{name}-forcedotlock.patch
+# http://mutt.org.ua/download/
 Patch2:                %{name}-rr.compressed.patch
 Patch3:                %{name}-bj.status-time.patch
+# http://mutt.org.ua/download/
 Patch4:                %{name}-vvv.quote.patch
 Patch5:                %{name}-null_name.patch
 Patch6:                %{name}-cd.trash_folder.patch
 Patch7:                %{name}-cd.purge_message.patch
 Patch8:                %{name}-cd.signatures_menu.patch
+# http://www.mutt.ca/patches/ (dw.crypt-autoselectkey)
 Patch9:                %{name}-crypt-autoselectkey.patch
+# http://www.mutt.ca/patches/ (dw.crypt-hook-both)
 Patch10:       %{name}-pgp_hook.patch
 Patch11:       %{name}-manual.patch
 Patch12:       %{name}-send_charset.patch
 Patch13:       %{name}-xface.patch
 Patch14:       %{name}-Muttrc_mbox_path.patch
 Patch15:       %{name}-po.patch
+# http://mutt.org.ua/download/
 Patch16:       %{name}-vvv.nntp.patch
 Patch17:       %{name}-home_etc.patch
 Patch18:       %{name}-Muttrc.patch
-Patch19:       %{name}-folder_columns.patch
-Patch20:       %{name}-nr.tag_prefix_cond.patch
+Patch19:       %{name}-muttbug-tmp.patch
+Patch20:       %{name}-folder_columns.patch
+Patch21:       %{name}-nr.tag_prefix_cond.patch
 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -57,7 +63,7 @@ BuildRequires:        docbook-dtd42-xml
 BuildRequires: docbook-style-xsl
 %{?with_home_etc:BuildRequires:        home-etc-devel >= 1.0.8}
 BuildRequires: gettext-devel
-BuildRequires: gpgme-devel >= 1:1.0.0
+BuildRequires: gpgme-devel >= 1:1.1.0
 BuildRequires: libidn-devel
 BuildRequires: lynx
 %{!?with_slang:BuildRequires:  ncurses-devel >= 5.0}
@@ -149,10 +155,11 @@ Mutt - це невеликий, але потужний повноекранни
 %{?with_nntp:%patch16 -p1}
 %{?with_home_etc:%patch17 -p1}
 %patch18 -p1
+%patch19 -p1
 # breaks display if arrow_cursor is set
-%{?with_folder_column:%patch19 -p1}
+%{?with_folder_column:%patch20 -p1}
 # disabled - changes default behaviour
-#%patch20 -p0
+#%patch21 -p0
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}
@@ -175,6 +182,7 @@ rm -f doc/{manual*.html,manual.txt}
        --enable-mailtool \
        %{?with_nntp:--enable-nntp} \
        --enable-pop \
+       --enable-smtp \
        --with-bdb=/usr --without-gdbm \
        %{!?with_slang:--with-curses} \
        --with-docdir=%{_docdir}/%{name} \
@@ -186,8 +194,8 @@ rm -f doc/{manual*.html,manual.txt}
        %{?with_slang:--with-slang} \
        --with-ssl
 
+%{__make} -j1 -C doc
 %{__make}
-%{__make} manual.txt -C doc
 
 %install
 rm -rf $RPM_BUILD_ROOT