X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mutt.spec;h=da447254f3d8d584fc6b9c90cde31bb0d10ede19;hb=7b2b39b8d5ea2a946ff4bda102a5f5417f53912c;hp=b489235a68c706fa3e4f0553eece2886596abd81;hpb=c3d00275013a5289c74942def6e42fa3f8630cd5;p=packages%2Fmutt.git

diff --git a/mutt.spec b/mutt.spec
index b489235..da44725 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,34 +1,70 @@
+#
+# Conditional build:
+# _with_slang	- use slang library instead of ncurses
+# _with_nntp	- use VVV's NNTP patch
+# _with_esmtp   - use esmtp patch
+# _without_sasl - don't use sasl
+#
 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(ko):	ÅؽºÆ® ±â¹ÝÀÇ MUA
 Summary(pl):	Program pocztowy Mutt
+Summary(pt_BR):	Mutt, cliente de correio eletrônico
+Summary(ru):	ðÏÞÔÏ×ÁÑ ËÌÉÅÎÔÓËÁÑ ÐÒÏÇÒÁÍÍÁ Mutt
 Summary(tr):	Mutt elektronik posta programý
+Summary(uk):	ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:		mutt
-Version:	1.3.23i
-Release:	1
-Epoch:		4
+Version:	1.4.1
+Release:	3
+Epoch:		5
 License:	GPL
 Group:		Applications/Mail
-Group(de):	Applikationen/Post
-Group(pl):	Aplikacje/Poczta
-Group(pt):	Aplicações/Correio Eletrônico
-Source0:	ftp://ftp.mutt.org/pub/mutt/devel/%{name}-%{version}.tar.gz
+Source0:	ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz
+# Source0-md5: fb5418135c5be2638964eef2f654f847
 Source1:	%{name}.desktop
 Source2:	%{name}.png
-Patch0:		%{name}-forcedotlock.patch
-Patch1:		%{name}-home_etc.patch
+Source3:	%{name}.1.pl
+Source4:    %{name}-esmtp.rc
+Patch0:		%{name}-home_etc.patch
+Patch1:		%{name}-forcedotlock.patch
 Patch2:		%{name}-muttbug-tmp.patch
+Patch3:		%{name}-rr.compressed.patch
+Patch4:		%{name}-cd.edit_threads.patch
+Patch5:		%{name}-bj.status-time.patch
+Patch6:		%{name}-devl.narrow_tree.patch
+Patch7:		%{name}-vvv.quote.gz
+Patch8:		%{name}-null_name.patch
+Patch9:		%{name}-cd.trash_folder.patch
+Patch10:	%{name}-cd.purge_message.patch
+Patch11:	%{name}-cd.signatures_menu.patch
+Patch12:	%{name}-folder_columns.patch
+Patch13:	%{name}-nr.tag_prefix_cond.patch
+Patch14:	%{name}-LIBOBJ.patch
+Patch15:	%{name}-pgp_hook.patch
+Patch16:	%{name}-manual.patch
+Patch17:	%{name}-send_charset.patch
+Patch18:	%{name}-xface.patch
+Patch19:	%{name}-sasl2.patch
+Patch20:	%{name}-nntp.patch
+Patch21:    %{name}-esmtp.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}
+%{!?_without_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.0}
+BuildRequires:	gettext-devel
+%{!?_with_slang:BuildRequires:		ncurses-devel >= 5.0}
+BuildRequires:	openssl-devel >= 0.9.7
+BuildRequires:	sgml-tools
+BuildRequires:	sgml-tools-dtd
+%{?_with_slang:BuildRequires:		slang-devel}
+%{?_with_esmtp:BuildRequires:       libesmtp-devel}
 Requires:	iconv
 Requires:	mailcap
-Requires:	smtpdaemon
 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.
@@ -40,74 +76,132 @@ Mutt ist ein kleiner aber leistungsf
 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
+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
 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
 les fils.
 
+%description -l ko
+Mutt´Â ÀÛÁö¸¸ ¸Å¿ì °­·ÂÇÑ ÅؽºÆ® ±â¹ÝÀÇ ¸ÞÀÏ Å¬¶óÀ̾ðÆ®ÀÌ´Ù. Mutt´Â
+¸¹Àº ¼³Á¤ÀÌ °¡´ÉÇÏ´Ù. ±×¸®°í, Å°¹ÙÀεù, Å°º¸µå ¸ÞÅ©·Î, ¸ÞÀÏ ½º·¹µù°ú
+°°Àº Áøº¸µÈ ÇüÅÂ¿Í Á¤±ÔÇ¥Çö½Ä °Ë»ö, ¸ÞÀÏ¿¡¼­ ¼±ÅÃµÈ ±×·ìÀÇ ³»¿ë¿¡¼­
+°­·ÂÇÏ°Ô ÀÏÁ¤ÇÑ ÆÐÅÏÀ» ã¾Æ³»´Â °ÍÀ» Áö¿øÇÔÀ¸·Î½á ¸ÞÀÏÀÇ ÆÄ¿ö À¯Àú¿¡°Ô
+°¡Àå ÀûÇÕÇÏ´Ù.
+
 %description -l pl
