X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt.spec;h=5855b58f9157c741da7d1d31780f2f39a4fe6c82;hp=721bdb1c40b0f402a57f4f2fb721d71e3f8f326f;hb=0bff4809756d58a60e538caaef58061643c3683b;hpb=c6d2e4359ebe4853b73e0357f8ceaa551e791a66

diff --git a/mutt.spec b/mutt.spec
index 721bdb1..5855b58 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,4 +1,8 @@
 #
+# 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
@@ -18,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.17
-Release:	2
+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:	49387458be0cb52b85ae0d73af699aae
+# Source0-md5:	73b3747bc7f7c805921e8d24ebac693f
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
@@ -74,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 
@@ -147,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
@@ -195,7 +200,7 @@ 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
 
@@ -210,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}