rpms/cyrus-imapd/devel cyrus-imapd-2.3.12p2-current-db.patch, NONE, 1.1 cyrus-imapd.spec, 1.43, 1.44 cyrus-imapd-2.3.12p2-db4.7.patch, 1.1, NONE

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/cyrus-imapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14319

Modified Files:
	cyrus-imapd.spec 
Added Files:
	cyrus-imapd-2.3.12p2-current-db.patch 
Removed Files:
	cyrus-imapd-2.3.12p2-db4.7.patch 
Log Message:
* Fri Sep 26 2008 Dan Horák <dan[at]danny.cz - 2.3.12p2-3
- better fix for linking with recent db4.x


cyrus-imapd-2.3.12p2-current-db.patch:

--- NEW FILE cyrus-imapd-2.3.12p2-current-db.patch ---
--- cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4.orig	2008-09-12 07:46:46.000000000 +0200
+++ cyrus-imapd-2.3.12p2/cmulocal/berkdb.m4	2008-09-12 07:47:10.000000000 +0200
@@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
 	fi
 
 	saved_LIBS=$LIBS
-        for dbname in ${with_bdb} 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-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db 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-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3
           do
 	    LIBS="$saved_LIBS -l$dbname"
 	    AC_TRY_LINK([#include <stdio.h>


Index: cyrus-imapd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cyrus-imapd/devel/cyrus-imapd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- cyrus-imapd.spec	12 Sep 2008 07:09:30 -0000	1.43
+++ cyrus-imapd.spec	26 Sep 2008 11:39:02 -0000	1.44
@@ -1,7 +1,7 @@
 %define upstream_ver 2.3.12p2
 Name: cyrus-imapd
 Version: 2.3.12p2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -142,7 +142,8 @@
 Patch14: cyrus-imapd-2.3.1-authid_normalize.patch
 Patch15: cyrus-imapd-2.3.1-make_md5_defaults.patch
 Patch18: cyrus-imapd-2.3.7-krb4.patch
-Patch19: cyrus-imapd-2.3.12p2-db4.7.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=461875
+Patch19: cyrus-imapd-2.3.12p2-current-db.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf >= 2.59
 BuildRequires: cyrus-sasl-devel >= 2.1.15-1, perl-devel, tcp_wrappers
@@ -784,7 +785,10 @@
 %{_mandir}/man1/*
 
 %changelog
-* Fri Sep 14 2008 Dan Horák <dan[at]danny.cz - 2.3.12p2-2
+* Fri Sep 26 2008 Dan Horák <dan[at]danny.cz - 2.3.12p2-3
+- better fix for linking with recent db4.x
+
+* Fri Sep 12 2008 Dan Horák <dan[at]danny.cz - 2.3.12p2-2
 - fix linking with db4.7 (Resolves: #461875)
 - patch cleanup
 


--- cyrus-imapd-2.3.12p2-db4.7.patch DELETED ---