-Mutt jest niewielkim programem pocztowym dla terminali tekstowych
+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)
 oraz skompresowane foldery.
 
+%description -l pt_BR
+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.
+
+%description -l ru
+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 uk
+Mutt - ÃÅ ÎÅ×ÅÌÉËÉÊ, ÁÌÅ ÐÏÔÕÖÎÉÊ ÐÏ×ÎÏÅËÒÁÎÎÉÊ ÐÏÛÔÏ×ÉÊ Ë̦¤ÎÔ.
+í¦ÓÔÉÔØ Ð¦ÄÔÒÉÍËÕ MIME, ËÏ̦Ò, ЦÄÔÒÉÍËÕ POP3 ÔÁ IMAP, ÇÒÕÐÕ×ÁÎÎÑ
+ÐÏצÄÏÍÌÅÎØ ÐÏ ÌÁÎÃÀÖËÁÍ, ÐÅÒÅ×ÉÚÎÁÞÅÎÎÑ ËÌÁצÛ, ЦÄÔÒÉÍËÕ pgp/gpg ÔÁ
+ÓÏÒÔÕ×ÁÎÎÑ ÐÏצÄÏÍÌÅÎØ Õ ÌÁÎÃÀÖËÁÈ. í¦ÓÔÉÔØ ÔÁËÏÖ (ÐÏËÉ ÝÏ
+ÅËÓÐÅÒÉÍÅÎÔÁÌØÎÕ) ЦÄÔÒÉÍËÕ NNTP.
+
 %prep
 %setup -q -n %{name}-%(echo %{version} | sed 's/i$//')
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+#%patch13 -p0
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch18 -p1
+%{!?_without_sasl:%patch19 -p1}
+%{?_with_nntp:%patch20 -p1}
+%{?_with_esmtp:%patch21 -p1}
+
+# force regeneration (manual.sgml is modified by some patches)
+rm -f doc/{manual*.html,manual.txt}
 
 %build
-
-#PGP=%{_bindir}/pgp PGPK=%{_bindir}/pgpk \
-CFLAGS="%{optflags} -I%{_includedir}/slang" \
-./configure \
-	--with-curses \
-	--with-regex \
-	--with-homespool=Maildir \
-	--with-mailpath=/var/mail \
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
+%configure \
+	%{!?debug:--disable-debug} %{?debug:--enable-debug} \
+	%{!?_with_slang:--with-curses} \
+	%{?_with_slang:--with-slang} \
+	--enable-compressed \
 	--enable-external-dotlock \
-	--with-sharedir=%{_datadir} \
-	--with-iconv \
-	--with-docdir=%{_defaultdocdir}/%{name}-%{version} \
-	--enable-pop \
 	--enable-imap \
-	--with-ssl \
+	--without-included-gettext \
+	--enable-mailtool \
+	--with-mixmaster \
+	--enable-pop \
+	%{?_with_nntp:--enable-nntp} \
+	--with-regex \
 	%{!?_without_sasl:--with-sasl} %{?_without_sasl:--without-sasl} \
-	%{!?debug:--disable-debug} %{?debug:--enable-debug} \
+    %{?_with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \
+	--with-ssl \
 	--disable-warnings \
-	--enable-mailtool \
-	--without-included-nls \
+	--with-docdir=%{_docdir}/%{name}-%{version} \
+	--with-homespool=Maildir \
+	--with-mailpath=/var/mail \
+	--with-sharedir=%{_datadir} \
 	--prefix=%{_prefix} \
 	--bindir=%{_bindir} \
 	--datadir=%{_datadir} \
-	--with-docdir=%{_docdir}/mutt-%{version} \
-	--sysconfdir=%{_sysconfdir} \
-	--mandir=%{_mandir} 
+	--mandir=%{_mandir} \
+	--sysconfdir=%{_sysconfdir}
 
-make
-make manual.txt -C doc
+%{__make}
+%{__make} manual.txt -C doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/Mail,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/Mail,%{_pixmapsdir}} \
+	$RPM_BUILD_ROOT%{_mandir}/pl/man1
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
+%{__patch} -p0 -d $RPM_BUILD_ROOT%{_sysconfdir} < %PATCH17
+
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
-
-gzip -9nf contrib/{*rc*,*cap*} \
-	ChangeLog README TODO NEWS README.SECURITY README.SSL 
+install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
 # conflict with qmail
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
 
+rm -f $RPM_BUILD_ROOT/etc/mime.types
+
 %find_lang %{name}
 
 %clean
@@ -115,7 +209,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc *.gz contrib/{*rc*,*cap*} doc/manual*html doc/manual.txt
+%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL doc/manual.txt README.xface %{?_with_esmtp: Muttrc.esmtp}
 %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
 %attr(755,root,root) %{_bindir}/flea
@@ -126,3 +220,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_applnkdir}/Network/Mail/mutt.desktop
 %{_pixmapsdir}/mutt.png
 %{_mandir}/man*/*
+%lang(pl) %{_mandir}/pl/man*/*