X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=blobdiff_plain;f=mutt.spec;h=785765f11c7b824f549b35898fb9813b4ea421a6;hp=fd068b18ad8ad14a2add33b6c138ee29cdb288a7;hb=2fff42543e270260f58ed49c3ea1359cd6accd12;hpb=f920ad6c158047cbddb5bfb680edf7566050d41b

diff --git a/mutt.spec b/mutt.spec
index fd068b1..b510029 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,83 +1,157 @@
+#
+# TODO:
+# - gss/heimdal
+# - finish -folder_columns.patch
+# - update/drop -home_etc.patch
+# - update/drop -imap_recent.patch
+#
+# Conditional build:
+%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
+%bcond_with	imap_recent	# show IMAP RECENT messages as new (instead of UNSEEN)
+%bcond_without	sasl		# don't use sasl
+%bcond_with	home_etc	# 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):	Der Mutt Mail-User-Agent
-Summary(es):	Mutt, cliente de correo electrónico
-Summary(fr):	Agent courrier Mutt
-Summary(pl):	Program pocztowy Mutt
-Summary(pt_BR):	Mutt, cliente de correio eletrônico
-Summary(es):	Mutt, cliente de correo electrónico
-Summary(tr):	Mutt elektronik posta programý
+Summary(de.UTF-8):	Der Mutt Mail-User-Agent
+Summary(es.UTF-8):	Mutt, cliente de correo electrónico
+Summary(fr.UTF-8):	Agent courrier Mutt
+Summary(ko.UTF-8):	텍스트 기반의 MUA
+Summary(pl.UTF-8):	Program pocztowy Mutt
+Summary(pt_BR.UTF-8):	Mutt, cliente de correio eletrônico
+Summary(ru.UTF-8):	Почтовая клиентская программа Mutt
+Summary(tr.UTF-8):	Mutt elektronik posta programı
+Summary(uk.UTF-8):	Поштова клієнтська програма Mutt
 Name:		mutt
-Version:	1.3.27i
-Release:	2
-Epoch:		5
-License:	GPL
+Version:	1.11.4
+Release:	1
+Epoch:		6
+License:	GPL v2+
 Group:		Applications/Mail
-Group(de):	Applikationen/Post
-Group(pl):	Aplikacje/Poczta
-Group(pt):	Aplicações/Correio Eletrônico
+# temporarily dead? (Jun 2014)
 Source0:	ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
+# Source0-md5:	e6b3e8e437b554beafdce0baa34d9adc
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
-Patch0:		%{name}-home_etc.patch
-Patch1:		%{name}-forcedotlock.patch
-Patch2:		%{name}-muttbug-tmp.patch
-Patch3:         %{name}-rr.compressed.patch.gz
-Patch4:         %{name}-cd.edit_threads.patch
-Patch5:         %{name}-bj.status-time.patch
-Patch6:         %{name}-devl.narrow_tree.patch
-Patch7:         %{name}-vvv.quote.gz
-
+Patch0:		%{name}-pl.po-update.patch
+Patch1:		%{name}-bj.status-time.patch
+# http://mutt.org.ua/download/
+Patch2:		%{name}-vvv.quote.patch
+Patch3:		%{name}-null_name.patch
+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
+# applied during %%install
+Patch50:	%{name}-Muttrc.patch
+# bcond-related patches
+Patch101:	%{name}-home_etc.patch
+# http://mutt.org.ua/download/
+Patch102:	%{name}-vvv.nntp.patch
+Patch103:	%{name}-folder_columns.patch
+Patch104:	%{name}-imap_recent.patch
 URL:		http://www.mutt.org/
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	ncurses-devel >= 5.0
-BuildRequires:	openssl-devel >= 0.9.6a
-%{!?_without_sasl:BuildRequires:	cyrus-sasl-devel}
+BuildRequires:	autoconf >= 2.54
+BuildRequires:	automake >= 1.6
+%{?with_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.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:	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}
+%{?with_tokyocabinet:BuildRequires:	tokyocabinet-devel}
+%{?with_home_etc:Requires:	home-etc-lib >= 1.0.8}
 Requires:	iconv
