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

diff --git a/mutt.spec b/mutt.spec
index 05edcfd..24361f5 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,5 +1,6 @@
 #
 # TODO:
+# - gss/heimdal
 # - finish -folder_columns.patch
 #
 # Conditional build:
@@ -9,7 +10,13 @@
 %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
+%bcond_with	gdbm		# use GDBM instead of BerkeleyDB
+%bcond_with	qdbm		# use QDBM instead of BerkeleyDB
+%bcond_with	tokyocabinet	# use TokyoCabinet instead of BerkeleyDB
 #
+%if %{without gdbm} && %{without qdbm} && %{without tokyocabinet}
+%define	with_bdb	1
+%endif
 Summary:	The Mutt Mail User Agent
 Summary(de.UTF-8):	Der Mutt Mail-User-Agent
 Summary(es.UTF-8):	Mutt, cliente de correo electrónico
@@ -21,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.19
+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:	73b3747bc7f7c805921e8d24ebac693f
+# 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
@@ -44,44 +51,49 @@ 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}-xface.patch
-Patch13:	%{name}-Muttrc_mbox_path.patch
-Patch14:	%{name}-po.patch
+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/
-Patch15:	%{name}-vvv.nntp.patch
-Patch16:	%{name}-home_etc.patch
-Patch17:	%{name}-Muttrc.patch
-Patch18:	%{name}-muttbug-tmp.patch
-Patch19:	%{name}-folder_columns.patch
-Patch20:	%{name}-imap_mxcmp.patch
-Patch21:	%{name}-imap_recent.patch
-Patch22:	%{name}-Muttrc.head.patch
-Patch23:	%{name}-smime.rc.patch
+Patch24:	%{name}-vvv.nntp.patch
+Patch25:	format-security.patch
+Patch26:	%{name}-keep_to.patch
 URL:		http://www.mutt.org/
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	autoconf >= 2.54
+BuildRequires:	automake >= 1.6
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.0}
-BuildRequires:	db-devel >= 4.0
+%{?with_bdb:BuildRequires:	db-devel >= 4.0}
 BuildRequires:	docbook-dtd42-xml
 BuildRequires:	docbook-style-xsl
+%{?with_gdbm:BuildRequires:	gdbm-devel}
+BuildRequires:	gettext-tools
+BuildRequires:	gpgme-devel >= 1:1.1.1
 %{?with_home_etc:BuildRequires:	home-etc-devel >= 1.0.8}
-BuildRequires:	gettext-devel
-BuildRequires:	gpgme-devel >= 1:1.1.0
 BuildRequires:	libidn-devel
+BuildRequires:	libxslt-progs
 BuildRequires:	lynx
 %{!?with_slang:BuildRequires:	ncurses-devel >= 5.0}
 BuildRequires:	openssl-devel >= 0.9.7d
+%{?with_qdbm:BuildRequires:	qdbm-devel}
 %{?with_slang:BuildRequires:	slang-devel}
-BuildRequires:	libxslt-progs
+%{?with_tokyocabinet:BuildRequires:	tokyocabinet-devel}
+%{?with_home_etc:Requires:	home-etc-lib >= 1.0.8}
 Requires:	iconv
