rpms/mutt/F-8 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.51, 1.52 mutt_ldap_query, 1.3, 1.4 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-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-updating.patch, 1.1, NONE

[Miroslav Lichvar (mlichvar)]

Author: mlichvar

Update of /cvs/pkgs/rpms/mutt/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16840

Modified Files:
	.cvsignore mutt.spec mutt_ldap_query 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-maildirnull.patch mutt-1.5.17-mailto.patch 
	mutt-1.5.17-manual.patch mutt-1.5.17-updating.patch 
Log Message:
- update to 1.5.18
- fix awk script in mutt_ldap_query
- force building with libdb
- make enabling/disabling features in spec easier


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/F-8/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	8 Nov 2007 13:37:41 -0000	1.17
+++ .cvsignore	19 May 2008 11:04:32 -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/F-8/mutt.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mutt.spec	23 Nov 2007 11:56:58 -0000	1.51
+++ mutt.spec	19 May 2008 11:04:32 -0000	1.52
@@ -1,7 +1,21 @@
+%bcond_with debug
+%bcond_without imap
+%bcond_without pop
+%bcond_without smtp
+%bcond_without gnutls
+%bcond_without gss
+%bcond_without sasl
+%bcond_without idn
+%bcond_without hcache
+%bcond_without bdb
+%bcond_with qdbm
+%bcond_with gdbm
+%bcond_with gpgme
+
 Summary: A text mode mail user agent
 Name: mutt
-Version: 1.5.17
-Release: 2%{?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
@@ -10,21 +24,32 @@
 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
+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)
 BuildRequires: /usr/sbin/sendmail
-BuildRequires: cyrus-sasl-devel db4-devel gnutls-devel krb5-devel ncurses-devel
-BuildRequires: libidn-devel gettext
+BuildRequires: ncurses-devel
+BuildRequires: gettext
 # required to build documentation
 BuildRequires: docbook-style-xsl libxslt lynx
 
+%if %{with hcache}
+%{?with_bdb:BuildRequires: db4-devel}
+%{?with_qdbm:BuildRequires: qdbm-devel}
+%{?with_gdbm:BuildRequires: gdbm-devel}
+%endif
+%if %{with imap} || %{with pop} || %{with smtp}
+%{?with_gnutls:BuildRequires: gnutls-devel}
+%{?with_sasl:BuildRequires: cyrus-sasl-devel}
+%endif
+%if %{with imap}
+%{?with_gss:BuildRequires: krb5-devel}
+%endif
+%{?with_idn:BuildRequires: libidn-devel}
+%{?with_gpgme:BuildRequires: gpgme-devel}
+
 %description
 Mutt is a small but very powerful text-based MIME mail client.  Mutt
 is highly configurable, and is well suited to the mail power user with
@@ -38,24 +63,31 @@
 %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
 
 install -p -m644 %{SOURCE1} mutt_ldap_query
 
 %build
 %configure \
-	--enable-pop --enable-imap \
-	--enable-smtp \
-	--with-gnutls \
-	--with-gss \
-	--with-sasl \
-	--with-idn \
-	--enable-inodesort \
-	--enable-hcache \
-	--with-docdir=%{_docdir}/%{name}-%{version}
+%{?with_debug:	--enable-debug}\
+%{?with_pop:	--enable-pop}\
+%{?with_imap:	--enable-imap} \
+%{?with_smtp:	--enable-smtp} \
+%if %{with hcache}
+		--enable-hcache \
+%{!?with_gdbm:	--without-gdbm} \
+%{!?with_qdbm:	--without-qdbm} \
+%endif
+%if %{with imap} || %{with pop} || %{with smtp}
+%{?with_gnutls:	--with-gnutls} \
+%{?with_sasl:	--with-sasl} \
+%endif
+%if %{with imap}
+%{?with_gss: 	--with-gss} \
+%endif
+%{!?with_idn:	--without-idn} \
+%{?with_gpgme:	--enable-gpgme} \
+		--with-docdir=%{_docdir}/%{name}-%{version}
+
 make %{?_smp_mflags}
 
 %install
@@ -105,6 +137,12 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Mon May 19 2008 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.18-1
+- update to 1.5.18
+- fix awk script in mutt_ldap_query
+- force building with libdb
+- make enabling/disabling features in spec easier
+
 * Fri Nov 23 2007 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.17-2
 - don't ignore $from in batch send mode (#392861)
 - check Maildir for not being NULL when expanding '='-paths


Index: mutt_ldap_query
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-8/mutt_ldap_query,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mutt_ldap_query	9 Sep 2004 08:54:15 -0000	1.3
+++ mutt_ldap_query	19 May 2008 11:04:32 -0000	1.4
@@ -26,12 +26,9 @@
 	/^mail:/ {MAIL=substr($0,6)}
 	/^cn:/ {NAME=substr($0,4)}
 	/^roomNumber:/ {ROOM=substr($0,12)}
-	/^$/ { MAIL=gensub("^ ","",g,MAIL) }
-	/^$/ { MAIL=gensub(" $","",g,MAIL) }
-	/^$/ { NAME=gensub("^ ","",g,NAME) }
-	/^$/ { NAME=gensub(" $","",g,NAME) }
-	/^$/ { ROOM=gensub("^ ","",g,ROOM) }
-	/^$/ { ROOM=gensub(" $","",g,ROOM) }
+	/^$/ { MAIL=gensub("^ *| *$","","g",MAIL) }
+	/^$/ { NAME=gensub("^ *| *$","","g",NAME) }
+	/^$/ { ROOM=gensub("^ *| *$","","g",ROOM) }
 	/^$/ { if(length(NAME) > 0) print MAIL "\t" NAME "\t" ROOM}
 	/^$/ { NAME = "" }
 ' > $RESULTS


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-8/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	8 Nov 2007 13:37:41 -0000	1.17
+++ sources	19 May 2008 11:04:32 -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-maildirnull.patch DELETED ---


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


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


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