X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt.spec;h=24361f59b7bb6c11456c0c87061b84a174e67762;hp=f71960ac9be279edcf70de00885f3523864d4b20;hb=7185394e73923327cb2d342a1a0cd51d594a5087;hpb=3982bc1f8c81379b5106c0bf2d6d027689a88015

diff --git a/mutt.spec b/mutt.spec
index f71960a..24361f5 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -28,18 +28,18 @@ Summary(ru.UTF-8):	Почтовая клиентская программа Mutt
 Summary(tr.UTF-8):	Mutt elektronik posta programı
 Summary(uk.UTF-8):	Поштова клієнтська програма Mutt
 Name:		mutt
-Version:	1.5.21
-Release:	9
+Version:	1.6.0
+Release:	1
 Epoch:		6
 License:	GPL v2+
 Group:		Applications/Mail
-Source0:	ftp://ftp.mutt.org/mutt/devel/%{name}-%{version}.tar.gz
-# Source0-md5:	a29db8f1d51e2f10c070bf88e8a553fd
+# temporarily dead? (Jun 2014)
+Source0:	ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
+# Source0-md5:	d05bb821d7040c61ba89b22d7c2bd388
 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
@@ -55,18 +55,20 @@ Patch10:	%{name}-manual.patch
 Patch11:	%{name}-xface.patch
 Patch12:	%{name}-Muttrc_mbox_path.patch
 Patch13:	%{name}-po.patch
+Patch14:	%{name}-home_etc.patch
+Patch15:	%{name}-Muttrc.patch
+Patch16:	%{name}-muttbug-tmp.patch
+Patch17:	%{name}-folder_columns.patch
+Patch18:	%{name}-imap_recent.patch
+Patch19:	%{name}-Muttrc.head.patch
+Patch20:	%{name}-smime.rc.patch
+Patch21:	%{name}-sidebar.patch
+Patch22:	%{name}-imap_fast_trash.patch
+Patch23:	%{name}-db.patch
 # http://mutt.org.ua/download/
-Patch14:	%{name}-vvv.nntp.patch
-Patch15:	%{name}-home_etc.patch
-Patch16:	%{name}-Muttrc.patch
-Patch17:	%{name}-muttbug-tmp.patch
-Patch18:	%{name}-folder_columns.patch
-Patch19:	%{name}-imap_recent.patch
-Patch20:	%{name}-Muttrc.head.patch
-Patch21:	%{name}-smime.rc.patch
-Patch22:	%{name}-sidebar.patch
-Patch23:	%{name}-imap_fast_trash.patch
-Patch24:	%{name}-db.patch
+Patch24:	%{name}-vvv.nntp.patch
+Patch25:	format-security.patch
+Patch26:	%{name}-keep_to.patch
 URL:		http://www.mutt.org/
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1.6
@@ -75,7 +77,7 @@ BuildRequires:	automake >= 1.6
 BuildRequires:	docbook-dtd42-xml
 BuildRequires:	docbook-style-xsl
 %{?with_gdbm:BuildRequires:	gdbm-devel}
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
 BuildRequires:	gpgme-devel >= 1:1.1.1
 %{?with_home_etc:BuildRequires:	home-etc-devel >= 1.0.8}
 BuildRequires:	libidn-devel
@@ -86,9 +88,9 @@ BuildRequires:	openssl-devel >= 0.9.7d
 %{?with_qdbm:BuildRequires:	qdbm-devel}
 %{?with_slang:BuildRequires:	slang-devel}
 %{?with_tokyocabinet:BuildRequires:	tokyocabinet-devel}
+%{?with_home_etc:Requires:	home-etc-lib >= 1.0.8}
 Requires:	iconv
 Suggests:	mailcap
-%{?with_home_etc:Conflicts:	home-etc < 1.0.8}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags_ia32	-fomit-frame-pointer
@@ -151,7 +153,6 @@ Mutt - це невеликий, але потужний повноекранни
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -164,18 +165,20 @@ Mutt - це невеликий, але потужний повноекранни
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%{?with_nntp:%patch14 -p1}
-%{?with_home_etc:%patch15 -p1}
+%{?with_home_etc:%patch14 -p1}
+%patch15 -p1
 %patch16 -p1
-%patch17 -p1
 # breaks display if arrow_cursor is set
-%{?with_folder_column:%patch18 -p1}
-%{?with_imap_recent:%patch19 -p1}
+%{?with_folder_column:%patch17 -p1}
+%{?with_imap_recent:%patch18 -p1}
+%patch19 -p1
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
-%patch24 -p1
+%{?with_nntp:%patch24 -p1}
+%patch25 -p1
+%patch26 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
 %{__rm} doc/{manual*.html,manual.txt}
@@ -225,7 +228,7 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1} \
 	DESTDIR=$RPM_BUILD_ROOT \
 	DOTLOCK_GROUP=
 
-%{__patch} -p2 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH16}
+%{__patch} -p2 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH15}
 
 install contrib/gpg.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
 install contrib/smime.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
@@ -274,6 +277,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man1/flea.1*
 %{_mandir}/man1/mutt*.1*
+%{_mandir}/man1/pgp*.1*
 %{_mandir}/man1/smime_keys.1*
 %{_mandir}/man5/mmdf.5*
 %{_mandir}/man5/muttrc.5*