SPECS: mutt.spec - removed outdated esmtp patch+bcond; pass --enab...

[qboosh]

Author: qboosh                       Date: Sun Jun  3 13:19:36 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed outdated esmtp patch+bcond; pass --enable-smtp instead

---- Files affected:
SPECS:
   mutt.spec (1.201 -> 1.202) 

---- Diffs:

================================================================
Index: SPECS/mutt.spec
diff -u SPECS/mutt.spec:1.201 SPECS/mutt.spec:1.202
--- SPECS/mutt.spec:1.201	Sun Jun  3 15:08:12 2007
+++ SPECS/mutt.spec	Sun Jun  3 15:19:30 2007
@@ -3,7 +3,6 @@
 # Conditional build:
 %bcond_with	slang		# use slang library instead of ncurses
 %bcond_with	nntp		# use VVV's NNTP patch
-%bcond_with	esmtp		# use esmtp patch
 %bcond_with	folder_column	# build with folder_column patch
 %bcond_without	sasl		# don't use sasl
 %bcond_without	home_etc	# don't use home_etc
@@ -46,11 +45,10 @@
 Patch14:	%{name}-Muttrc_mbox_path.patch
 Patch15:	%{name}-po.patch
 Patch16:	%{name}-vvv.nntp.patch
-Patch17:	%{name}-esmtp.patch
-Patch18:	%{name}-home_etc.patch
-Patch19:	%{name}-Muttrc.patch
-Patch20:	%{name}-folder_columns.patch
-Patch21:	%{name}-nr.tag_prefix_cond.patch
+Patch17:	%{name}-home_etc.patch
+Patch18:	%{name}-Muttrc.patch
+Patch19:	%{name}-folder_columns.patch
+Patch20:	%{name}-nr.tag_prefix_cond.patch
 URL:		http://www.mutt.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -66,7 +64,6 @@
 %{!?with_slang:BuildRequires:	ncurses-devel >= 5.0}
 BuildRequires:	openssl-devel >= 0.9.7d
 %{?with_slang:BuildRequires:	slang-devel}
-%{?with_esmtp:BuildRequires:	libesmtp-devel}
 BuildRequires:	libxslt-progs
 Requires:	iconv
 Requires:	mailcap
@@ -151,13 +148,12 @@
 %patch14 -p1
 %patch15 -p1
 %{?with_nntp:%patch16 -p1}
-%{?with_esmtp:%patch17 -p1}
-%{?with_home_etc:%patch18 -p1}
-%patch19 -p1
+%{?with_home_etc:%patch17 -p1}
+%patch18 -p1
 # breaks display if arrow_cursor is set
-%{?with_folder_column:%patch20 -p1}
+%{?with_folder_column:%patch19 -p1}
 # disabled - changes default behaviour
-#%patch21 -p0
+#%patch20 -p0
 
 # force regeneration (manual.sgml is modified by some patches)
 rm -f doc/{manual*.html,manual.txt}
@@ -181,14 +177,13 @@
 	%{?with_nntp:--enable-nntp} \
 	--enable-pop \
 	%{!?with_slang:--with-curses} \
-	%{?with_slang:--with-slang} \
 	--with-docdir=%{_docdir}/%{name} \
 	%{?with_home_etc:--with-home-etc} \
-	%{?with_esmtp:--enable-libesmtp --with-libesmtp=/usr} \
 	--with-mailpath=/var/mail \
 	--with-mixmaster \
 	--with-regex \
 	%{?with_sasl:--with-sasl2} \
+	%{?with_slang:--with-slang} \
 	--with-ssl
 
 %{__make}
@@ -224,7 +219,7 @@
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL README.xface %{?with_esmtp:Muttrc.esmtp}
+%doc contrib/{*rc*,*cap*} ChangeLog README TODO NEWS README.SECURITY README.SSL README.xface
 %config(noreplace,missingok) %verify(not md5 size mtime) %{_sysconfdir}/Muttrc
 %attr(755,root,root) %{_bindir}/mutt
 %attr(755,root,root) %{_bindir}/flea
@@ -245,6 +240,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.202  2007/06/03 13:19:30  qboosh
+- removed outdated esmtp patch+bcond; pass --enable-smtp instead
+
 Revision 1.201  2007/06/03 13:08:12  qboosh
 - updated docbook deps (sgml -> xml)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mutt.spec?r1=1.201&r2=1.202&f=u