-Requires:	mailcap
-Requires:	smtpdaemon
+Suggests:	mailcap
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		specflags_ia32	-fomit-frame-pointer
+
 %description
 Mutt is a small but very poweful full-screen Unix mail client.
 Features include MIME support, color, POP3 support, message threading,
 bindable keys, and threaded sorting mode.
 
-%description -l de
-Mutt ist ein kleiner aber leistungsfähiger Vollbild-Mail-Client für
-Unix mit MIME-Unterstützung, Farbe, POP3-Unterstützung,
+%description -l de.UTF-8
+Mutt ist ein kleiner aber leistungsfähiger Vollbild-Mail-Client für
+Unix mit MIME-Unterstützung, Farbe, POP3-Unterstützung,
 Nachrichten-Threading, zuweisbaren Tasten und Sortieren nach Threads.
 
-%description -l es
-Mutt es un pequeño, pero muy potente cliente de correo en pantalla
+%description -l es.UTF-8
+Mutt es un pequeño, pero muy potente cliente de correo en pantalla
 llena. Incluye soporte a tipos MINE, color, POP3; encadenamiento de
 mensajes, teclas configurables y clasificaciones por encadenamiento.
 
-%description -l fr
-mutt est un client courrier Unix plein écran, petit mais très
+%description -l fr.UTF-8
+mutt est un client courrier Unix plein écran, petit mais très
 puissant. Il dispose de la gestion MIME, des couleurs, de la gestion
-POP, des fils de discussion, des touches liées et d'un mode de tri sur
+POP, des fils de discussion, des touches liées et d'un mode de tri sur
 les fils.
 
-%description -l pl
+%description -l ko.UTF-8
+Mutt는 작지만 매우 강력한 텍스트 기반의 메일 클라이언트이다. Mutt는 많은 설정이 가능하다. 그리고, 키바인딩, 키보드
+메크로, 메일 스레딩과 같은 진보된 형태와 정규표현식 검색, 메일에서 선택된 그룹의 내용에서 강력하게 일정한 패턴을 찾아내는
+것을 지원함으로써 메일의 파워 유저에게 가장 적합하다.
+
+%description -l pl.UTF-8
 Mutt jest niewielkim programem pocztowym dla terminali tekstowych,
-posiadaj±cym du¿e mo¿liwo¶ci. Obs³uguje MIME, POP3, cztery formaty
-skrzynek pocztowych, kolory, w±tki, ocenê wa¿no¶ci listów (scoring)
+posiadającym duże możliwości. Obsługuje MIME, POP3, cztery formaty
+skrzynek pocztowych, kolory, wątki, ocenę ważności listów (scoring)
 oraz skompresowane foldery.
 
-%description -l pt_BR
-O Mutt é um pequeno mas muito poderoso cliente de correio em tela
+%description -l pt_BR.UTF-8
+O Mutt é um pequeno mas muito poderoso cliente de correio em tela
 cheia. Inclui suporte a tipos MIME, cor, POP3, encadeamento de
-mensagens, teclas configuráveis e classificação por encadeamento.
+mensagens, teclas configuráveis e classificação por encadeamento.
+
+%description -l ru.UTF-8
+Mutt - это небольшой, но мощный полноэкранный почтовый клиент.
+Включает поддержку MIME, цвет, поддержку POP3 и IMAP, группировку
+сообщений по цепочкам, переопределяемые клавиши, поддержку pgp/gpg и
+сортировку сообщений в цепочках. Включает также (пока что
+экспериментальную) поддержку NNTP.
 
