- renumbering patches to allow build with nntp

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index 13edb697a6239853ec7c6c909599c7eb10c8378e..2e682e1749ac45c9549ed6ece3e04230c4a3dac5 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:       5
+Release:       5.2
 Epoch:         5
 License:       GPL
 Group:         Applications/Mail
@@ -38,14 +39,16 @@ Patch14:    %{name}-LIBOBJ.patch
 Patch15:       %{name}-pgp_hook.patch
 Patch16:       %{name}-manual.patch
 Patch17:       %{name}-send_charset.patch
-Patch18:       %{name}-nntp.patch
+Patch18:       %{name}-xface.patch
+Patch19:       %{name}-sasl2.patch
+Patch20:       %{name}-nntp.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
 %{?_with_slang:BuildRequires:          slang-devel}
 Requires:      iconv
@@ -122,11 +125,11 @@ Mutt - 
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p0
-#%patch18 -p1
+%patch18 -p1
+%{!?_without_sasl:%patch19 -p1}
+%{?_with_nntp:%patch20 -p1}
 
 %build
-%{__gettextize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
@@ -141,7 +144,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 \
@@ -166,6 +169,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
@@ -173,6 +178,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
@@ -180,7 +187,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
 %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
 %attr(755,root,root) %{_bindir}/flea