X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mutt.spec;h=3e34da0a7097366865996de3c3cee80ebde5d1f0;hb=302e2bd244f743b6f5ac717b1a93d3e4203164c3;hp=d2ffd7cb34cd1b4b04309200ab5f042537250fd2;hpb=db3070ea0e71d918c481708985974c00c0a8861b;p=packages%2Fmutt.git

diff --git a/mutt.spec b/mutt.spec
index d2ffd7c..3e34da0 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,18 +1,25 @@
+#
+# Conditional build:
+# _with_slang	- use slang library instead of ncurses
+# _with_nntp	- use VVV's NNTP patch
+#
 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(es):	Mutt, cliente de correo electrónico
+Summary(ru):	ðÏÞÔÏ×ÁÑ ËÌÉÅÎÔÓËÁÑ ÐÒÏÇÒÁÍÍÁ Mutt
 Summary(tr):	Mutt elektronik posta programý
+Summary(uk):	ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:		mutt
-Version:	1.3.27i
-Release:	5
+Version:	1.4.1
+Release:	2
 Epoch:		5
 License:	GPL
 Group:		Applications/Mail
-Source0:	ftp://ftp.mutt.org/pub/mutt/%{name}-%{version}.tar.gz
+Source0:	ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
@@ -30,16 +37,25 @@ 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
 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 >= 2.1.0}
+BuildRequires:	gettext-devel
+%{!?_with_slang:BuildRequires:		ncurses-devel >= 5.0}
+BuildRequires:	openssl-devel >= 0.9.7
 BuildRequires:	sgml-tools
-%{!?_without_sasl:BuildRequires:	cyrus-sasl-devel}
+BuildRequires:	sgml-tools-dtd
+%{?_with_slang:BuildRequires:		slang-devel}
 Requires:	iconv
 Requires:	mailcap
-Requires:	smtpdaemon
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -63,6 +79,13 @@ 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,
 posiadaj±cym du¿e mo¿liwo¶ci. Obs³uguje MIME, POP3, cztery formaty
@@ -74,10 +97,24 @@ O Mutt 
 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
@@ -93,36 +130,46 @@ deste
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
-%patch13 -p0
+#%patch13 -p0
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch18 -p1
+%{!?_without_sasl:%patch19 -p1}
+%{?_with_nntp:%patch20 -p1}
+
+# force regeneration (manual.sgml is modified by some patches)
+rm -f doc/{manual*.html,manual.txt}
 
 %build
-autoconf
-#PGP=%{_bindir}/pgp PGPK=%{_bindir}/pgpk
-CFLAGS="%{optflags} -I%{_includedir}/slang" \
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
 %configure \
-	--enable-pop \
+	%{!?debug:--disable-debug} %{?debug:--enable-debug} \
+	%{!?_with_slang:--with-curses} \
+	%{?_with_slang:--with-slang} \
+	--enable-compressed \
+	--enable-external-dotlock \
 	--enable-imap \
+	--without-included-gettext \
 	--enable-mailtool \
-	--enable-external-dotlock \
-	--enable-compressed \
-	%{!?debug:--disable-debug} %{?debug:--enable-debug} \
-	--disable-warnings \
-	--with-curses \
-	--with-iconv \
+	--with-mixmaster \
+	--enable-pop \
+	%{?_with_nntp:--enable-nntp} \
 	--with-regex \
-	--with-ssl \
 	%{!?_without_sasl:--with-sasl} %{?_without_sasl:--without-sasl} \
-	--without-included-nls \
+	--with-ssl \
+	--disable-warnings \
+	--with-docdir=%{_docdir}/%{name}-%{version} \
 	--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}
+	--mandir=%{_mandir} \
+	--sysconfdir=%{_sysconfdir}
 
 %{__make}
 %{__make} manual.txt -C doc
@@ -134,16 +181,17 @@ install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/Mail,%{_pixmapsdir}} \
 
 %{__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}
 install %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/pl/man1
 
-gzip -9nf contrib/{*rc*,*cap*} \
-	ChangeLog README TODO NEWS README.SECURITY README.SSL doc/manual.txt
-
 # conflict with qmail
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/mbox.5*
 
+rm -f $RPM_BUILD_ROOT/etc/mime.types
+
 %find_lang %{name}
 
 %clean
@@ -151,7 +199,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.gz
+%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL doc/manual.txt README.xface
 %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
 %attr(755,root,root) %{_bindir}/flea