db-4.6.18 integrated

openldap.spec

@@ -1,5 +1,5 @@
 %define migtools_version 47
-%define db_version 4.4.20
+%define db_version 4.6.18
 %define ldbm_backend berkeley
 %define version_22 2.2.29
 %define version_23 2.3.37
@@ -17,7 +17,7 @@ License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
 Source1: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_22}.tgz
-Source2: http://downloads.sleepycat.com/db-%{db_version}.tar.gz
+Source2: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
 Source3: ftp://ftp.padl.com/pub/MigrationTools-%{migtools_version}.tar.gz
 Source4: ldap.init
 Source5: migration-tools.txt
@@ -56,8 +56,9 @@ Patch305: MigrationTools-45-noaliases.patch
 Patch306: MigrationTools-46-ddp.patch
 Patch307: MigrationTools-46-unique-hosts.patch
 
-Patch400: db-4.4.20-1.patch
-Patch401: db-4.4.20-2.patch
+# Patches for db4 library
+Patch400: db-4.3.29-sparc64.patch
+Patch401: db-4.5.20-jni-include-dir.patch
 
 URL: http://www.openldap.org/
 BuildRoot: %{_tmppath}/%{name}-%{version_23}-root
@@ -152,6 +153,11 @@ required by some applications.
 %prep
 %setup -q -c -a 1 -a 2 -a 3
 
+pushd db-%{db_version}
+%patch400 -p1 -b .sparc64
+%patch401 -p1 -b .4.5.20.jni
+popd
+
 pushd openldap-%{version_23}
 %patch0 -p1 -b .config
 %patch1 -p1 -b .ldaprc
@@ -657,6 +663,7 @@ fi
 - do not use specific automake and autoconf
 - do not distinguish between NPTL and non-NPTL platforms, we have NPTL
   everywhere
+- db-4.6.18 integrated
 
 * Tue Jul 31 2007 Jan Safranek <jsafranek@redhat.com> 2.3.37-1%{?dist}
 - new upstream version