rpms/mutt/devel mutt-1.5.18-manual.patch, NONE, 1.1 mutt-1.5.18-muttrc.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 mutt.spec, 1.53, 1.54 sources, 1.17, 1.18 mutt-1.5.16-muttrc.patch, 1.1, NONE mutt-1.5.17-batchsend.patch, 1.1, NONE mutt-1.5.17-gnutls.patch, 1.1, NONE mutt-1.5.17-maildirnull.patch, 1.1, NONE mutt-1.5.17-mailto.patch, 1.1, NONE mutt-1.5.17-manual.patch, 1.1, NONE mutt-1.5.17-smimekeys.patch, 1.1, NONE mutt-1.5.17-updating.patch, 1.1, NONE

[Miroslav Lichvar (mlichvar)]

Author: mlichvar

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

Modified Files:
	.cvsignore mutt.spec sources 
Added Files:
	mutt-1.5.18-manual.patch mutt-1.5.18-muttrc.patch 
Removed Files:
	mutt-1.5.16-muttrc.patch mutt-1.5.17-batchsend.patch 
	mutt-1.5.17-gnutls.patch mutt-1.5.17-maildirnull.patch 
	mutt-1.5.17-mailto.patch mutt-1.5.17-manual.patch 
	mutt-1.5.17-smimekeys.patch mutt-1.5.17-updating.patch 
Log Message:
- update to 1.5.18


mutt-1.5.18-manual.patch:

--- NEW FILE mutt-1.5.18-manual.patch ---
diff -up mutt-1.5.18/doc/Makefile.in.manual mutt-1.5.18/doc/Makefile.in
diff -up mutt-1.5.18/init.h.manual mutt-1.5.18/init.h
--- mutt-1.5.18/init.h.manual	2008-01-30 05:26:50.000000000 +0100
+++ mutt-1.5.18/init.h	2008-05-19 11:05:02.000000000 +0200
@@ -19,7 +19,6 @@
 
 #ifdef _MAKEDOC
 # include "config.h"
-# include "doc/makedoc-defs.h"
 #else
 # include "sort.h"
 #endif

mutt-1.5.18-muttrc.patch:

--- NEW FILE mutt-1.5.18-muttrc.patch ---
diff -up mutt-1.5.18/doc/Muttrc.head.muttrc mutt-1.5.18/doc/Muttrc.head
--- mutt-1.5.18/doc/Muttrc.head.muttrc	2008-01-30 05:26:50.000000000 +0100
+++ mutt-1.5.18/doc/Muttrc.head	2008-05-19 10:58:21.000000000 +0200
@@ -19,11 +19,15 @@ macro index,pager,attach,compose \cb "\
 
 # 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.
 #
diff -up mutt-1.5.18/contrib/sample.muttrc mutt-1.5.18/contrib/sample


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	2 Nov 2007 12:34:40 -0000	1.17
+++ .cvsignore	19 May 2008 10:50:48 -0000	1.18
@@ -1 +1 @@
-mutt-1.5.17.tar.gz
+mutt-1.5.18.tar.gz


Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/mutt.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- mutt.spec	4 Apr 2008 11:50:26 -0000	1.53
+++ mutt.spec	19 May 2008 10:50:48 -0000	1.54
@@ -14,8 +14,8 @@
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 1.5.17
-Release: 4%{?dist}
+Version: 1.5.18
+Release: 1%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -24,14 +24,8 @@
 Source: ftp://ftp.mutt.org/pub/mutt/devel/mutt-%{version}.tar.gz
 Source1: mutt_ldap_query
 Patch2: mutt-1.5.13-nodotlock.patch
-Patch3: mutt-1.5.16-muttrc.patch
-Patch4: mutt-1.5.17-manual.patch
-Patch5: mutt-1.5.17-maildirnull.patch
-Patch6: mutt-1.5.17-updating.patch
-Patch7: mutt-1.5.17-mailto.patch
-Patch8: mutt-1.5.17-batchsend.patch
-Patch9: mutt-1.5.17-gnutls.patch
-Patch10: mutt-1.5.17-smimekeys.patch
+Patch3: mutt-1.5.18-muttrc.patch
+Patch4: mutt-1.5.18-manual.patch
 Url: http://www.mutt.org/
 Requires: mailcap urlview
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,18 +63,11 @@
 %patch2 -p1 -b .nodl
 %patch3 -p1 -b .muttrc
 %patch4 -p1 -b .manual
-%patch5 -p1 -b .maildirnull
-%patch6 -p1 -b .updating
-%patch7 -p1 -b .mailto
-%patch8 -p1 -b .batchsend
-%patch9 -p1 -b .gnutls
-%patch10 -p1 -b .smimekeys
 
 install -p -m644 %{SOURCE1} mutt_ldap_query
 
 %build
 %configure \
-		--enable-inodesort \
 %{?with_debug:	--enable-debug}\
 %{?with_pop:	--enable-pop}\
 %{?with_imap:	--enable-imap} \
@@ -150,6 +137,9 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Mon May 19 2008 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.18-1
+- update to 1.5.18
+
 * Fri Apr 04 2008 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.17-4
 - fix sending long commands when using gnutls (#438275)
 - glob tilde in smime_keys (#424311)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	2 Nov 2007 12:34:40 -0000	1.17
+++ sources	19 May 2008 10:50:48 -0000	1.18
@@ -1 +1 @@
-49387458be0cb52b85ae0d73af699aae  mutt-1.5.17.tar.gz
+27c30037120189b9f9c0d3e76361b8f8  mutt-1.5.18.tar.gz


--- mutt-1.5.16-muttrc.patch DELETED ---


--- mutt-1.5.17-batchsend.patch DELETED ---


--- mutt-1.5.17-gnutls.patch DELETED ---


--- mutt-1.5.17-maildirnull.patch DELETED ---


--- mutt-1.5.17-mailto.patch DELETED ---


--- mutt-1.5.17-manual.patch DELETED ---


--- mutt-1.5.17-smimekeys.patch DELETED ---


--- mutt-1.5.17-updating.patch DELETED ---