- added Encoding=UTF-8 (field required by freedesktop.org desktop-entry specification)

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index e9714edc53bb4ea320268e343aee6ac1a83eda3d..3c00604f9800c41445d41caf049547e70854e7b2 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -2,6 +2,7 @@
 # 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
@@ -16,11 +17,12 @@ Summary(tr):        Mutt elektronik posta program
 Summary(uk):   ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:          mutt
 Version:       1.4.1
-Release:       2
+Release:       4
 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
@@ -45,20 +47,25 @@ 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
 %{!?_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: openssl-devel >= 0.9.7c
 BuildRequires: sgml-tools
 BuildRequires: sgml-tools-dtd
 %{?_with_slang:BuildRequires:          slang-devel}
+%{?_with_esmtp:BuildRequires:       libesmtp-devel}
 Requires:      iconv
 Requires:      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,
@@ -138,6 +145,8 @@ Mutt - 
 %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}
@@ -160,6 +169,7 @@ rm -f doc/{manual*.html,manual.txt}
        %{?_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} \
@@ -200,7 +210,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 README.xface
+%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