-%{?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 
+%define		specflags_ia32	-fomit-frame-pointer
 
 %description
 Mutt is a small but very poweful full-screen Unix mail client.
@@ -105,11 +117,9 @@ POP, des fils de discussion, des touches liées et d'un mode de tri sur
 les fils.
 
 %description -l ko.UTF-8
-Mutt는 작지만 매우 강력한 텍스트 기반의 메일 클라이언트이다. Mutt는
-많은 설정이 가능하다. 그리고, 키바인딩, 키보드 메크로, 메일 스레딩과
-같은 진보된 형태와 정규표현식 검색, 메일에서 선택된 그룹의 내용에서
-강력하게 일정한 패턴을 찾아내는 것을 지원함으로써 메일의 파워 유저에게
-가장 적합하다.
+Mutt는 작지만 매우 강력한 텍스트 기반의 메일 클라이언트이다. Mutt는 많은 설정이 가능하다. 그리고, 키바인딩, 키보드
+메크로, 메일 스레딩과 같은 진보된 형태와 정규표현식 검색, 메일에서 선택된 그룹의 내용에서 강력하게 일정한 패턴을 찾아내는
+것을 지원함으로써 메일의 파워 유저에게 가장 적합하다.
 
 %description -l pl.UTF-8
 Mutt jest niewielkim programem pocztowym dla terminali tekstowych,
@@ -143,7 +153,6 @@ Mutt - це невеликий, але потужний повноекранни
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -156,20 +165,23 @@ Mutt - це невеликий, але потужний повноекранни
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
-%{?with_nntp:%patch15 -p1}
-%{?with_home_etc:%patch16 -p1}
-%patch17 -p1
-%patch18 -p1
+%{?with_home_etc:%patch14 -p1}
+%patch15 -p1
+%patch16 -p1
 # breaks display if arrow_cursor is set
-%{?with_folder_column:%patch19 -p1}
+%{?with_folder_column:%patch17 -p1}
+%{?with_imap_recent:%patch18 -p1}
+%patch19 -p1
 %patch20 -p1
-%{?with_imap_recent:%patch21 -p1}
+%patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%{?with_nntp:%patch24 -p1}
+%patch25 -p1
+%patch26 -p1
 
 # force regeneration (manual.sgml is modified by some patches)
-rm -f doc/{manual*.html,manual.txt}
+%{__rm} doc/{manual*.html,manual.txt}
 
 %build
 %{__aclocal} -I m4
@@ -190,17 +202,19 @@ rm -f doc/{manual*.html,manual.txt}
 	%{?with_nntp:--enable-nntp} \
 	--enable-pop \
 	--enable-smtp \
-	--with-bdb=/usr \
-	--without-gdbm \
+	%{?with_bdb:--with-bdb=/usr} \
 	%{!?with_slang:--with-curses} \
 	--with-docdir=%{_docdir}/%{name} \
+	%{?with_gdbm:--with-gdbm} \
 	%{?with_home_etc:--with-home-etc} \
 	--with-mailpath=/var/mail \
 	--with-mixmaster \
+	%{?with_qdbm:--with-qdbm} \
 	--with-regex \
 	%{?with_sasl:--with-sasl} \
 	%{?with_slang:--with-slang} \
-	--with-ssl
+	--with-ssl \
+	%{?with_tokyocabinet:--with-tokyocabinet}
 
 %{__make} -j1 -C doc
 %{__make}
@@ -214,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} < %{PATCH17}
+%{__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
@@ -224,21 +238,20 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
-cat <<EOF >$RPM_BUILD_ROOT%{_bindir}/mutt_source-muttrc.d
+cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/mutt_source-muttrc.d
 #!/bin/sh -e
-for rc in /etc/Muttrc.d/*.rc; do
-	test -r "$rc" && echo "source \"$rc\""
+for rc in %{_sysconfdir}/Muttrc.d/*.rc; do
+	[ ! -r "$rc" ] || echo "source \"$rc\""
 done
 EOF
 
 # keep manual.txt.gz, the rest is installed as %doc
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/[!m]*
-gzip -9nf $RPM_BUILD_ROOT%{_docdir}/%{name}/manual.txt
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}/[!m]*
 
 # conflict with qmail
-rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
-
-rm -f $RPM_BUILD_ROOT/etc/mime.types
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
+# belongs to mailcap
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
 
 %find_lang %{name}
 
@@ -249,8 +262,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL README.xface
 %dir %{_sysconfdir}/Muttrc.d
-%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
-%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc.d/*.rc
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/Muttrc
+%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/Muttrc.d/*.rc
 %attr(755,root,root) %{_bindir}/mutt
 %attr(755,root,root) %{_bindir}/mutt_source-muttrc.d
 %attr(755,root,root) %{_bindir}/flea
@@ -260,7 +273,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 
 %{_docdir}/%{name}
-%{_desktopdir}/*.desktop
+%{_desktopdir}/mutt.desktop
 %{_pixmapsdir}/mutt.png
-%{_mandir}/man*/*
-%lang(pl) %{_mandir}/pl/man*/*
+%{_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*
+%lang(pl) %{_mandir}/pl/man1/*