-%description -l tr
-Mutt, küçük ama çok güçlü bir tam-ekran Unix mektup istemcisidir. MIME
-desteði, renk ve POP3 desteði içerir.
+%description -l tr.UTF-8
+Mutt, küçük ama çok güçlü bir tam-ekran Unix mektup istemcisidir. MIME
+desteği, renk ve POP3 desteği içerir.
+
+%description -l uk.UTF-8
+Mutt - це невеликий, але потужний повноекранний поштовий клієнт.
+Містить підтримку MIME, колір, підтримку POP3 та IMAP, групування
+повідомлень по ланцюжкам, перевизначення клавіш, підтримку pgp/gpg та
+сортування повідомлень у ланцюжках. Містить також (поки що
+експериментальну) підтримку NNTP.
 
 %prep
-%setup -q -n %{name}-%(echo %{version} | sed 's/i$//')
-%patch0 -p1
+%setup -q
+# pl.poupdate
+#%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -85,72 +159,129 @@ deste
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%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}
+
+# force regeneration (manual.sgml is modified by some patches)
+%{__rm} doc/{manual*.html,manual.txt}
 
 %build
-autoconf
-#PGP=%{_bindir}/pgp PGPK=%{_bindir}/pgpk
-CFLAGS="%{optflags} -I%{_includedir}/slang" \
-./configure \
-	--enable-pop \
-	--enable-imap \
-	--enable-mailtool \
-	--enable-external-dotlock \
-	--enable-compressed \
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	mutt_cv_groupwrite=yes \
+	mutt_cv_worldwrite=no \
 	%{!?debug:--disable-debug} %{?debug:--enable-debug} \
 	--disable-warnings \
-	--with-curses \
-	--with-iconv \
+	--enable-compressed \
+	--enable-external-dotlock \
+	--enable-gpgme \
+	--enable-hcache \
+	--enable-imap \
+	--enable-mailtool \
+	%{?with_nntp:--enable-nntp} \
+	--enable-pop \
+	--enable-sidebar \
+	--enable-smtp \
+	%{?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 \
-	%{!?_without_sasl:--with-sasl} %{?_without_sasl:--without-sasl} \
-	--without-included-nls \
-	--with-homespool=Maildir \
-	--with-mixmaster \
-	--with-mailpath=/var/mail \
-	--with-sharedir=%{_datadir} \
-	--with-docdir=%{_docdir}/%{name}-%{version} \
-	--prefix=%{_prefix} \
-	--bindir=%{_bindir} \
-	--sysconfdir=%{_sysconfdir} \
-	--datadir=%{_datadir} \
-	--mandir=%{_mandir} 
+	%{?with_tokyocabinet:--with-tokyocabinet}
 
+%{__make} -j1 -C doc
 %{__make}
-%{__make} manual.txt -C doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/Mail,%{_pixmapsdir}} \
-	$RPM_BUILD_ROOT%{_mandir}/pl/man1
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_mandir}/pl/man1} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
+
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	DOTLOCK_GROUP=
+
+%{__patch} -p2 -d $RPM_BUILD_ROOT%{_sysconfdir} < %{PATCH50}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+install contrib/gpg.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
+install contrib/smime.rc $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d
+install contrib/colors.linux $RPM_BUILD_ROOT%{_sysconfdir}/Muttrc.d/colors.rc
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
-gzip -9nf contrib/{*rc*,*cap*} \
-	ChangeLog README TODO NEWS README.SECURITY README.SSL 
+cat <<'EOF' >$RPM_BUILD_ROOT%{_bindir}/mutt_source-muttrc.d
+#!/bin/sh -e
+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} -r $RPM_BUILD_ROOT%{_docdir}/%{name}/[!m]*
 
 # conflict with qmail
-rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
+# belongs to mailcap
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/mime.types
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun	-p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc *.gz contrib/{*rc*,*cap*} doc/manual*html doc/manual.txt
-%config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
+%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL
+%dir %{_sysconfdir}/Muttrc.d
+%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_pgpring
+%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}/smime_keys
 %attr(2755,root,mail) %{_bindir}/mutt_dotlock
 
-%{_applnkdir}/Network/Mail/mutt.desktop
+%{_docdir}/%{name}
+%{_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/*
+%{_infodir}/mutt.info*