http://dave.willfork.com/slrnface/

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index c30b258b58a0447ead20aca50fbce1e7158a0ff3..028cfa12578337d670e0ec84aaf0ef2ba5d7e98d 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -21,7 +21,6 @@ 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
@@ -40,11 +39,12 @@ Patch14:    %{name}-LIBOBJ.patch
 Patch15:       %{name}-pgp_hook.patch
 Patch16:       %{name}-manual.patch
 Patch17:       %{name}-send_charset.patch
-Patch18:       %{name}-sasl2.patch
+Patch18:       %{name}-nntp.patch
+Patch19:       %{name}-sasl2.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
@@ -124,13 +124,10 @@ 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}
 
 %build
-%{__gettextize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
@@ -170,6 +167,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