Hello community,
here is the log from the commit of package cyrus-imapd for openSUSE:Factory
checked in at Sat Oct 2 02:01:29 CEST 2010.
--------
--- cyrus-imapd/cyrus-imapd.changes 2010-05-31 15:00:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/cyrus-imapd/cyrus-imapd.changes 2010-09-30 11:37:17.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Sep 30 09:34:35 UTC 2010 - rhafer@novell.com
+
+- Check for libdb 4.8 presence
+
+-------------------------------------------------------------------
+Sun Jun 13 13:00:36 UTC 2010 - rbos@opensuse.org
+
+- Define and use _name because the macro expansion is not smart enough.
+ Without this construction the name definition of cyrus-imapd-kolab is
+ changed to cyrus-imapd.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
cyrus-imapd-libdb-4_8.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cyrus-imapd.spec ++++++
--- /var/tmp/diff_new_pack.XD8t08/_old 2010-10-02 02:00:33.000000000 +0200
+++ /var/tmp/diff_new_pack.XD8t08/_new 2010-10-02 02:00:33.000000000 +0200
@@ -19,21 +19,28 @@
%define prjname cyrus-imapd
+# Define and use _name because the macro expansion is not smart enough. Without
+# this construction the name definition of cyrus-imapd-kolab is changed to cyrus-imapd.
%if ! %{defined with_kolab}
%define with_kolab 0
+%define _name cyrus-imapd
+
+%else
+%define _name cyrus-imapd-kolab
+
%endif
+Name: %_name
+
%if %{with_kolab}
%define pkg_perl_Cyrus_IMAP perl-Cyrus-IMAP-kolab
%define pkg_perl_Cyrus_SIEVE_managesieve perl-Cyrus-SIEVE-managesieve-kolab
-
-Name: cyrus-imapd
BuildRequires: openldap2-devel
+
%else
%define pkg_perl_Cyrus_IMAP perl-Cyrus-IMAP
%define pkg_perl_Cyrus_SIEVE_managesieve perl-Cyrus-SIEVE-managesieve
-Name: cyrus-imapd
%endif
BuildRequires: bison cyrus-sasl-devel db-devel drac ed flex krb5-devel openslp-devel openssl-devel opie pwdutils tcpd-devel
@@ -50,7 +57,7 @@
%endif
Summary: The Cyrus IMAP and POP Mail Server
Version: 2.3.16
-Release: 5
+Release: 10
Source: %{prjname}-%{version}.tar.bz2
Source1: cyrus-imapd-rc.tar.gz
Source2: DB_CONFIG
@@ -66,6 +73,7 @@
Patch10: cyrus-imapd-openslp.patch
Patch12: pie.patch
Patch18: cyrus-imapd-perl-path.patch
+Patch19: cyrus-imapd-libdb-4_8.patch
%if %{with_kolab}
# KOLAB_cyrus-imapd patches are maintained at
@@ -178,6 +186,7 @@
%patch10
%patch12 -p1
%patch18
+%patch19 -p1
%if %{with_kolab}
%patch100 -p1
@@ -219,7 +228,6 @@
--with-cyrus-user=cyrus \
--with-cyrus-group=mail \
--with-cyrus-prefix=/usr/lib/cyrus \
- --with-dbdir=%{_libdir} \
--with-drac=%{_libdir} \
--with-gss_impl=auto \
--with-libwrap=/usr \
++++++ cyrus-imapd-libdb-4_8.patch ++++++
Index: cyrus-imapd-2.3.16/cmulocal/berkdb.m4
===================================================================
--- cyrus-imapd-2.3.16.orig/cmulocal/berkdb.m4
+++ cyrus-imapd-2.3.16/cmulocal/berkdb.m4
@@ -213,7 +213,7 @@ AC_DEFUN([CYRUS_BERKELEY_DB_CHK_LIB],
fi
saved_LIBS=$LIBS
- for dbname in ${with_bdb} db-4.7 db4.7 db47 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-4.8 db48 db-4.7 db4.7 db47 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
do
LIBS="$saved_LIBS -l$dbname"
AC_TRY_LINK([#include