rpms/db4/devel db-4.3.29-64bit.patch,NONE,1.1 db4.spec,1.31,1.32

[fedora-cvs-commits at redhat.com]

Author: jnovy

Update of /cvs/dist/rpms/db4/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31419

Modified Files:
	db4.spec 
Added Files:
	db-4.3.29-64bit.patch 
Log Message:
* Mon Mar 13 2006 Jindrich Novy <jnovy at redhat.com> 4.3.29-3
- apply x86_64 fix from Henrik Nordstrom (#184588)
- don't nuke non-versioned archives twice



db-4.3.29-64bit.patch:
 db185.c      |   16 ++++++++++++++--
 db185_int.in |    8 ++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

--- NEW FILE db-4.3.29-64bit.patch ---
diff -ruN db-4.3.29-orig/db185/db185.c db-4.3.29/db185/db185.c
--- db-4.3.29-orig/db185/db185.c	2004-03-24 22:00:24.000000000 +0100
+++ db-4.3.29/db185/db185.c	2006-03-13 17:17:47.000000000 +0100
@@ -546,7 +546,13 @@
 	DB *dbp;
 	const DBT *a, *b;
 {
-	return (((DB185 *)dbp->api_internal)->compare(a, b));
+	DBT185 a185, b185;
+	a185.data = a->data;
+	a185.size = a->size;
+	b185.data = b->data;
+	b185.size = b->size;
+
+	return (((DB185 *)dbp->api_internal)->compare(&a185, &b185));
 }
 
 /*
@@ -558,7 +564,13 @@
 	DB *dbp;
 	const DBT *a, *b;
 {
-	return (((DB185 *)dbp->api_internal)->prefix(a, b));
+	DBT185 a185, b185;
+	a185.data = a->data;
+	a185.size = a->size;
+	b185.data = b->data;
+	b185.size = b->size;
+
+	return (((DB185 *)dbp->api_internal)->prefix(&a185, &b185));
 }
 
 /*
diff -ruN db-4.3.29-orig/db185/db185_int.in db-4.3.29/db185/db185_int.in
--- db-4.3.29-orig/db185/db185_int.in	2004-01-28 04:35:59.000000000 +0100
+++ db-4.3.29/db185/db185_int.in	2006-03-13 17:17:47.000000000 +0100
@@ -82,8 +82,8 @@
 	 */
 	DBC	  *dbc;			/* DB cursor. */
 					/* Various callback functions. */
-	int	  (*compare) __P((const DBT *, const DBT *));
-	size_t	  (*prefix) __P((const DBT *, const DBT *));
+	int	  (*compare) __P((const DBT185 *, const DBT185 *));
+	size_t	  (*prefix) __P((const DBT185 *, const DBT185 *));
 	u_int32_t (*hash) __P((const void *, size_t));
 } DB185;
 
@@ -96,9 +96,9 @@
 	u_int32_t minkeypage;	/* minimum keys per page */
 	u_int32_t psize;	/* page size */
 	int	(*compare)	/* comparison function */
-	    __P((const DBT *, const DBT *));
+	    __P((const DBT185 *, const DBT185 *));
 	size_t	(*prefix)	/* prefix function */
-	    __P((const DBT *, const DBT *));
+	    __P((const DBT185 *, const DBT185 *));
 	int	lorder;		/* byte order */
 } BTREEINFO;
 


Index: db4.spec
===================================================================
RCS file: /cvs/dist/rpms/db4/devel/db4.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- db4.spec	15 Feb 2006 11:06:29 -0000	1.31
+++ db4.spec	13 Mar 2006 16:33:23 -0000	1.32
@@ -11,12 +11,13 @@
 Summary: The Berkeley DB database library (version 4) for C.
 Name: db4
 Version: 4.3.29
-Release: 2
+Release: 3
 Source: http://www.sleepycat.com/update/%{version}/db-%{version}.tar.gz
 Source1: http://www.sleepycat.com/update/1.85/db.1.85.tar.gz
 Source2: nptl-abi-note.S
 Patch1: db-4.3.21-java.patch
 Patch2: db-4.3.29-lfs.patch
+Patch3: db-4.3.29-64bit.patch
 Patch4: db-4.2.52-gcj.patch
 Patch10: http://www.sleepycat.com/update/1.85/patch.1.1
 Patch11: http://www.sleepycat.com/update/1.85/patch.1.2
@@ -101,6 +102,7 @@
 %setup -q -n db-%{version} -a 1
 %patch1 -p1 -b .java
 %patch2 -p1 -b .lfs
+%patch3 -p1 -b .64bit
 %patch4 -p1 -b .gcj
 
 pushd dist
@@ -246,11 +248,6 @@
 
 chmod +x ${RPM_BUILD_ROOT}%{_libdir}/*.so*
 
-# XXX Nuke non-versioned archives.
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/{libdb.a,libdb_cxx.a}
-
-chmod +x ${RPM_BUILD_ROOT}%{_libdir}/*.so*
-
 # Move the main shared library from /usr/lib* to /lib* directory.
 if [ "%{_libdir}" != "/%{_lib}" ]; then
   mkdir -p $RPM_BUILD_ROOT/%{_lib}/
@@ -358,6 +355,10 @@
 %endif
 
 %changelog
+* Mon Mar 13 2006 Jindrich Novy <jnovy at redhat.com> 4.3.29-3
+- apply x86_64 fix from Henrik Nordstrom (#184588)
+- don't nuke non-versioned archives twice
+
 * Wed Feb 15 2006 Jindrich Novy <jnovy at redhat.com> 4.3.29-2
 - don't package /usr/share/doc/images in the main db4 package
   and move it to db4-devel (#33328)