rpms/mutt/devel mutt-1.5.16-manual.patch, NONE, 1.1 mutt-1.5.16-muttrc.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 mutt.spec, 1.45, 1.46 sources, 1.14, 1.15 mutt-1.5.13-manual.patch, 1.1, NONE mutt-1.5.14-checkmboxsize.patch, 1.2, NONE mutt-1.5.14-muttrc.patch, 1.1, NONE mutt-apopmsgid.patch, 1.1, NONE mutt-gecos.patch, 1.1, NONE

Miroslav Lichvar (mlichvar) fedora-extras-commits at redhat.com
Mon Jun 11 12:14:41 UTC 2007 

Author: mlichvar

Update of /cvs/pkgs/rpms/mutt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17506

Modified Files:
	.cvsignore mutt.spec sources 
Added Files:
	mutt-1.5.16-manual.patch mutt-1.5.16-muttrc.patch 
Removed Files:
	mutt-1.5.13-manual.patch mutt-1.5.14-checkmboxsize.patch 
	mutt-1.5.14-muttrc.patch mutt-apopmsgid.patch mutt-gecos.patch 
Log Message:
- update to 1.5.16


mutt-1.5.16-manual.patch:

--- NEW FILE mutt-1.5.16-manual.patch ---
--- mutt-1.5.16/doc/Makefile.in.manual	2007-06-10 04:43:25.000000000 +0200
+++ mutt-1.5.16/doc/Makefile.in	2007-06-11 13:08:17.000000000 +0200
@@ -481,10 +481,9 @@ muttrc.man: ../makedoc$(EXEEXT) $(top_sr
 mutt.1: $(srcdir)/mutt.man
 	$(EDIT) $(srcdir)/mutt.man > $@
 
-stamp-doc-xml: $(top_srcdir)/makedoc.c $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \
+stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \
                manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
                $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog
-	$(MAKE) ../makedoc$(EXEEXT) # we do not want to rebuild the documentation in tarball builds
 	( date=`head -n 1 $(top_srcdir)/ChangeLog | LC_ALL=C cut -d ' ' -f 1` && \
 	  sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` ($$date)/" $(srcdir)/manual.xml.head && \
 	  $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s && \
--- mutt-1.5.16/doc/manual.xml.head.manual	2007-04-04 07:37:13.000000000 +0200
+++ mutt-1.5.16/doc/manual.xml.head	2007-06-11 13:05:41.000000000 +0200
@@ -5045,7 +5045,7 @@ changed with the <literal>edit-descripti
 <para>
 When you add an attachment to your mail message, Mutt searches your
 personal mime.types file at <literal>${HOME}/.mime.types</literal>, and then
-the system mime.types file at <literal>/usr/local/share/mutt/mime.types</literal> or
+the system mime.types file at <literal>/usr/share/mutt/mime.types</literal> or
 <literal>/etc/mime.types</literal>
 </para>
 
@@ -5102,7 +5102,7 @@ find an external handler.  The default s
 is a colon delimited list set to
 
 <screen>
-${HOME}/.mailcap:/usr/local/share/mutt/mailcap:/etc/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap
+${HOME}/.mailcap:/usr/share/mutt/mailcap:/etc/mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap
 </screen>
 
 where <literal>$HOME</literal> is your home directory.
--- mutt-1.5.16/init.h.manual	2007-06-10 04:29:21.000000000 +0200
+++ mutt-1.5.16/init.h	2007-06-11 13:05:41.000000000 +0200
@@ -19,7 +19,6 @@
 
 #ifdef _MAKEDOC
 # include "config.h"
-# include "makedoc-defs.h"
 #else
 # include "sort.h"
 #endif

mutt-1.5.16-muttrc.patch:

--- NEW FILE mutt-1.5.16-muttrc.patch ---
--- mutt-1.5.16/Muttrc.head.muttrc	2007-06-06 18:02:56.000000000 +0200
+++ mutt-1.5.16/Muttrc.head	2007-06-11 10:46:02.000000000 +0200
@@ -19,11 +19,15 @@
 
 # Show documentation when pressing F1
 macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
+# and also F2, as some terminals use F1
+macro generic,pager <F2> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
 
 # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
 macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
 bind browser y exit
 
+bind editor <delete> delete-char
+
 # If Mutt is unable to determine your site's domain name correctly, you can
 # set the default here.
 #


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	23 Feb 2007 18:38:07 -0000	1.14
+++ .cvsignore	11 Jun 2007 12:14:06 -0000	1.15
@@ -1,2 +1,2 @@
 urlview-0.9.tar.gz
-mutt-1.5.14.tar.gz
+mutt-1.5.16.tar.gz


Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mutt.spec	28 May 2007 14:48:11 -0000	1.45
+++ mutt.spec	11 Jun 2007 12:14:06 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: A text mode mail user agent
 Name: mutt
-Version: 1.5.14
-Release: 4%{?dist}
+Version: 1.5.16
+Release: 1%{?dist}
 Epoch: 5
 License: GPL
 Group: Applications/Internet
@@ -10,13 +10,10 @@
 Source2: ftp://ftp.mutt.org/pub/mutt/contrib/urlview-%{uversion}.tar.gz
 Source1: mutt_ldap_query
 Patch2: mutt-1.5.13-nodotlock.patch
-Patch3: mutt-1.5.14-muttrc.patch
-Patch4: mutt-1.5.13-manual.patch
+Patch3: mutt-1.5.16-muttrc.patch
+Patch4: mutt-1.5.16-manual.patch
 Patch5: urlview-0.9-default.patch
 Patch6: urlview.diff
-Patch7: mutt-1.5.14-checkmboxsize.patch
-Patch8: mutt-apopmsgid.patch
-Patch9: mutt-gecos.patch
 Url: http://www.mutt.org/
 Requires: /usr/sbin/sendmail webclient mailcap
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -40,15 +37,13 @@
 %patch4 -p1 -b .manual
 %patch5 -p0 -b .default
 %patch6 -p0 -b .build
-%patch7 -p1 -b .checkmboxsize
-%patch8 -p1 -b .apopmsgid
-%patch9 -p1 -b .gecos
 
 install -p -m644 %{SOURCE1} mutt_ldap_query
 
 %build
 %configure \
 	--enable-pop --enable-imap \
+	--enable-smtp \
 	--with-gnutls \
 	--with-gss \
 	--with-sasl \
@@ -85,7 +80,7 @@
 
 cd urlview-%{uversion}
 install urlview url_handler.sh $RPM_BUILD_ROOT%{_bindir}
-install -m 644 urlview.man $RPM_BUILD_ROOT%{_mandir}/man1/urlview.1
+install -p -m 644 urlview.man $RPM_BUILD_ROOT%{_mandir}/man1/urlview.1
 mkdir -p doc/urlview
 cp -p AUTHORS ChangeLog COPYING README sample.urlview \
   doc/urlview
@@ -121,6 +116,9 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Mon Jun 11 2007 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.16-1
+- update to 1.5.16
+
 * Mon May 28 2007 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.14-4
 - validate msgid in APOP authentication (CVE-2007-1558)
 - fix overflow in gecos field handling (CVE-2007-2683)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 Feb 2007 18:38:07 -0000	1.14
+++ sources	11 Jun 2007 12:14:06 -0000	1.15
@@ -1,2 +1,2 @@
 67731f73e69297ffd106b65c8aebb2ab  urlview-0.9.tar.gz
-6d33b4f0074e39772021d947c49b30c6  mutt-1.5.14.tar.gz
+10eff7024dbb7ce1f773d688a69ea9db  mutt-1.5.16.tar.gz


--- mutt-1.5.13-manual.patch DELETED ---


--- mutt-1.5.14-checkmboxsize.patch DELETED ---


--- mutt-1.5.14-muttrc.patch DELETED ---


--- mutt-apopmsgid.patch DELETED ---


--- mutt-gecos.patch DELETED ---

More information about the fedora-extras-commits mailing list