rpms/mutt/F-10 mutt-1.5.19-db47.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 mutt.spec, 1.57, 1.58 sources, 1.18, 1.19 mutt-1.5.18-db47.patch, 1.1, NONE mutt-1.5.18-imap.patch, 1.1, NONE mutt-1.5.18-intr.patch, 1.1, NONE

[Miroslav Lichvar]

Author: mlichvar

Update of /cvs/pkgs/rpms/mutt/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13701

Modified Files:
	.cvsignore mutt.spec sources 
Added Files:
	mutt-1.5.19-db47.patch 
Removed Files:
	mutt-1.5.18-db47.patch mutt-1.5.18-imap.patch 
	mutt-1.5.18-intr.patch 
Log Message:
- update to 1.5.19
- switch hcache backend to tokyocabinet
- drop intr patch


mutt-1.5.19-db47.patch:

--- NEW FILE mutt-1.5.19-db47.patch ---
diff -up mutt-1.5.19/configure.db47 mutt-1.5.19/configure
--- mutt-1.5.19/configure.db47	2009-01-06 17:03:22.000000000 +0100
+++ mutt-1.5.19/configure	2009-01-06 17:05:19.000000000 +0100
@@ -16074,7 +16074,7 @@ echo "$as_me: error: GDBM could not be u
                 bdbpfx="$bdbpfx $d/$v"
             done
         done
-        BDB_VERSIONS="db-4 db4 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
+        BDB_VERSIONS="db-4 db4 db-4.7 db4.7 db-4.6 db4.6 db46 db-4.5 db4.5 db45 db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''"
         { echo "$as_me:$LINENO: checking for BerkeleyDB > 4.0" >&5
 echo $ECHO_N "checking for BerkeleyDB > 4.0... $ECHO_C" >&6; }
         for d in $bdbpfx; do


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-10/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	19 May 2008 10:50:48 -0000	1.18
+++ .cvsignore	7 Jan 2009 14:14:59 -0000	1.19
@@ -1 +1 @@
-mutt-1.5.18.tar.gz
+mutt-1.5.19.tar.gz


Index: mutt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-10/mutt.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- mutt.spec	28 Jul 2008 12:25:21 -0000	1.57
+++ mutt.spec	7 Jan 2009 14:14:59 -0000	1.58
@@ -7,15 +7,16 @@
 %bcond_without sasl
 %bcond_without idn
 %bcond_without hcache
-%bcond_without bdb
+%bcond_without tokyocabinet
+%bcond_with bdb
 %bcond_with qdbm
 %bcond_with gdbm
 %bcond_with gpgme
 
 Summary: A text mode mail user agent
 Name: mutt
-Version: 1.5.18
-Release: 4%{?dist}
+Version: 1.5.19
+Release: 1%{?dist}
 Epoch: 5
 # The entire source code is GPLv2+ except
 # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain
@@ -26,9 +27,7 @@
 Patch2: mutt-1.5.13-nodotlock.patch
 Patch3: mutt-1.5.18-muttrc.patch
 Patch4: mutt-1.5.18-manual.patch
-Patch5: mutt-1.5.18-intr.patch
-Patch6: mutt-1.5.18-imap.patch
-Patch7: mutt-1.5.18-db47.patch
+Patch7: mutt-1.5.19-db47.patch
 Url: http://www.mutt.org/
 Requires: mailcap urlview
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +38,7 @@
 BuildRequires: docbook-style-xsl libxslt lynx
 
 %if %{with hcache}
+%{?with_tokyocabinet:BuildRequires: tokyocabinet-devel}
 %{?with_bdb:BuildRequires: db4-devel}
 %{?with_qdbm:BuildRequires: qdbm-devel}
 %{?with_gdbm:BuildRequires: gdbm-devel}
@@ -66,8 +66,6 @@
 %patch2 -p1 -b .nodl
 %patch3 -p1 -b .muttrc
 %patch4 -p1 -b .manual
-%patch5 -p1 -b .intr
-%patch6 -p1 -b .imap
 %patch7 -p1 -b .db47
 
 install -p -m644 %{SOURCE1} mutt_ldap_query
@@ -80,6 +78,7 @@
 %{?with_smtp:	--enable-smtp} \
 %if %{with hcache}
 		--enable-hcache \
+%{!?with_tokyocabinet:	--without-tokyocabinet} \
 %{!?with_gdbm:	--without-gdbm} \
 %{!?with_qdbm:	--without-qdbm} \
 %endif
@@ -143,6 +142,11 @@
 %{_mandir}/man5/muttrc.*
 
 %changelog
+* Wed Jan 07 2009 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.19-1
+- update to 1.5.19
+- switch hcache backend to tokyocabinet
+- drop intr patch
+
 * Mon Jul 28 2008 Miroslav Lichvar <mlichvar at redhat.com> 5:1.5.18-4
 - rebuild with db4.7 (Robert Scheck) (#455144)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mutt/F-10/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	19 May 2008 10:50:48 -0000	1.18
+++ sources	7 Jan 2009 14:14:59 -0000	1.19
@@ -1 +1 @@
-27c30037120189b9f9c0d3e76361b8f8  mutt-1.5.18.tar.gz
+73b3747bc7f7c805921e8d24ebac693f  mutt-1.5.19.tar.gz


--- mutt-1.5.18-db47.patch DELETED ---


--- mutt-1.5.18-imap.patch DELETED ---


--- mutt-1.5.18-intr.patch DELETED ---