X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mutt.spec;h=3c00604f9800c41445d41caf049547e70854e7b2;hb=bb0b63e5aa247289373a595911cb4f072500a94e;hp=8e59e3240fea3e3fa9eef7b435fce9a6a962a12f;hpb=4f08f01c3e66af92b25c7505d26580ff4f8f7f3a;p=packages%2Fmutt.git

diff --git a/mutt.spec b/mutt.spec
index 8e59e32..3c00604 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,19 +1,28 @@
+#
+# 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.28i
-Release:	2
+Version:	1.4.1
+Release:	4
 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
+# Source0-md5: fb5418135c5be2638964eef2f654f847
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Source3:	%{name}.1.pl
@@ -31,18 +40,32 @@ 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
+Patch22:	%{name}-home_etc2.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.7c
 BuildRequires:	sgml-tools
-%{!?_without_sasl:BuildRequires:	cyrus-sasl-devel}
+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.
 Features include MIME support, color, POP3 support, message threading,
@@ -64,6 +87,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
@@ -109,35 +139,48 @@ Mutt - 
 %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}
+%patch22 -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_esmtp:--enable-libesmtp --with-libesmtp=/usr} \
+	--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
@@ -149,16 +192,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
@@ -166,7 +210,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 %{?_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