X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt.spec;h=2fc8114412a97bccd524aff29436380908b94a6e;hp=b579012444d59a994f23133583af17ee606a8a55;hb=bbfc6a66fad03b13df86f8b1de4a2ec6ebe0e5fa;hpb=e95cd2d91bdbaeee48bb809859eae6b90aad7450

diff --git a/mutt.spec b/mutt.spec
index b579012..2fc8114 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -3,7 +3,6 @@
 # - gss/heimdal
 # - finish -folder_columns.patch
 # - update/drop -home_etc.patch
-# - update/drop -nntp.patch
 # - update/drop -imap_recent.patch
 #
 # Conditional build:
@@ -31,14 +30,13 @@ Summary(ru.UTF-8):	Почтовая клиентская программа Mutt
 Summary(tr.UTF-8):	Mutt elektronik posta programı
 Summary(uk.UTF-8):	Поштова клієнтська програма Mutt
 Name:		mutt
-Version:	1.11.1
+Version:	1.12.2
 Release:	1
 Epoch:		6
 License:	GPL v2+
 Group:		Applications/Mail
-# temporarily dead? (Jun 2014)
 Source0:	ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
-# Source0-md5:	92827071664e8c8bfadcc2a100e25715
+# Source0-md5:	abf850465e7793d91ce9d39a9de61816
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
@@ -77,8 +75,9 @@ BuildRequires:	docbook-dtd42-xml
 BuildRequires:	docbook-style-xsl
 %{?with_gdbm:BuildRequires:	gdbm-devel}
 BuildRequires:	gettext-tools
-BuildRequires:	gpgme-devel >= 1:1.1.1
+BuildRequires:	gpgme-devel >= 1:1.4.0
 %{?with_home_etc:BuildRequires:	home-etc-devel >= 1.0.8}
+BuildRequires:	libgpg-error-devel >= 1.33
 BuildRequires:	libidn-devel
 BuildRequires:	libxslt-progs
 BuildRequires:	lynx
@@ -87,8 +86,10 @@ BuildRequires:	openssl-devel >= 0.9.7d
 %{?with_qdbm:BuildRequires:	qdbm-devel}
 %{?with_slang:BuildRequires:	slang-devel}
 %{?with_tokyocabinet:BuildRequires:	tokyocabinet-devel}
+Requires:	gpgme >= 1:1.4.0
 %{?with_home_etc:Requires:	home-etc-lib >= 1.0.8}
 Requires:	iconv
+Requires:	libgpg-error >= 1.33
 Suggests:	mailcap
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -173,7 +174,7 @@ Mutt - це невеликий, але потужний повноекранни
 %{?with_nntp:%patch102 -p1}
 # breaks display if arrow_cursor is set
 %{?with_folder_column:%patch103 -p1}
-%{?with_imap_recent:%patch1043 -p1}
+%{?with_imap_recent:%patch104 -p1}
 
 # force regeneration (manual.sgml is modified by some patches)
 %{__rm} doc/{manual*.html,manual.txt}
@@ -271,7 +272,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/mutt_source-muttrc.d
 %attr(755,root,root) %{_bindir}/flea
 %attr(755,root,root) %{_bindir}/muttbug
-%attr(755,root,root) %{_bindir}/pgp*
+%attr(755,root,root) %{_bindir}/pgpewrap
 %attr(755,root,root) %{_bindir}/smime_keys
 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 
@@ -280,7 +281,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_pixmapsdir}/mutt.png
 #%{_mandir}/man1/flea.1*
 %{_mandir}/man1/mutt*.1*
-%{_mandir}/man1/pgp*.1*
+%{_mandir}/man1/pgpewrap.1*
 %{_mandir}/man1/smime_keys.1*
 %{_mandir}/man5/mmdf.5*
 %{_mandir}/man5/muttrc.5*