X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt.spec;h=02d3b8372d0679b435051b6ad7584dce11578b7b;hp=95d1f9edd2933f45bcf4cab05c165d9ac06b1c47;hb=a4c53a57c7dda9a529061fc21eeae6f6594065df;hpb=030bcf48efda8a3354a0afcb10abb9cb21a35405

diff --git a/mutt.spec b/mutt.spec
index 95d1f9e..02d3b83 100644
--- 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	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,38 +18,45 @@ 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.18
 Release:	1
 Epoch:		6
-License:	GPL
+License:	GPL v2+
 Group:		Applications/Mail
 Source0:	ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz
-# Source0-md5:	b2c1eb45fd958f6589ee52a98f2a3ce1
+# Source0-md5:	27c30037120189b9f9c0d3e76361b8f8
 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}-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
@@ -58,7 +66,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}
@@ -66,8 +74,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 
@@ -155,6 +163,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}
@@ -177,6 +187,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} \
@@ -188,8 +199,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
@@ -199,7 +210,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}