rpms/mutt/FC-4 mutt.spec,1.25,1.26

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/mutt/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv12838

Modified Files:
	mutt.spec 
Log Message:
backport changes from devel



Index: mutt.spec
===================================================================
RCS file: /cvs/dist/rpms/mutt/FC-4/mutt.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mutt.spec	7 Mar 2005 21:15:15 -0000	1.25
+++ mutt.spec	27 Oct 2005 21:27:56 -0000	1.26
@@ -2,7 +2,7 @@
 Name: mutt
 %define uversion 0.9
 Version: 1.4.2.1
-Release: 2
+Release: 4.FC4
 Epoch: 5
 License: GPL
 Group: Applications/Internet
@@ -23,6 +23,8 @@
 Patch13: mutt-1.4.1-plain.patch
 Patch14: mutt-1.4.1-rfc1734.patch
 Patch15: mutt-1.4.2.1-gcc4.patch
+Patch20: mutt-166718.patch
+Patch21: mutt-sasl-log.patch
 Url: http://www.mutt.org/
 Requires: smtpdaemon, webclient, mailcap, gettext
 Obsoletes: urlview
@@ -65,6 +67,8 @@
 %patch13 -p1 -b .plain
 %patch14 -p1 -b .rfc1734
 %patch15 -p1 -b .gcc4
+%patch20 -p1
+%patch21 -p1
 
 install -m644 %{SOURCE1} mutt_ldap_query
 
@@ -150,6 +154,12 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Thu Oct 27 2005 Bill Nottingham <notting at redhat.com> 5:1.4.2.1-4.FC4
+- add patch from 1.5 branch to fix SASL logging (#157251, #171528)
+
+* Fri Aug 26 2005 Bill Nottingham <notting at redhat.com> 5:1.4.2.1-3
+- add patch from 1.5 branch to fix base64 decoding (#166718)
+
 * Mon Mar  7 2005 Bill Nottingham <notting at redhat.com> 5:1.4.2.1-2
 - rebuild against new openssl
 - fix build with gcc4