- added libesmtp support (not enabled by default)

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index c30b258b58a0447ead20aca50fbce1e7158a0ff3..da447254f3d8d584fc6b9c90cde31bb0d10ede19 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,27 +1,32 @@
-# conditionals:
-# --with slang:        use slang library instead of ncurses
-# --with nntp: use VVV's NNTP patch
-
+#
+# 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.4
-Release:       5
+Version:       1.4.1
+Release:       3
 Epoch:         5
 License:       GPL
 Group:         Applications/Mail
 Source0:       ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz
+# Source0-md5: fb5418135c5be2638964eef2f654f847
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl
-Source4:       %{name}-nntp.config
+Source4:    %{name}-esmtp.rc
 Patch0:                %{name}-home_etc.patch
 Patch1:                %{name}-forcedotlock.patch
 Patch2:                %{name}-muttbug-tmp.patch
@@ -40,21 +45,27 @@ Patch14:    %{name}-LIBOBJ.patch
 Patch15:       %{name}-pgp_hook.patch
 Patch16:       %{name}-manual.patch
 Patch17:       %{name}-send_charset.patch
-Patch18:       %{name}-sasl2.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
-%{!?_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.6a
+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.
 Features include MIME support, color, POP3 support, message threading,
@@ -76,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
@@ -124,13 +142,15 @@ Mutt - 
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p0
-%{?_with_nntp:%patch18 -p1}
-%{?_with_nntp:cat %{SOURCE4} >> Muttrc.head.in}
 %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
-%{__gettextize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
@@ -148,6 +168,7 @@ Mutt - 
        %{?_with_nntp:--enable-nntp} \
        --with-regex \
        %{!?_without_sasl:--with-sasl} %{?_without_sasl:--without-sasl} \
+    %{?_with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \
        --with-ssl \
        --disable-warnings \
        --with-docdir=%{_docdir}/%{name}-%{version} \
@@ -170,6 +191,8 @@ 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
@@ -186,7 +209,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL 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