- patch for cyrus-sasl-2.1.x. needs testing

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index 689489da4e6e705264263371b7049241e35d9360..c30b258b58a0447ead20aca50fbce1e7158a0ff3 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -1,5 +1,6 @@
 # conditionals:
 # --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
@@ -12,7 +13,7 @@ Summary(tr):  Mutt elektronik posta program
 Summary(uk):   ðÏÛÔÏ×Á Ë̦¤ÎÔÓØËÁ ÐÒÏÇÒÁÍÁ Mutt
 Name:          mutt
 Version:       1.4
-Release:       4
+Release:       5
 Epoch:         5
 License:       GPL
 Group:         Applications/Mail
@@ -20,6 +21,7 @@ Source0:      ftp://ftp.mutt.org/mutt/%{name}-%{version}i.tar.gz
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Source3:       %{name}.1.pl
+Source4:       %{name}-nntp.config
 Patch0:                %{name}-home_etc.patch
 Patch1:                %{name}-forcedotlock.patch
 Patch2:                %{name}-muttbug-tmp.patch
@@ -38,7 +40,7 @@ Patch14:      %{name}-LIBOBJ.patch
 Patch15:       %{name}-pgp_hook.patch
 Patch16:       %{name}-manual.patch
 Patch17:       %{name}-send_charset.patch
-Patch18:       %{name}-nntp.patch
+Patch18:       %{name}-sasl2.patch
 URL:           http://www.mutt.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -123,6 +125,8 @@ Mutt - 
 %patch15 -p1
 %patch16 -p1
 %patch17 -p0
+%{?_with_nntp:%patch18 -p1}
+%{?_with_nntp:cat %{SOURCE4} >> Muttrc.head.in}
 %patch18 -p1
 
 %build
@@ -141,7 +145,7 @@ Mutt - 
        --enable-mailtool \
        --with-mixmaster \
        --enable-pop \
-       --enable-nntp \
+       %{?_with_nntp:--enable-nntp} \
        --with-regex \
        %{!?_without_sasl:--with-sasl} %{?_without_sasl:--without-sasl} \
        --with-ssl \
@@ -173,6 +177,8 @@ 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