- release 112.2 to rebuild with fixed rpm.macros

[packages/rpm.git] / rpm-db3.patch

diff --git a/rpm-db3.patch b/rpm-db3.patch
index 8685c744a6e095d2b900a76410fa0e7e2d57674c..f239ae749cb24e7adac96b6fef8b940f72f575c3 100644 (file)
--- a/rpm-db3.patch
+++ b/rpm-db3.patch
@@ -1,33 +1,33 @@
-diff -ur rpm-3.0.5/configure.in rpm-3.0.5.bak/configure.in
---- rpm-3.0.5/configure.in     Wed Aug  2 19:54:12 2000
-+++ rpm-3.0.5.bak/configure.in Wed Aug  2 16:48:45 2000
-@@ -301,7 +301,7 @@
- AC_CHECK_LIB(port, writev)
+--- rpm-4.0/lib/db3.c.wiget    Fri Aug  4 21:48:35 2000
++++ rpm-4.0/lib/db3.c  Wed Nov 15 22:28:52 2000
+@@ -9,7 +9,7 @@
+ typedef       int int32_t;
+ #endif
  
- AC_CHECK_FUNC(dbopen, [],
--  AC_CHECK_LIB(db1, dbopen, [LIBS="$LIBS -ldb1"],
-+  AC_CHECK_LIB(db3, __db185_open, [LIBS="$LIBS -ldb3"],
-     AC_CHECK_LIB(db, dbopen, [LIBS="$LIBS -ldb"],
-        AC_MSG_ERROR([sorry rpm requires a db-1.85 API])))
-            )
-diff -ur rpm-3.0.5/lib/dbindex.h rpm-3.0.5.bak/lib/dbindex.h
---- rpm-3.0.5/lib/dbindex.h    Wed Jun 14 14:34:30 2000
-+++ rpm-3.0.5.bak/lib/dbindex.h        Wed Aug  2 19:53:32 2000
-@@ -1,6 +1,8 @@
- #ifndef H_DBINDEX
- #define H_DBINDEX
+-#include <db3/db.h>
++#include <db.h>
  
-+#include <db3/db_185.h>
-+/*
- #ifdef HAVE_DB1_DB_H
- #include <db1/db.h>
- #else
-@@ -10,7 +12,7 @@
- #include <db.h>
- #endif
- #endif
--
-+*/
- /* this will break if sizeof(int) != 4 */
+ #include <rpmlib.h>
+ #include <rpmmacro.h>
+--- rpm-4.0/configure.in.wiget Wed Nov 15 22:32:50 2000
++++ rpm-4.0/configure.in       Wed Nov 15 22:31:57 2000
+@@ -396,7 +396,7 @@
+ AC_HEADER_DIRENT
+ AC_HEADER_TIME
+ 
+-AC_CHECK_HEADERS(db_185.h db1/db.h db3/db.h)
++AC_CHECK_HEADERS(db_185.h db1/db.h db3/db.h db.h)
+ AC_CHECK_HEADERS(fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h)
+ 
+ AC_CHECK_HEADERS(sys/socket.h sys/select.h)
+--- rpm-4.0.2/lib/dbconfig.c.wiget     Wed Feb 21 12:05:37 2001
++++ rpm-4.0.2/lib/dbconfig.c   Wed Feb 21 12:06:42 2001
+@@ -4,7 +4,7 @@
+ 
+ #include "system.h"
+ 
+-#include <db3/db.h>
++#include <db.h>
  
- typedef /*@abstract@*/ struct {
+ #include <rpmlib.h>
+ #include <rpmmacro.h>