X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt.spec;h=bcd81196a76acf7ca00fe01fc223b10f1baf5b97;hp=bc65b74065e2f13cfafe009768265c233c949f8a;hb=c9b5359c6c0dff8b249320902012da18ca7f1720;hpb=458d46c4b1d4acaf2d44573a39864e8a89f8ac1f

diff --git a/mutt.spec b/mutt.spec
index bc65b74..bcd8119 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -6,6 +6,7 @@
 # - update/drop -imap_recent.patch
 #
 # Conditional build:
+%bcond_without	autocrypt	# disable autocrypt support
 %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
@@ -30,14 +31,13 @@ Summary(ru.UTF-8):	Почтовая клиентская программа Mutt
 Summary(tr.UTF-8):	Mutt elektronik posta programı
 Summary(uk.UTF-8):	Поштова клієнтська програма Mutt
 Name:		mutt
-Version:	1.12.0
+Version:	2.0.7
 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:	2a6491745de2f76631aa06a6f2b46a7b
+# Source0-md5:	ba33c54a11ccd409aacb16039d36ddd2
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
@@ -50,15 +50,14 @@ Patch4:		%{name}-cd.signatures_menu.patch
 # http://www.mutt.ca/patches/ (dw.crypt-autoselectkey)
 Patch5:		%{name}-crypt-autoselectkey.patch
 Patch6:		%{name}-manual.patch
-Patch7:		%{name}-xface.patch
-Patch8:		%{name}-Muttrc_mbox_path.patch
-Patch9:		%{name}-po.patch
-Patch10:	%{name}-Muttrc.head.patch
-Patch11:	%{name}-smime.rc.patch
-Patch12:	%{name}-db.patch
-Patch13:	format-security.patch
-Patch14:	%{name}-keep_to.patch
-Patch15:	%{name}-vvv.initials.patch
+Patch7:		%{name}-Muttrc_mbox_path.patch
+Patch8:		%{name}-po.patch
+Patch9:	%{name}-Muttrc.head.patch
+Patch10:	%{name}-smime.rc.patch
+Patch11:	%{name}-db.patch
+Patch12:	format-security.patch
+Patch13:	%{name}-keep_to.patch
+Patch14:	%{name}-vvv.initials.patch
 # applied during %%install
 Patch50:	%{name}-Muttrc.patch
 # bcond-related patches
@@ -76,8 +75,10 @@ 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_autocrypt:BuildRequires: gpgme-devel >= 1:1.8.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
@@ -85,9 +86,12 @@ BuildRequires:	lynx
 BuildRequires:	openssl-devel >= 0.9.7d
 %{?with_qdbm:BuildRequires:	qdbm-devel}
 %{?with_slang:BuildRequires:	slang-devel}
+%{?with_autocrypt:BuildRequires:	sqlite3-devel >= 3.20}
 %{?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)
 
@@ -166,16 +170,15 @@ Mutt - це невеликий, але потужний повноекранни
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
 
 %{?with_home_etc:%patch101 -p1}
 %{?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}
+%{__rm} doc/manual*.html
 
 %build
 %{__aclocal} -I m4
@@ -197,6 +200,7 @@ Mutt - це невеликий, але потужний повноекранни
 	--enable-pop \
 	--enable-sidebar \
 	--enable-smtp \
+	%{?with_autocrypt:--with-sqlite3 --enable-autocrypt} \
 	%{?with_bdb:--with-bdb=/usr} \
 	%{!?with_slang:--with-curses} \
 	--with-docdir=%{_docdir}/%{name} \
@@ -247,6 +251,10 @@ EOF
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
 # belongs to mailcap
 %{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
+# don't litter
+%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.dist
+%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.orig
+%{__rm} -r $RPM_BUILD_ROOT%{_sysconfdir}/mime.types.dist
 
 %find_lang %{name}
 
@@ -270,16 +278,15 @@ 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
 
 %{_docdir}/%{name}
 %{_desktopdir}/mutt.desktop
 %{_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*