From: jbj <devnull@localhost>
Date: Mon, 1 May 2000 17:50:35 +0000 (+0000)
Subject: Rename db0.c to db1.c, resurrect db2.c (from db3.c).
X-Git-Tag: tznext/4.11.0.1.tizen20130304~8447
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73f95c99cea1308e32ccdbfe90dcc8ccd585d9d6;p=tools%2Flibrpm-tizen.git

Rename db0.c to db1.c, resurrect db2.c (from db3.c).
Add ia64 and sparc64 changes.
rpm.spec: add per-platform sub-directories.
Add rpmdbSync to API.
installplatform: pass LIB=lib64 on sparc64.
db3.c: Add nodbsync, lockdbfd, debug dbi configuration.
db3.c: don't check dbi_mode when deciding on DB_WRITECURSOR.

CVS patchset: 3711
CVS date: 2000/05/01 17:50:35
---

diff --git a/CHANGES b/CHANGES
index 9648326..1c9fb65 100644
--- a/CHANGES
+++ b/CHANGES
@@ -24,6 +24,15 @@
 	- API: replace rpmdbFindByLabel with RPMDBI_LABEL iteration.
 	- API: replace rpmdbGetRecord with iterators.
 	- API: replace findMatches with iterators.
+	- Filter DB_INCOMPLETE on db->sync, it's usually harmless.
+	- Add per-transaction cache of resolved dependencies (aka Depends).
+	- Do lazy dbi{Open,Close} throughout.
+	- Attempt fine grained dbi cursors throughout.
+	- fix: free iterator *after* loop, not during.
+	- fix: Depends needed keylen in dbiPut, rpmdbFreeIterator after use.
+	- Rename db0.c to db1.c, resurrect db2.c (from db3.c).
+	- Add ia64 and sparc64 changes.
+	- rpm.spec: add per-platform sub-directories.
 	
 3.0.3 -> 3.0.4
 	- use compressed filenames on install side.
diff --git a/configure.in b/configure.in
index a0d66a0..872c749 100644
--- a/configure.in
+++ b/configure.in
@@ -311,8 +311,8 @@ AC_CHECK_LIB(port, writev)
 DBLIBOBJS=""
 dnl Check for Berkeley db3 API.
 AC_CHECK_FUNC(db_create, [DBLIBOBJS="$DBLIBOBJS db3.c"],
-  AC_CHECK_LIB(db, db_create, [LIBS="$LIBS -ldb"; DBLIBOBJS="$DBLIBOBJS db3.c"],
-    AC_CHECK_LIB(db-3.0, db_create, [DBLIBOBJS="$DBLIBOBJS db3.c"],,-lpthread))
+  AC_CHECK_LIB(db, db_create, [LIBS="$LIBS -ldb -lpthread"; DBLIBOBJS="$DBLIBOBJS db3.c"],
+    AC_CHECK_LIB(db-3.0, db_create, [LIBS="$LIBS -lpthread"; DBLIBOBJS="$DBLIBOBJS db3.c"],,-lpthread))
 )
 dnl Check for Berkeley db2 API.
 dnl AC_CHECK_FUNC(db_open, [DBLIBOBJS="$DBLIBOBJS db2.c"],
@@ -323,7 +323,7 @@ dnl AC_CHECK_FUNC(dbopen, [DBLIBOBJS="$DBLIBOBJS db1.c"],
 dnl     AC_CHECK_LIB(db, dbopen, [DBLIBOBJS="$DBLIBOBJS db1.c"])
 dnl )
 dnl Check for Berkeley db1 API in glibc.
-AC_CHECK_LIB(db1, dbopen, [DBLIBOBJS="$DBLIBOBJS db0.c"])
+AC_CHECK_LIB(db1, dbopen, [DBLIBOBJS="$DBLIBOBJS db1.c"])
 
 if test X"$DBLIBOBJS" = X; then
     AC_MSG_ERROR([sorry rpm requires libdb.a or libdb1.a (from the Berkeley db package)]) 
@@ -336,7 +336,6 @@ for dbi in $DBLIBOBJS; do
   db3.c) AC_DEFINE(USE_DB3) ;;
   db2.c) AC_DEFINE(USE_DB2) ;;
   db1.c) AC_DEFINE(USE_DB1) ;;
-  db0.c) AC_DEFINE(USE_DB0) ;;
   esac
 done
 
@@ -881,6 +880,7 @@ fi
 dnl Determine the canonical arch-vendor-os for the build machine
 case "${build_cpu}" in
 i386|i486|i586|i686|ix86)	RPMCANONARCH=i386 ;;
+ia64*)		RPMCANONARCH=ia64 ;;
 alpha*)		RPMCANONARCH=alpha ;;
 sparc*)		RPMCANONARCH=sparc ;;
 powerpc*)	RPMCANONARCH=ppc ;;
diff --git a/installplatform b/installplatform
index f2a6d7c..f38fe03 100755
--- a/installplatform
+++ b/installplatform
@@ -41,7 +41,7 @@ for SUBST in $SUBSTS; do
 
   ARCH_INSTALL_POST='%{nil}'
   case "${ARCH}-${OS}" in
-    sparc64-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-sparc64-linux ;;
+    sparc64-linux) ARCH_INSTALL_POST=${pkglibdir}/brp-sparc64-linux; LIB=lib64 ;;
   esac
 
   cat $PLATFORM | \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 776d295..34a2169 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/popt @INCPATH@
 
-EXTRA_DIST = falloc.c db0.c db2.c db3.c
+EXTRA_DIST = falloc.c db1.c db2.c db3.c
 
 pkgincdir = $(pkgincludedir)
 pkginc_HEADERS = \
@@ -54,7 +54,7 @@ db2.lo: db2.c $(top_srcdir)/system.h rpmlib.h rpmdb.h
 	    rm -f $${F}.o ; \
 	done
 
-db0.lo: db0.c falloc.lo $(top_srcdir)/system.h rpmlib.h rpmdb.h
+db1.lo: db1.c falloc.lo $(top_srcdir)/system.h rpmlib.h rpmdb.h
 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
 	for F in $*.o $*.lo ; do \
 	    @__LD@ -r -o $${F}.o $${F} falloc.lo -L/usr/lib -ldb1 ; \
diff --git a/lib/db0.c b/lib/db1.c
similarity index 87%
rename from lib/db0.c
rename to lib/db1.c
index 9abebed..e5e827b 100644
--- a/lib/db0.c
+++ b/lib/db1.c
@@ -23,7 +23,7 @@ static int _debug = 1;	/* XXX if < 0 debugging, > 0 unusual error returns */
 /*@access dbiIndex@*/
 /*@access dbiIndexSet@*/
 
-/* XXX remap DB3 types back into DB0 types */
+/* XXX remap DB3 types back into DB1 types */
 static inline DBTYPE db3_to_dbtype(int dbitype)
 {
     switch(dbitype) {
@@ -36,7 +36,7 @@ static inline DBTYPE db3_to_dbtype(int dbitype)
     /*@notreached@*/ return DB_HASH;
 }
 
-char * db0basename (int rpmtag) {
+char * db1basename (int rpmtag) {
     char * base = NULL;
     switch (rpmtag) {
     case 0:			base = "packages.rpm";		break;
@@ -56,10 +56,6 @@ char * db0basename (int rpmtag) {
     return xstrdup(base);
 }
 
-static inline /*@observer@*/ /*@null@*/ DB * GetDB(dbiIndex dbi) {
-    return ((DB *)dbi->dbi_db);
-}
-
 static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit) {
     int rc = 0;
 
@@ -78,8 +74,8 @@ static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit) {
     return rc;
 }
 
-static int db0sync(dbiIndex dbi, unsigned int flags) {
-    DB * db = GetDB(dbi);
+static int db1sync(dbiIndex dbi, unsigned int flags) {
+    DB * db = dbi->dbi_db;
     int rc = 0;
 
     if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) {
@@ -107,7 +103,7 @@ static int db0sync(dbiIndex dbi, unsigned int flags) {
     return rc;
 }
 
-static int db0byteswapped(dbiIndex dbi)
+static int db1byteswapped(dbiIndex dbi)
 {
     return 0;
 }
@@ -180,16 +176,16 @@ exit:
     return uh;
 }
 
-static int db0copen(dbiIndex dbi, DBC ** dbcp, unsigned int flags) {
+static int db1copen(dbiIndex dbi, DBC ** dbcp, unsigned int flags) {
     return 0;
 }
 
-static int db0cclose(dbiIndex dbi, DBC * dbcursor, unsigned int flags) {
+static int db1cclose(dbiIndex dbi, DBC * dbcursor, unsigned int flags) {
     dbi->dbi_lastoffset = 0;
     return 0;
 }
 
-static int db0cget(dbiIndex dbi, void ** keyp, size_t * keylen,
+static int db1cget(dbiIndex dbi, void ** keyp, size_t * keylen,
                 void ** datap, size_t * datalen, unsigned int flags)
 {
     DBT key, data;
@@ -228,7 +224,7 @@ static int db0cget(dbiIndex dbi, void ** keyp, size_t * keylen,
 	    if (offset == 0)
 		return -1;
 	    offset--;	/* XXX hack: caller will increment */
-	    /* XXX hack: return offset as data, free in db0cput */
+	    /* XXX hack: return offset as data, free in db1cput */
 	    data.data = xmalloc(sizeof(offset));
 	    memcpy(data.data, &offset, sizeof(offset));
 	    data.size = sizeof(offset);
@@ -252,7 +248,7 @@ static int db0cget(dbiIndex dbi, void ** keyp, size_t * keylen,
 	} else {
 	    rc = db->get(db, &key, &data, 0);
 	    _printit = (rc == 1 ? 0 : _debug);
-	    rc = cvtdberr(dbi, "db0cget", rc, _printit);
+	    rc = cvtdberr(dbi, "db1cget", rc, _printit);
 	}
     }
 
@@ -276,7 +272,7 @@ static int db0cget(dbiIndex dbi, void ** keyp, size_t * keylen,
     return rc;
 }
 
-static int db0cdel(dbiIndex dbi, const void * keyp, size_t keylen,
+static int db1cdel(dbiIndex dbi, const void * keyp, size_t keylen,
 		unsigned int flags)
 {
     int rc = 0;
@@ -287,7 +283,7 @@ static int db0cdel(dbiIndex dbi, const void * keyp, size_t keylen,
 	fadFree(dbi->dbi_pkgs, offset);
     } else {
 	DBT key;
-	DB * db = GetDB(dbi);
+	DB * db = dbi->dbi_db;
 
 	_mymemset(&key, 0, sizeof(key));
 
@@ -301,7 +297,7 @@ static int db0cdel(dbiIndex dbi, const void * keyp, size_t keylen,
     return rc;
 }
 
-static int db0cput(dbiIndex dbi, const void * keyp, size_t keylen,
+static int db1cput(dbiIndex dbi, const void * keyp, size_t keylen,
 		const void * datap, size_t datalen, unsigned int flags)
 {
     DBT key, data;
@@ -320,7 +316,7 @@ static int db0cput(dbiIndex dbi, const void * keyp, size_t keylen,
 	memcpy(&offset, key.data, sizeof(offset));
 
 	if (offset == 0) {	/* XXX simulated offset 0 record */
-	    /* XXX hack: return offset as data, free in db0cput */
+	    /* XXX hack: return offset as data, free in db1cput */
 	    if (data.size == sizeof(offset)) {
 		free(data.data);
 	    }
@@ -337,8 +333,7 @@ static int db0cput(dbiIndex dbi, const void * keyp, size_t keylen,
 	    headerFree(h);
 	}
     } else {
-	DB * db = GetDB(dbi);
-	int xx;
+	DB * db = dbi->dbi_db;
 
 	rc = db->put(db, &key, &data, 0);
 	rc = cvtdberr(dbi, "db->put", rc, _debug);
@@ -347,10 +342,10 @@ static int db0cput(dbiIndex dbi, const void * keyp, size_t keylen,
     return rc;
 }
 
-static int db0close(dbiIndex dbi, unsigned int flags) {
-    DB * db = GetDB(dbi);
+static int db1close(dbiIndex dbi, unsigned int flags) {
+    DB * db = dbi->dbi_db;
     rpmdb rpmdb = dbi->dbi_rpmdb;
-    const char * base = db0basename(dbi->dbi_rpmtag);
+    const char * base = db1basename(dbi->dbi_rpmtag);
     const char * urlfn = rpmGenPath(rpmdb->db_root, rpmdb->db_home, base);
     const char * fn;
     int rc = 0;
@@ -397,7 +392,7 @@ static int db0close(dbiIndex dbi, unsigned int flags) {
     return rc;
 }
 
-static int db0open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
+static int db1open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 {
     const char * base = NULL;
     const char * urlfn = NULL;
@@ -409,8 +404,9 @@ static int db0open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 	*dbip = NULL;
     if ((dbi = db3New(rpmdb, rpmtag)) == NULL)
 	return 1;
+    dbi->dbi_major = DB_VERSION_MAJOR;
 
-    base = db0basename(rpmtag);
+    base = db1basename(rpmtag);
     urlfn = rpmGenPath(rpmdb->db_root, rpmdb->db_home, base);
     (void) urlPath(urlfn, &fn);
     if (!(fn && *fn != '\0')) {
@@ -423,7 +419,6 @@ static int db0open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 		urlfn, dbi->dbi_mode);
 
     if (dbi->dbi_rpmtag == RPMDBI_PACKAGES) {
-	struct flock l;
 	FD_t pkgs;
 
 	pkgs = fadOpen(fn, dbi->dbi_mode, dbi->dbi_perms);
@@ -434,16 +429,21 @@ static int db0open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 	    goto exit;
 	}
 
-	l.l_whence = 0;
-	l.l_start = 0;
-	l.l_len = 0;
-	l.l_type = (dbi->dbi_mode & O_RDWR) ? F_WRLCK : F_RDLCK;
+	/* XXX HACK: fcntl lock if db3 (DB_INIT_CDB | DB_INIT_LOCK) specified */
+	if (dbi->dbi_lockdbfd || (dbi->dbi_eflags & 0x30)) {
+	    struct flock l;
 
-	if (Fcntl(pkgs, F_SETLK, (void *) &l)) {
+	    l.l_whence = 0;
+	    l.l_start = 0;
+	    l.l_len = 0;
+	    l.l_type = (dbi->dbi_mode & O_RDWR) ? F_WRLCK : F_RDLCK;
+
+	    if (Fcntl(pkgs, F_SETLK, (void *) &l)) {
 	    rpmError(RPMERR_FLOCK, _("cannot get %s lock on database"),
 		((dbi->dbi_mode & O_RDWR) ? _("exclusive") : _("shared")));
 	    rc = 1;
 	    goto exit;
+	    }
 	}
 
 	dbi->dbi_pkgs = pkgs;
@@ -475,8 +475,8 @@ exit:
     return rc;
 }
 
-struct _dbiVec db0vec = {
+struct _dbiVec db1vec = {
     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
-    db0open, db0close, db0sync, db0copen, db0cclose, db0cdel, db0cget, db0cput,
-    db0byteswapped
+    db1open, db1close, db1sync, db1copen, db1cclose, db1cdel, db1cget, db1cput,
+    db1byteswapped
 };
diff --git a/lib/db2.c b/lib/db2.c
index c6872c3..4926762 100644
--- a/lib/db2.c
+++ b/lib/db2.c
@@ -1,60 +1,35 @@
 #include "system.h"
 
-static int _debug = 1;
+static int _debug = 1;	/* XXX if < 0 debugging, > 0 unusual error returns */
 
 #include <db.h>
 
 #include <rpmlib.h>
+#include <rpmmacro.h>
+#include <rpmurl.h>	/* XXX urlPath proto */
 
 #include "rpmdb.h"
 /*@access dbiIndex@*/
 /*@access dbiIndexSet@*/
 
+static const char * db2basename = "packages.db2";
+
 #if DB_VERSION_MAJOR == 2
 #define	__USE_DB2	1
 
-/* XXX dbenv parameters */
-static int db_lorder = 0;			/* 0 is native order */
-static void (*db_errcall) (const char *db_errpfx, char *buffer) = NULL;
-static FILE * db_errfile = NULL;
-static const char * db_errpfx = "rpmdb";
-static int db_verbose = 1;
-
-static int dbmp_mmapsize = 10 * 1024 * 1024;	/* XXX db2 default: 10 Mb */
-static int dbmp_size = 1 * 1024 * 1024;		/* XXX db2 default: 128 Kb */
-
-/* XXX dbinfo parameters */
-static int db_cachesize = 0;
-static int db_pagesize = 0;			/* 512 - 64K, 0 is fs blksize */
-static void * (*db_malloc) (size_t nbytes) = NULL;
-
-static u_int32_t (*dbh_hash) (const void *, u_int32_t) = NULL;
-static u_int32_t dbh_ffactor = 0;	/* db1 default: 8 */
-static u_int32_t dbh_nelem = 0;		/* db1 default: 1 */
-static u_int32_t dbh_flags = 0;
-
-#if defined(__USE_DB3)
-static int dbopenflags = DB_INIT_MPOOL|DB_PRIVATE;
-#else
-static int dbopenflags = DB_INIT_MPOOL;
-#endif
-
-#define	_mymemset(_a, _b, _c)	memset((_a), (_b), (_c))
-
-static inline DBTYPE dbi_to_dbtype(DBI_TYPE dbitype)
+/* XXX remap DB3 types back into DB2 types */
+static inline DBTYPE db3_to_dbtype(int dbitype)
 {
     switch(dbitype) {
-    case DBI_BTREE:	return DB_BTREE;
-    case DBI_HASH:	return DB_HASH;
-    case DBI_RECNO:	return DB_RECNO;
+    case 1:	return DB_BTREE;
+    case 2:	return DB_HASH;
+    case 3:	return DB_RECNO;
+    case 4:	return DB_HASH;		/* XXX W2DO? */
+    case 5:	return DB_HASH;		/* XXX W2DO? */
     }
     /*@notreached@*/ return DB_HASH;
 }
 
-static inline /*@observer@*/ /*@null@*/ DB * GetDB(dbiIndex dbi) {
-    return ((DB *)dbi->dbi_db);
-}
-
 #if defined(__USE_DB2) || defined(__USE_DB3)
 #if defined(__USE_DB2)
 static /*@observer@*/ const char * db_strerror(int error)
@@ -82,12 +57,12 @@ static /*@observer@*/ const char * db_strerror(int error)
 	return ("DB_OLDVERSION: Database requires a version upgrade");
     case DB_RUNRECOVERY:
 	return ("DB_RUNRECOVERY: Fatal error, run database recovery");
-#else
+#else	/* __USE_DB3 */
     case DB_LOCK_NOTHELD:
 	return ("DB_LOCK_NOTHELD:");
     case DB_REGISTERED:
 	return ("DB_REGISTERED:");
-#endif
+#endif	/* __USE_DB3 */
     default:
       {
 	/*
@@ -136,82 +111,131 @@ static int cvtdberr(dbiIndex dbi, const char * msg, int error, int printit) {
     return rc;
 }
 
-static int db_init(dbiIndex dbi, const char *home, int dbflags,
-			DB_ENV **dbenvp, void **dbinfop)
+static int db_fini(dbiIndex dbi, const char * dbhome, const char * dbfile,
+		const char * dbsubfile)
+{
+    rpmdb rpmdb = dbi->dbi_rpmdb;
+    DB_ENV * dbenv = (DB_ENV *)dbi->dbi_dbenv;
+
+#if defined(__USE_DB3)
+    char **dbconfig = NULL;
+    int rc;
+
+    if (dbenv == NULL) {
+	dbi->dbi_dbenv = NULL;
+	return 0;
+    }
+
+    rc = dbenv->close(dbenv, 0);
+    rc = cvtdberr(dbi, "dbenv->close", rc, _debug);
+
+    if (dbfile)
+	rpmMessage(RPMMESS_DEBUG, _("closed  db environment %s/%s(%s)\n"),
+		dbhome, dbfile, dbsubfile);
+
+    if (rpmdb->db_remove_env || dbi->dbi_tear_down) {
+	int xx;
+
+	xx = db_env_create(&dbenv, 0);
+	xx = cvtdberr(dbi, "db_env_create", rc, _debug);
+	xx = dbenv->remove(dbenv, dbhome, dbconfig, 0);
+	xx = cvtdberr(dbi, "dbenv->remove", rc, _debug);
+
+	if (dbfile)
+	    rpmMessage(RPMMESS_DEBUG, _("removed db environment %s/%s(%s)\n"),
+		dbhome, dbfile, dbsubfile);
+
+    }
+	
+#else	/* __USE_DB3 */
+    rc = db_appexit(dbenv);
+    rc = cvtdberr(dbi, "db_appexit", rc, _debug);
+    free(dbenv);
+#endif	/* __USE_DB3 */
+    dbi->dbi_dbenv = NULL;
+    return rc;
+}
+
+static int db2_fsync_disable(int fd) {
+    return 0;
+}
+
+static int db_init(dbiIndex dbi, const char *dbhome, const char *dbfile,
+		const char * dbsubfile, DB_ENV **dbenvp)
 {
+    rpmdb rpmdb = dbi->dbi_rpmdb;
     DB_ENV *dbenv = NULL;
-    int mydbopenflags;
+    int eflags;
     int rc;
 
-    if (dbenvp == NULL || dbinfop == NULL)
+    if (dbenvp == NULL)
 	return 1;
-    if (db_errfile == NULL)
-	db_errfile = stderr;
 
-    rc = db_env_create(&dbenv, 0);
+    /* XXX HACK */
+    if (rpmdb->db_errfile == NULL)
+	rpmdb->db_errfile = stderr;
+
+    eflags = (dbi->dbi_oeflags | dbi->dbi_eflags);
+    if ( dbi->dbi_mode & O_CREAT) eflags |= DB_CREATE;
+
+    if (dbfile)
+	rpmMessage(RPMMESS_DEBUG, _("opening db environment %s/%s(%s) %s\n"),
+		dbhome, dbfile, dbsubfile, prDbiOpenFlags(eflags, 1));
+
+    rc = db_env_create(&dbenv, dbi->dbi_cflags);
     rc = cvtdberr(dbi, "db_env_create", rc, _debug);
     if (rc)
 	goto errxit;
 
 #if defined(__USE_DB3)
   { int xx;
-    dbenv->set_errcall(dbenv, db_errcall);
-    dbenv->set_errfile(dbenv, db_errfile);
-    dbenv->set_errpfx(dbenv, db_errpfx);
+    dbenv->set_errcall(dbenv, rpmdb->db_errcall);
+    dbenv->set_errfile(dbenv, rpmdb->db_errfile);
+    dbenv->set_errpfx(dbenv, rpmdb->db_errpfx);
  /* dbenv->set_paniccall(???) */
-    dbenv->set_verbose(dbenv, DB_VERB_CHKPOINT, db_verbose);
-    dbenv->set_verbose(dbenv, DB_VERB_DEADLOCK, db_verbose);
-    dbenv->set_verbose(dbenv, DB_VERB_RECOVERY, db_verbose);
-    dbenv->set_verbose(dbenv, DB_VERB_WAITSFOR, db_verbose);
+    dbenv->set_verbose(dbenv, DB_VERB_CHKPOINT,
+		(dbi->dbi_verbose & DB_VERB_CHKPOINT));
+    dbenv->set_verbose(dbenv, DB_VERB_DEADLOCK,
+		(dbi->dbi_verbose & DB_VERB_DEADLOCK));
+    dbenv->set_verbose(dbenv, DB_VERB_RECOVERY,
+		(dbi->dbi_verbose & DB_VERB_RECOVERY));
+    dbenv->set_verbose(dbenv, DB_VERB_WAITSFOR,
+		(dbi->dbi_verbose & DB_VERB_WAITSFOR));
  /* dbenv->set_lg_max(???) */
  /* dbenv->set_lk_conflicts(???) */
  /* dbenv->set_lk_detect(???) */
  /* dbenv->set_lk_max(???) */
-    xx = dbenv->set_mp_mmapsize(dbenv, dbmp_mmapsize);
+    xx = dbenv->set_mp_mmapsize(dbenv, dbi->dbi_mp_mmapsize);
     xx = cvtdberr(dbi, "dbenv->set_mp_mmapsize", xx, _debug);
-    xx = dbenv->set_cachesize(dbenv, 0, dbmp_size, 0);
+    xx = dbenv->set_cachesize(dbenv, 0, dbi->dbi_mp_size, 0);
     xx = cvtdberr(dbi, "dbenv->set_cachesize", xx, _debug);
  /* dbenv->set_tx_max(???) */
  /* dbenv->set_tx_recover(???) */
+    if (dbi->dbi_no_fsync) {
+	xx = dbenv->set_func_fsync(dbenv, db2_fsync_disable);
+	xx = cvtdberr(dbi, "dbenv->set_func_fsync", xx, _debug);
+    }
   }
-#else
-    dbenv->db_errcall = db_errcall;
-    dbenv->db_errfile = db_errfile;
-    dbenv->db_errpfx = db_errpfx;
-    dbenv->db_verbose = db_verbose;
-    dbenv->mp_mmapsize = dbmp_mmapsize;	/* XXX default is 10 Mb */
-    dbenv->mp_size = dbmp_size;		/* XXX default is 128 Kb */
-#endif
-
-#define _DBFMASK	(DB_CREATE|DB_NOMMAP|DB_THREAD)
-    mydbopenflags = (dbflags & _DBFMASK) | dbopenflags;
+#else	/* __USE_DB3 */
+    dbenv->db_errcall = rpmdb->db_errcall;
+    dbenv->db_errfile = rpmdb->db_errfile;
+    dbenv->db_errpfx = rpmdb->db_errpfx;
+    dbenv->db_verbose = dbi->dbi_verbose;
+    dbenv->mp_mmapsize = dbi->dbi_mp_mmapsize;	/* XXX default is 10 Mb */
+    dbenv->mp_size = dbi->dbi_mp_size;		/* XXX default is 128 Kb */
+#endif	/* __USE_DB3 */
 
 #if defined(__USE_DB3)
-    rc = dbenv->open(dbenv, home, NULL, mydbopenflags, 0);
+    rc = dbenv->open(dbenv, dbhome, NULL, eflags, dbi->dbi_perms);
     rc = cvtdberr(dbi, "dbenv->open", rc, _debug);
     if (rc)
 	goto errxit;
-    *dbinfop = NULL;
-#else
-    rc = db_appinit(home, NULL, dbenv, mydbopenflags);
+#else	/* __USE_DB3 */
+    rc = db_appinit(dbhome, NULL, dbenv, eflags);
     rc = cvtdberr(dbi, "db_appinit", rc, _debug);
     if (rc)
 	goto errxit;
-    {	DB_INFO * dbinfo = xcalloc(1, sizeof(*dbinfo));
-	/* XXX W2DO? */
-	dbinfo->db_cachesize = db_cachesize;
-	dbinfo->db_lorder = db_lorder;
-	dbinfo->db_pagesize = db_pagesize;
-	dbinfo->db_malloc = db_malloc;
-	if (dbflags & DB_CREATE) {
-	    dbinfo->h_ffactor = dbh_ffactor;
-	    dbinfo->h_hash = dbh_hash;
-	    dbinfo->h_nelem = dbh_nelem;
-	    dbinfo->flags = dbh_flags;
-	}
-	*dbinfop = dbinfo;
-     }
-#endif
+#endif	/* __USE_DB3 */
 
     *dbenvp = dbenv;
 
@@ -225,411 +249,518 @@ errxit:
 	xx = dbenv->close(dbenv, 0);
 	xx = cvtdberr(dbi, "dbenv->close", xx, _debug);
     }
-#else
+#else	/* __USE_DB3 */
     if (dbenv)	free(dbenv);
-#endif
+#endif	/* __USE_DB3 */
     return rc;
 }
+
 #endif	/* __USE_DB2 || __USE_DB3 */
 
 static int db2sync(dbiIndex dbi, unsigned int flags)
 {
-    DB * db = GetDB(dbi);
+    DB * db = dbi->dbi_db;
     int rc;
 
 #if defined(__USE_DB2) || defined(__USE_DB3)
+    int _printit;
     rc = db->sync(db, flags);
-    rc = cvtdberr(dbi, "db->sync", rc, _debug);
-#else
+    /* XXX DB_INCOMPLETE is returned occaisionally with multiple access. */
+    _printit = (rc == DB_INCOMPLETE ? 0 : _debug);
+    rc = cvtdberr(dbi, "db->sync", rc, _printit);
+#else	/* __USE_DB2 || __USE_DB3 */
     rc = db->sync(db, flags);
-#endif
+#endif	/* __USE_DB2 || __USE_DB3 */
 
     return rc;
 }
 
-static int db2SearchIndex(dbiIndex dbi, const void * str, size_t len,
-		dbiIndexSet * set)
+static int db2c_del(dbiIndex dbi, DBC * dbcursor, u_int32_t flags)
 {
-    DBT key, data;
-    DB * db = GetDB(dbi);
-    int _printit;
     int rc;
 
-    if (set) *set = NULL;
-    if (len == 0) len = strlen(str);
-    _mymemset(&key, 0, sizeof(key));
-    _mymemset(&data, 0, sizeof(data));
-
-    key.data = (void *)str;
-    key.size = len;
-    data.data = NULL;
-    data.size = 0;
+    rc = dbcursor->c_del(dbcursor, flags);
+    rc = cvtdberr(dbi, "dbcursor->c_del", rc, _debug);
+    return rc;
+}
 
-#if defined(__USE_DB2) || defined(__USE_DB3)
-    rc = db->get(db, NULL, &key, &data, 0);
-    _printit = (rc == DB_NOTFOUND ? 0 : _debug);
-    rc = cvtdberr(dbi, "db->get", rc, _printit);
-#else
-    rc = db->get(db, &key, &data, 0);
-#endif
+static int db2c_dup(dbiIndex dbi, DBC * dbcursor, DBC ** dbcp, u_int32_t flags)
+{
+    int rc;
 
-    if (rc == 0 && set) {
-	DBIR_t dbir = data.data;
-	int i;
-
-	*set = xmalloc(sizeof(**set));
-	(*set)->count = data.size / sizeof(*dbir);
-	(*set)->recs = xmalloc((*set)->count * sizeof(*((*set)->recs)));
-
-	/* Convert to database internal format */
-	for (i = 0; i < (*set)->count; i++) {
-	    /* XXX TODO: swab data */
-	    (*set)->recs[i].recOffset = dbir[i].recOffset;
-	    (*set)->recs[i].fileNumber = dbir[i].fileNumber;
-	    (*set)->recs[i].fpNum = 0;
-	    (*set)->recs[i].dbNum = 0;
-	}
-    }
+    rc = dbcursor->c_dup(dbcursor, dbcp, flags);
+    rc = cvtdberr(dbi, "dbcursor->c_dup", rc, _debug);
     return rc;
 }
 
-/*@-compmempass@*/
-static int db2UpdateIndex(dbiIndex dbi, const char * str, dbiIndexSet set)
+static int db2c_get(dbiIndex dbi, DBC * dbcursor,
+	DBT * key, DBT * data, u_int32_t flags)
 {
-    DBT key;
-    DB * db = GetDB(dbi);
+    int _printit;
     int rc;
+    int rmw;
 
-    _mymemset(&key, 0, sizeof(key));
-    key.data = (void *)str;
-    key.size = strlen(str);
+#ifdef	NOTYET
+    if ((dbi->dbi_eflags & DB_INIT_CDB) &&
+		!(dbi->dbi_oflags & DB_RDONLY) &&
+		!(dbi->dbi_mode & O_RDWR))
+	rmw = DB_RMW;
+    else
+#endif
+	rmw = 0;
 
-    if (set->count) {
-	DBT data;
-	DBIR_t dbir = alloca(set->count * sizeof(*dbir));
-	int i;
+    rc = dbcursor->c_get(dbcursor, key, data, rmw | flags);
 
-	/* Convert to database internal format */
-	for (i = 0; i < set->count; i++) {
-	    /* XXX TODO: swab data */
-	    dbir[i].recOffset = set->recs[i].recOffset;
-	    dbir[i].fileNumber = set->recs[i].fileNumber;
-	}
+    _printit = (rc == DB_NOTFOUND ? 0 : _debug);
+    rc = cvtdberr(dbi, "dbcursor->c_get", rc, _printit);
+    return rc;
+}
 
-	_mymemset(&data, 0, sizeof(data));
-	data.data = dbir;
-	data.size = set->count * sizeof(*dbir);
+static int db2c_put(dbiIndex dbi, DBC * dbcursor,
+	DBT * key, DBT * data, u_int32_t flags)
+{
+    int rc;
 
-#if defined(__USE_DB2) || defined(__USE_DB3)
-	rc = db->put(db, NULL, &key, &data, 0);
-	rc = cvtdberr(dbi, "db->put", rc, _debug);
-#else
-	rc = db->put(db, &key, &data, 0);
-#endif
+    rc = dbcursor->c_put(dbcursor, key, data, flags);
 
-    } else {
+    rc = cvtdberr(dbi, "dbcursor->c_put", rc, _debug);
+    return rc;
+}
 
-#if defined(__USE_DB2) || defined(__USE_DB3)
-	rc = db->del(db, NULL, &key, 0);
-	rc = cvtdberr(dbi, "db->del", rc, _debug);
-#else
-	rc = db->del(db, &key, 0);
-#endif
+static inline int db2c_close(dbiIndex dbi, DBC * dbcursor)
+{
+    int rc;
 
-    }
+    rc = dbcursor->c_close(dbcursor);
+    rc = cvtdberr(dbi, "dbcursor->c_close", rc, _debug);
+    return rc;
+}
+
+static inline int db2c_open(dbiIndex dbi, DBC ** dbcp)
+{
+    DB * db = dbi->dbi_db;
+    DB_TXN * txnid = NULL;
+    int flags;
+    int rc;
+
+#if defined(__USE_DB3)
+    if ((dbi->dbi_eflags & DB_INIT_CDB) &&
+		!(dbi->dbi_oflags & DB_RDONLY) &&
+		!(dbi->dbi_mode & O_RDWR))
+	flags = DB_WRITECURSOR;
+    else
+	flags = 0;
+    rc = db->cursor(db, txnid, dbcp, flags);
+#else	/* __USE_DB3 */
+    rc = db->cursor(db, txnid, dbcp);
+#endif	/* __USE_DB3 */
+    rc = cvtdberr(dbi, "db2copen", rc, _debug);
 
     return rc;
 }
-/*@=compmempass@*/
 
-static int db2copen(dbiIndex dbi) {
-    DBC * dbcursor;
+static int db2cclose(dbiIndex dbi, DBC * dbcursor, unsigned int flags)
+{
     int rc = 0;
 
-    if ((dbcursor = dbi->dbi_dbcursor) == NULL) {
-	DB * db = GetDB(dbi);
-	DB_TXN * txnid = NULL;
-
-#if defined(__USE_DB3)
-	rc = db->cursor(db, txnid, &dbcursor, 0);
-#else
-	rc = db->cursor(db, txnid, &dbcursor);
-#endif
-	rc = cvtdberr(dbi, "db->cursor", rc, _debug);
-	if (rc == 0)
-	    dbi->dbi_dbcursor = dbcursor;
+    if (dbcursor == NULL)
+	dbcursor = dbi->dbi_rmw;
+    if (dbcursor) {
+	rc = db2c_close(dbi, dbcursor);
+	if (dbcursor == dbi->dbi_rmw)
+	    dbi->dbi_rmw = NULL;
     }
-    dbi->dbi_lastoffset = 0;
     return rc;
 }
 
-static int db2cclose(dbiIndex dbi) {
+static int db2copen(dbiIndex dbi, DBC ** dbcp, unsigned int flags)
+{
     DBC * dbcursor;
     int rc = 0;
 
-    if ((dbcursor = dbi->dbi_dbcursor) != NULL) {
-	rc = dbcursor->c_close(dbcursor);
-	rc = cvtdberr(dbi, "dbcursor->c_close", rc, _debug);
-	dbi->dbi_dbcursor = NULL;
+    if ((dbcursor = dbi->dbi_rmw) != NULL) {
+	if (dbcp) *dbcp = dbi->dbi_rmw;
+	return 0;
+    } else if ((rc = db2c_open(dbi, &dbcursor)) == 0) {
+	dbi->dbi_rmw = dbcursor;
     }
-    dbi->dbi_lastoffset = 0;
-    return rc;
-}
 
-static int db2join(dbiIndex dbi) {
-    int rc = 1;
+    if (dbcp)
+	*dbcp = dbcursor;
+
     return rc;
 }
 
-static int db2cget(dbiIndex dbi, void ** keyp, size_t * keylen,
-                void ** datap, size_t * datalen)
+static int db2cput(dbiIndex dbi, const void * keyp, size_t keylen,
+		const void * datap, size_t datalen, unsigned int flags)
 {
+    DB * db = dbi->dbi_db;
+    DB_TXN * txnid = NULL;
     DBT key, data;
-    DB * db;
     int rc;
 
-    if (dbi == NULL || dbi->dbi_db == NULL)
-	return 1;
-
-    db = GetDB(dbi);
-    _mymemset(&key, 0, sizeof(key));
-    _mymemset(&data, 0, sizeof(data));
-
-    key.data = NULL;
-    key.size = 0;
+    memset(&key, 0, sizeof(key));
+    memset(&data, 0, sizeof(data));
+    key.data = (void *)keyp;
+    key.size = keylen;
+    data.data = (void *)datap;
+    data.size = datalen;
 
-#if defined(__USE_DB2)
-    {	DBC * dbcursor;
-	int xx;
+    if (!dbi->dbi_use_cursors) {
+	rc = db->put(db, txnid, &key, &data, 0);
+	rc = cvtdberr(dbi, "db->put", rc, _debug);
+    } else {
+	DBC * dbcursor;
 
-	if ((dbcursor = dbi->dbi_dbcursor) == NULL) {
-	    rc = db2copen(dbi);
-	    if (rc)
-		return rc;
-	    dbcursor = dbi->dbi_dbcursor;
-	}
+	if ((rc = db2copen(dbi, &dbcursor, 0)) != 0)
+	    return rc;
 
-	/* XXX W2DO? db2 does DB_FIRST on uninitialized cursor ??? */
-	rc = dbcursor->c_get(dbcursor, &key, &data,
-			(dbi->dbi_lastoffset++ ? DB_NEXT : DB_FIRST));
-	if (rc == DB_NOTFOUND)
-	    xx = db2cclose(dbi);
-	rc = cvtdberr(dbi, "dbcursor->c_get", rc, _debug);
+	rc = db2c_put(dbi, dbcursor, &key, &data, DB_KEYLAST);
 
-	if (rc == 0) {
-	    if (keyp)
-		*keyp = key.data;
-	    if (keylen)
-		*keylen = key.size;
-	    if (datap)
-		*datap = data.data;
-	    if (datalen)
-		*datalen = data.size;
-	}
+	(void) db2cclose(dbi, dbcursor, 0);
     }
-#else
-    rc = db->seq(db, &key, &data, (dbi->dbi_lastoffset++ ? R_NEXT : R_FIRST));
-
-    switch (rc) {
-    default:
-    case RET_ERROR:	/* -1 */
-    case RET_SPECIAL:	/* 1 */
-	rc = 1;
-	if (keyp)
-	    *keyp = NULL;
-	break;
-    case RET_SUCCESS:	/* 0 */
-	rc = 0;
-	if (keyp)
-	    *keyp = key.data;
-	break;
-    }
-#endif
 
     return rc;
 }
-static int db2del(dbiIndex dbi, void * keyp, size_t keylen)
+
+static int db2cdel(dbiIndex dbi, const void * keyp, size_t keylen, unsigned int flags)
 {
+    DB * db = dbi->dbi_db;
     DB_TXN * txnid = NULL;
-    DBT key;
-    DB * db = GetDB(dbi);
+    DBT key, data;
     int rc;
 
-    _mymemset(&key, 0, sizeof(key));
+    memset(&key, 0, sizeof(key));
+    memset(&data, 0, sizeof(data));
 
-    key.data = keyp;
+    key.data = (void *)keyp;
     key.size = keylen;
 
-    rc = db->del(db, txnid, &key, 0);
-    rc = cvtdberr(dbi, "db->del", rc, _debug);
+    if (!dbi->dbi_use_cursors) {
+	rc = db->del(db, txnid, &key, 0);
+	rc = cvtdberr(dbi, "db->del", rc, _debug);
+    } else {
+	DBC * dbcursor;
+
+	if ((rc = db2copen(dbi, &dbcursor, 0)) != 0)
+	    return rc;
+
+	rc = db2c_get(dbi, dbcursor, &key, &data, DB_SET);
+
+	if (rc == 0) {
+	    /* XXX TODO: loop over duplicates */
+	    rc = db2c_del(dbi, dbcursor, 0);
+	}
+
+	(void) db2c_close(dbi, dbcursor);
+
+    }
 
     return rc;
 }
 
-static int db2get(dbiIndex dbi, void * keyp, size_t keylen,
-		void ** datap, size_t * datalen)
+static int db2cget(dbiIndex dbi, void ** keyp, size_t * keylen,
+		void ** datap, size_t * datalen, unsigned int flags)
 {
+    DB * db = dbi->dbi_db;
     DB_TXN * txnid = NULL;
     DBT key, data;
-    DB * db = GetDB(dbi);
     int rc;
 
-    if (datap) *datap = NULL;
-    if (datalen) *datalen = 0;
-    _mymemset(&key, 0, sizeof(key));
-    _mymemset(&data, 0, sizeof(data));
+    memset(&key, 0, sizeof(key));
+    memset(&data, 0, sizeof(data));
+    if (keyp)		key.data = *keyp;
+    if (keylen)		key.size = *keylen;
+    if (datap)		data.data = *datap;
+    if (datalen)	data.size = *datalen;
+
+    if (!dbi->dbi_use_cursors) {
+	int _printit;
+	rc = db->get(db, txnid, &key, &data, 0);
+	_printit = (rc == DB_NOTFOUND ? 0 : _debug);
+	rc = cvtdberr(dbi, "db->get", rc, _printit);
+    } else {
+	DBC * dbcursor;
 
-    key.data = keyp;
-    key.size = keylen;
-    data.data = NULL;
-    data.size = 0;
+	if ((rc = db2copen(dbi, &dbcursor, 0)) != 0)
+	    return rc;
+
+	/* XXX W2DO? db2 does DB_FIRST on uninitialized cursor? */
+	rc = db2c_get(dbi, dbcursor, &key, &data,
+		key.data == NULL ? DB_NEXT : DB_SET);
 
-    rc = db->get(db, txnid, &key, &data, 0);
-    rc = cvtdberr(dbi, "db->get", rc, _debug);
+	if (rc > 0)	/* DB_NOTFOUND */
+	    (void) db2cclose(dbi, dbcursor, 0);
+    }
 
     if (rc == 0) {
-	*datap = data.data;
-	*datalen = data.size;
+	if (keyp)	*keyp = key.data;
+	if (keylen)	*keylen = key.size;
+	if (datap)	*datap = data.data;
+	if (datalen)	*datalen = data.size;
     }
 
     return rc;
 }
 
-static int db2put(dbiIndex dbi, void * keyp, size_t keylen,
-		void * datap, size_t datalen)
+static int db2byteswapped(dbiIndex dbi)
 {
-    DB_TXN * txnid = NULL;
-    DBT key, data;
-    DB * db = GetDB(dbi);
-    int rc;
-
-    _mymemset(&key, 0, sizeof(key));
-    _mymemset(&data, 0, sizeof(data));
-
-    key.data = keyp;
-    key.size = keylen;
-    data.data = datap;
-    data.size = datalen;
+    DB * db = dbi->dbi_db;
+    int rc = 0;
 
-    rc = db->put(db, txnid, &key, &data, 0);
-    rc = cvtdberr(dbi, "db->get", rc, _debug);
+#if defined(__USE_DB3)
+    rc = db->get_byteswapped(db);
+#endif	/* __USE_DB3 */
 
     return rc;
 }
 
 static int db2close(dbiIndex dbi, unsigned int flags)
 {
-    DB * db = GetDB(dbi);
+    rpmdb rpmdb = dbi->dbi_rpmdb;
+    const char * urlfn = NULL;
+    const char * dbhome;
+    const char * dbfile;
+    const char * dbsubfile;
+    DB * db = dbi->dbi_db;
     int rc = 0, xx;
 
+    urlfn = rpmGenPath(
+	(dbi->dbi_root ? dbi->dbi_root : rpmdb->db_root),
+	(dbi->dbi_home ? dbi->dbi_home : rpmdb->db_home),
+	NULL);
+    (void) urlPath(urlfn, &dbhome);
+    if (dbi->dbi_temporary) {
+	dbfile = NULL;
+	dbsubfile = NULL;
+    } else {
+#ifdef	HACK
+	dbfile = (dbi->dbi_file ? dbi->dbi_file : db2basename);
+	dbsubfile = (dbi->dbi_subfile ? dbi->dbi_subfile : tagName(dbi->dbi_rpmtag));
+#else
+	dbfile = (dbi->dbi_file ? dbi->dbi_file : tagName(dbi->dbi_rpmtag));
+	dbsubfile = NULL;
+#endif
+    }
+
 #if defined(__USE_DB2) || defined(__USE_DB3)
 
-    if (dbi->dbi_dbcursor) {
-	DBC * dbcursor = (DBC *)dbi->dbi_dbcursor;
-	xx = dbcursor->c_close(dbcursor);
-	xx = cvtdberr(dbi, "dbcursor->c_close", xx, _debug);
-	dbi->dbi_dbcursor = NULL;
-    }
+    if (dbi->dbi_rmw)
+	db2cclose(dbi, NULL, 0);
 
     if (db) {
 	rc = db->close(db, 0);
 	rc = cvtdberr(dbi, "db->close", rc, _debug);
 	db = dbi->dbi_db = NULL;
+
+	if (dbfile)
+	    rpmMessage(RPMMESS_DEBUG, _("closed  db index       %s/%s(%s)\n"),
+		dbhome, dbfile, dbsubfile);
+
     }
 
     if (dbi->dbi_dbinfo) {
 	free(dbi->dbi_dbinfo);
 	dbi->dbi_dbinfo = NULL;
     }
-    if (dbi->dbi_dbenv) {
-	DB_ENV * dbenv = (DB_ENV *)dbi->dbi_dbenv;
-#if defined(__USE_DB3)
-	xx = dbenv->close(dbenv, 0);
-	xx = cvtdberr(dbi, "dbenv->close", xx, _debug);
-#else
-	xx = db_appexit(dbenv);
-	xx = cvtdberr(dbi, "db_appexit", xx, _debug);
-	free(dbi->dbi_dbenv);
-#endif
-	dbi->dbi_dbenv = NULL;
-    }
-#else
+
+    xx = db_fini(dbi, dbhome, dbfile, dbsubfile);
+
+#else	/* __USE_DB2 || __USE_DB3 */
+
     rc = db->close(db);
-#endif
+
+#endif	/* __USE_DB2 || __USE_DB3 */
     dbi->dbi_db = NULL;
 
+    if (urlfn)
+	xfree(urlfn);
+
+    db2Free(dbi);
+
     return rc;
 }
 
-static int db2open(dbiIndex dbi)
+static int db2open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 {
+    const char * urlfn = NULL;
+    const char * dbhome;
+    const char * dbfile;
+    const char * dbsubfile;
+    dbiIndex dbi = NULL;
     int rc = 0;
 
 #if defined(__USE_DB2) || defined(__USE_DB3)
-    char * dbhome = NULL;
-    char * dbfile = NULL;
     DB * db = NULL;
     DB_ENV * dbenv = NULL;
-    void * dbinfo = NULL;
-    u_int32_t dbflags;
+    DB_TXN * txnid = NULL;
+    u_int32_t oflags;
 
-    dbhome = alloca(strlen(dbi->dbi_file) + 1);
-    strcpy(dbhome, dbi->dbi_file);
-    dbfile = strrchr(dbhome, '/');
-    if (dbfile)
-	*dbfile++ = '\0';
-    else
-	dbfile = dbhome;
+    if (dbip)
+	*dbip = NULL;
+    if ((dbi = db3New(rpmdb, rpmtag)) == NULL)
+	return 1;
+    dbi->dbi_major = DB_VERSION_MAJOR;
+
+    urlfn = rpmGenPath(
+	(dbi->dbi_root ? dbi->dbi_root : rpmdb->db_root),
+	(dbi->dbi_home ? dbi->dbi_home : rpmdb->db_home),
+	NULL);
+    (void) urlPath(urlfn, &dbhome);
+    if (dbi->dbi_temporary) {
+	dbfile = NULL;
+	dbsubfile = NULL;
+    } else {
+#ifdef	HACK
+	dbfile = (dbi->dbi_file ? dbi->dbi_file : db2basename);
+	dbsubfile = (dbi->dbi_subfile ? dbi->dbi_subfile : tagName(dbi->dbi_rpmtag));
+#else
+	dbfile = (dbi->dbi_file ? dbi->dbi_file : tagName(dbi->dbi_rpmtag));
+	dbsubfile = NULL;
+#endif
+    }
+
+    oflags = (dbi->dbi_oeflags | dbi->dbi_oflags);
+#if 0	/* XXX rpmdb: illegal flag combination specified to DB->open */
+    if ( dbi->dbi_mode & O_EXCL) oflags |= DB_EXCL;
+#endif
+    if(!(dbi->dbi_mode & O_RDWR)) oflags |= DB_RDONLY;
+    if ( dbi->dbi_mode & O_CREAT) oflags |= DB_CREATE;
+    if ( dbi->dbi_mode & O_TRUNC) oflags |= DB_TRUNCATE;
 
-    dbflags = (	!(dbi->dbi_mode & O_RDWR) ? DB_RDONLY :
-		((dbi->dbi_mode & O_CREAT) ? DB_CREATE : 0));
+    rc = db_init(dbi, dbhome, dbfile, dbsubfile, &dbenv);
+    dbi->dbi_dbinfo = NULL;
 
-    rc = db_init(dbi, dbhome, dbflags, &dbenv, &dbinfo);
+    if (dbfile)
+	rpmMessage(RPMMESS_DEBUG, _("opening db index       %s/%s(%s) %s mode=0x%x\n"),
+		dbhome, dbfile, dbsubfile, prDbiOpenFlags(oflags, 0), dbi->dbi_mode);
 
     if (rc == 0) {
 #if defined(__USE_DB3)
-	rc = db_create(&db, dbenv, 0);
+	rc = db_create(&db, dbenv, dbi->dbi_cflags);
 	rc = cvtdberr(dbi, "db_create", rc, _debug);
 	if (rc == 0) {
-	    if (db_pagesize) {
-		rc = db->set_pagesize(db, db_pagesize);
+	    if (dbi->dbi_lorder) {
+		rc = db->set_lorder(db, dbi->dbi_lorder);
+		rc = cvtdberr(dbi, "db->set_lorder", rc, _debug);
+	    }
+	    if (dbi->dbi_cachesize) {
+		rc = db->set_cachesize(db, 0, dbi->dbi_cachesize, 0);
+		rc = cvtdberr(dbi, "db->set_cachesize", rc, _debug);
+	    }
+	    if (dbi->dbi_pagesize) {
+		rc = db->set_pagesize(db, dbi->dbi_pagesize);
 		rc = cvtdberr(dbi, "db->set_pagesize", rc, _debug);
 	    }
-	    rc = db->open(db, dbfile, NULL, dbi_to_dbtype(dbi->dbi_type),
-			dbflags, dbi->dbi_perms);
+	    if (rpmdb->db_malloc) {
+		rc = db->set_malloc(db, rpmdb->db_malloc);
+		rc = cvtdberr(dbi, "db->set_malloc", rc, _debug);
+	    }
+	    if (oflags & DB_CREATE) {
+		switch(dbi->dbi_type) {
+		default:
+		case DB_HASH:
+		    if (dbi->dbi_h_ffactor) {
+			rc = db->set_h_ffactor(db, dbi->dbi_h_ffactor);
+			rc = cvtdberr(dbi, "db->set_h_ffactor", rc, _debug);
+		    }
+		    if (dbi->dbi_h_hash_fcn) {
+			rc = db->set_h_hash(db, dbi->dbi_h_hash_fcn);
+			rc = cvtdberr(dbi, "db->set_h_hash", rc, _debug);
+		    }
+		    if (dbi->dbi_h_nelem) {
+			rc = db->set_h_nelem(db, dbi->dbi_h_nelem);
+			rc = cvtdberr(dbi, "db->set_h_nelem", rc, _debug);
+		    }
+		    if (dbi->dbi_h_flags) {
+			rc = db->set_flags(db, dbi->dbi_h_flags);
+			rc = cvtdberr(dbi, "db->set_h_flags", rc, _debug);
+		    }
+		    if (dbi->dbi_h_dup_compare_fcn) {
+			rc = db->set_dup_compare(db, dbi->dbi_h_dup_compare_fcn);
+			rc = cvtdberr(dbi, "db->set_dup_compare", rc, _debug);
+		    }
+		    break;
+		case DB_BTREE:
+		case DB_RECNO:
+		case DB_QUEUE:
+		    break;
+		}
+	    }
+	    dbi->dbi_dbinfo = NULL;
+
+	    rc = db->open(db, dbfile, dbsubfile,
+		    dbi->dbi_type, oflags, dbi->dbi_perms);
 	    rc = cvtdberr(dbi, "db->open", rc, _debug);
+
+	    if (dbi->dbi_get_rmw_cursor) {
+		DBC * dbcursor = NULL;
+		int xx;
+		xx = db->cursor(db, txnid, &dbcursor,
+			((oflags & DB_RDONLY) ? 0 : DB_WRITECURSOR));
+		xx = cvtdberr(dbi, "db->cursor", xx, _debug);
+		dbi->dbi_rmw = dbcursor;
+	    } else
+		dbi->dbi_rmw = NULL;
 	}
 #else
-	rc = db_open(dbfile, dbi_to_dbtype(dbi->dbi_type), dbflags,
+      {	DB_INFO * dbinfo = xcalloc(1, sizeof(*dbinfo));
+	dbinfo->db_cachesize = dbi->dbi_cachesize;
+	dbinfo->db_lorder = dbi->dbi_lorder;
+	dbinfo->db_pagesize = dbi->dbi_pagesize;
+	dbinfo->db_malloc = rpmdb->db_malloc;
+	if (oflags & DB_CREATE) {
+	    switch(db3_to_dbtype(dbi->dbi_type)) {
+	    default:
+	    case DB_HASH:
+		dbinfo->h_ffactor = dbi->dbi_h_ffactor;
+		dbinfo->h_hash = dbi->dbi_h_hash_fcn;
+		dbinfo->h_nelem = dbi->dbi_h_nelem;
+		dbinfo->flags = dbi->dbi_h_flags;
+		break;
+	    }
+	}
+	dbi->dbi_dbinfo = dbinfo;
+	rc = db_open(dbfile, db3_to_dbtype(dbi->dbi_type), oflags,
 			dbi->dbi_perms, dbenv, dbinfo, &db);
 	rc = cvtdberr(dbi, "db_open", rc, _debug);
+      }
 #endif	/* __USE_DB3 */
     }
 
     dbi->dbi_db = db;
     dbi->dbi_dbenv = dbenv;
-    dbi->dbi_dbinfo = dbinfo;
 
-#else
+#else	/* __USE_DB2 || __USE_DB3 */
     void * dbopeninfo = NULL;
+
+    if (dbip)
+	*dbip = NULL;
+    if ((dbi = db2New(rpmdb, rpmtag)) == NULL)
+	return 1;
+
     dbi->dbi_db = dbopen(dbfile, dbi->dbi_mode, dbi->dbi_perms,
-		dbi_to_dbtype(dbi->dbi_type), dbopeninfo);
+		db3_to_dbtype(dbi->dbi_type), dbopeninfo);
 #endif	/* __USE_DB2 || __USE_DB3 */
 
-    if (rc == 0 && dbi->dbi_db != NULL) {
+    if (rc == 0 && dbi->dbi_db != NULL && dbip != NULL) {
 	rc = 0;
-fprintf(stderr, "*** db%dopen: %s\n", dbi->dbi_major, dbfile);
+	*dbip = dbi;
     } else {
 	rc = 1;
+	db3Free(dbi);
     }
 
+    if (urlfn)
+	xfree(urlfn);
+
     return rc;
 }
 
 struct _dbiVec db2vec = {
     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
-    db2open, db2close, db2sync, db2SearchIndex, db2UpdateIndex,
-    db2del, db2get, db2put, db2copen, db2cclose, db2join, db2cget
+    db2open, db2close, db2sync, db2copen, db2cclose, db2cdel, db2cget, db2cput,
+    db2byteswapped
 };
 
 #endif	/* DB_VERSION_MAJOR == 2 */
diff --git a/lib/db3.c b/lib/db3.c
index 35d5268..c3e4cc9 100644
--- a/lib/db3.c
+++ b/lib/db3.c
@@ -82,7 +82,10 @@ struct dbOption rdbOptions[] = {
  { "usecursors",POPT_ARG_NONE,		&db3dbi.dbi_use_cursors, 0 },
  { "rmwcursor",	POPT_ARG_NONE,		&db3dbi.dbi_get_rmw_cursor, 0 },
  { "nofsync",	POPT_ARG_NONE,		&db3dbi.dbi_no_fsync, 0 },
+ { "nodbsync",	POPT_ARG_NONE,		&db3dbi.dbi_no_dbsync, 0 },
+ { "lockdbfd",	POPT_ARG_NONE,		&db3dbi.dbi_lockdbfd, 0 },
  { "temporary",	POPT_ARG_NONE,		&db3dbi.dbi_temporary, 0 },
+ { "debug",	POPT_ARG_NONE,		&db3dbi.dbi_debug, 0 },
 
  { "cachesize",	POPT_ARG_INT,		&db3dbi.dbi_cachesize, 0 },
  { "errpfx",	POPT_ARG_STRING,	&db3dbi.dbi_errpfx, 0 },
@@ -197,7 +200,8 @@ void db3Free(dbiIndex dbi) {
     }
 }
 
-static const char *_dbi_config_default = "create:mpool:hash:perms=0644:teardown";
+static const char *db3_config_default =
+    "db3:hash:mpool:cdb:usecursors:verbose:mp_mmapsize=8Mb:mp_size=512Kb:pagesize=512:perms=0644";
 
 dbiIndex db3New(rpmdb rpmdb, int rpmtag)
 {
@@ -214,7 +218,7 @@ dbiIndex db3New(rpmdb rpmdb, int rpmtag)
 	}
 	dbOpts = rpmExpand("%{_dbi_config}", NULL);
 	if (!(dbOpts && *dbOpts && *dbOpts != '%')) {
-	    dbOpts = xstrdup(_dbi_config_default);
+	    dbOpts = rpmExpand(db3_config_default, NULL);
 	}
     }
 
@@ -624,9 +628,7 @@ static int db3c_get(dbiIndex dbi, DBC * dbcursor,
     int rmw;
 
 #ifdef	NOTYET
-    if ((dbi->dbi_eflags & DB_INIT_CDB) &&
-		!(dbi->dbi_oflags & DB_RDONLY) &&
-		!(dbi->dbi_mode & O_RDWR))
+    if ((dbi->dbi_eflags & DB_INIT_CDB) && !(dbi->dbi_oflags & DB_RDONLY))
 	rmw = DB_RMW;
     else
 #endif
@@ -667,9 +669,7 @@ static inline int db3c_open(dbiIndex dbi, DBC ** dbcp)
     int rc;
 
 #if defined(__USE_DB3)
-    if ((dbi->dbi_eflags & DB_INIT_CDB) &&
-		!(dbi->dbi_oflags & DB_RDONLY) &&
-		!(dbi->dbi_mode & O_RDWR))
+    if ((dbi->dbi_eflags & DB_INIT_CDB) && !(dbi->dbi_oflags & DB_RDONLY))
 	flags = DB_WRITECURSOR;
     else
 	flags = 0;
@@ -693,6 +693,7 @@ static int db3cclose(dbiIndex dbi, DBC * dbcursor, unsigned int flags)
 	if (dbcursor == dbi->dbi_rmw)
 	    dbi->dbi_rmw = NULL;
     }
+    if (dbi->dbi_debug) fprintf(stderr, "db3cclose: rc %d rmw %p\n", rc, dbi->dbi_rmw);
     return rc;
 }
 
@@ -701,16 +702,15 @@ static int db3copen(dbiIndex dbi, DBC ** dbcp, unsigned int flags)
     DBC * dbcursor;
     int rc = 0;
 
-    if ((dbcursor = dbi->dbi_rmw) != NULL) {
-	if (dbcp) *dbcp = dbi->dbi_rmw;
-	return 0;
-    } else if ((rc = db3c_open(dbi, &dbcursor)) == 0) {
-	dbi->dbi_rmw = dbcursor;
+    if ((dbcursor = dbi->dbi_rmw) == NULL) {
+	if ((rc = db3c_open(dbi, &dbcursor)) == 0)
+	    dbi->dbi_rmw = dbcursor;
     }
 
     if (dbcp)
-	*dbcp = dbcursor;
+	*dbcp = dbi->dbi_rmw;
 
+    if (dbi->dbi_debug) fprintf(stderr, "db3copen: rc %d dbc %p 0x%x rmw %p\n", rc, dbcursor, (dbcursor ? dbcursor->flags : 0), dbi->dbi_rmw);
     return rc;
 }
 
@@ -1024,6 +1024,33 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 		dbi->dbi_rmw = dbcursor;
 	    } else
 		dbi->dbi_rmw = NULL;
+
+	    if (dbi->dbi_lockdbfd) {
+		int fdno = -1;
+
+		if (!(db->fd(db, &fdno) == 0 && fdno >= 0)) {
+		    rc = 1;
+		} else {
+		    struct flock l;
+		    l.l_whence = 0;
+		    l.l_start = 0;
+		    l.l_len = 0;
+		    l.l_type = (dbi->dbi_mode & O_RDWR) ? F_WRLCK : F_RDLCK;
+
+		    if (fcntl(fdno, F_SETLK, (void *) &l)) {
+			rpmError(RPMERR_FLOCK,
+				_("cannot get %s lock on %s/%s(%s)\n"),
+				((dbi->dbi_mode & O_RDWR)
+					? _("exclusive") : _("shared")),
+				dbhome, dbfile, dbsubfile);
+			rc = 1;
+		    } else if (dbfile) {
+			rpmMessage(RPMMESS_VERBOSE,
+				_("locked  db index       %s/%s(%s)\n"),
+				dbhome, dbfile, dbsubfile);
+		    }
+		}
+	    }
 	}
 #else
       {	DB_INFO * dbinfo = xcalloc(1, sizeof(*dbinfo));
@@ -1070,7 +1097,7 @@ static int db3open(rpmdb rpmdb, int rpmtag, dbiIndex * dbip)
 	*dbip = dbi;
     } else {
 	rc = 1;
-	db3Free(dbi);
+	db3close(dbi, 0);
     }
 
     if (urlfn)
diff --git a/lib/md5.h b/lib/md5.h
index 51bb6b6..f126d3c 100644
--- a/lib/md5.h
+++ b/lib/md5.h
@@ -1,11 +1,9 @@
 #ifndef MD5_H
 #define MD5_H
 
-#ifdef __alpha
-typedef unsigned int uint32;
-#else
-typedef unsigned long uint32;
-#endif
+#include <sys/types.h>
+
+typedef u_int32_t uint32;
 
 struct MD5Context {
 	uint32 buf[4];
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 09ab372..5803efb 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -104,14 +104,12 @@ static void dbiTagsInit(void)
     free(dbiTagStr);
 }
 
-#if USE_DB0
-extern struct _dbiVec db0vec;
-#define	DB0vec		&db0vec
+#if USE_DB1
+extern struct _dbiVec db1vec;
+#define	DB1vec		&db1vec
 #else
-#define	DB0vec		NULL
-#endif
-
 #define	DB1vec		NULL
+#endif
 
 #if USE_DB2
 extern struct _dbiVec db2vec;
@@ -128,7 +126,7 @@ extern struct _dbiVec db3vec;
 #endif
 
 static struct _dbiVec *mydbvecs[] = {
-    DB0vec, DB1vec, DB2vec, DB3vec, NULL
+    DB1vec, DB1vec, DB2vec, DB3vec, NULL
 };
 
 inline int dbiSync(dbiIndex dbi, unsigned int flags) {
@@ -196,6 +194,12 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, unsigned int flags)
     case 1:
     case 0:
 	if (mydbvecs[major] == NULL) {
+		fprintf(stderr, _("\n\
+--> This version of rpm was not compiled with support for db%d. Please\
+    verify the setting of the macro %%_dbapi using \"rpm --showrc\" and\
+    correct your configuration.\
+\n\
+"));
 	   rc = 1;
 	   break;
 	}
@@ -206,7 +210,7 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, unsigned int flags)
 	break;
     case -1:
 	major = 4;
-	while (major-- > 0) {
+	while (major-- > 1) {
 	    if (mydbvecs[major] == NULL)
 		continue;
 	    errno = 0;
@@ -216,7 +220,6 @@ dbiIndex dbiOpen(rpmdb rpmdb, int rpmtag, unsigned int flags)
 		break;
 	    }
 	    if (rc == 1 && major == 3) {
-		fprintf(stderr, "*** FIXME: <message about how to convert db>\n");
 		fprintf(stderr, _("\n\
 --> Please run \"rpm --rebuilddb\" as root to convert your database from\n\
     db1 to db3 on-disk format.\n\
@@ -542,7 +545,7 @@ static struct rpmdb_s dbTemplate = {
 };
 
 /* XXX query.c, rpminstall.c, verify.c */
-void rpmdbClose (rpmdb rpmdb)
+int rpmdbClose (rpmdb rpmdb)
 {
     int dbix;
 
@@ -569,6 +572,19 @@ void rpmdbClose (rpmdb rpmdb)
 	rpmdb->_dbi = NULL;
     }
     free(rpmdb);
+    return 0;
+}
+
+int rpmdbSync(rpmdb rpmdb)
+{
+    int dbix;
+
+    for (dbix = 0; dbix < rpmdb->db_ndbi; dbix++) {
+	if (rpmdb->_dbi[dbix] == NULL)
+	    continue;
+    	dbiSync(rpmdb->_dbi[dbix], 0);
+    }
+    return 0;
 }
 
 static /*@only@*/ rpmdb newRpmdb(const char * root, const char * home,
@@ -658,17 +674,17 @@ static int openDatabase(const char * prefix, const char * dbpath, rpmdb *dbp,
 	    }
 
 	    dbi = dbiOpen(rpmdb, rpmtag, 0);
-	    if (dbi == NULL)
-		continue;
 
 	    switch (rpmtag) {
 	    case RPMDBI_PACKAGES:
+		if (dbi == NULL) rc |= 1;
 #if 0
 		if (rpmdb->db_major == 3)
 #endif
 		    goto exit;
 		break;
 	    case RPMTAG_NAME:
+		if (dbi == NULL) rc |= 1;
 		if (minimal)
 		    goto exit;
 		break;
@@ -1044,6 +1060,7 @@ static int dbiUpdateRecord(dbiIndex dbi, int offset, Header h)
     void * uh;
     size_t uhlen;
     int rc;
+    int xx;
 
     if (_noDirTokens)
 	expandFilelist(h);
@@ -1052,6 +1069,7 @@ static int dbiUpdateRecord(dbiIndex dbi, int offset, Header h)
     uh = headerUnload(h);
     blockSignals(dbi->dbi_rpmdb, &signalMask);
     rc = dbiPut(dbi, &offset, sizeof(offset), uh, uhlen, 0);
+    xx = dbiSync(dbi, 0);
     unblockSignals(dbi->dbi_rpmdb, &signalMask);
     free(uh);
 
@@ -1508,7 +1526,9 @@ int rpmdbRemove(rpmdb rpmdb, unsigned int offset, int tolerant)
 		xx = dbiCopen(dbi, NULL, 0);
 		xx = dbiDel(dbi, &offset, sizeof(offset), 0);
 		xx = dbiCclose(dbi, NULL, 0);
-		xx = dbiSync(dbi, 0);
+		/* XXX HACK sync is on the bt with multiple db access */
+		if (!dbi->dbi_no_dbsync)
+		    xx = dbiSync(dbi, 0);
 		continue;
 		/*@notreached@*/ break;
 	    }
@@ -1564,7 +1584,9 @@ int rpmdbRemove(rpmdb rpmdb, unsigned int offset, int tolerant)
 	    }
 	    xx = dbiCclose(dbi, NULL, 0);
 
-	    dbiSync(dbi, 0);
+	    /* XXX HACK sync is on the bt with multiple db access */
+	    if (!dbi->dbi_no_dbsync)
+		xx = dbiSync(dbi, 0);
 
 	    switch (rpmtype) {
 	    case RPM_STRING_ARRAY_TYPE:
@@ -1678,6 +1700,7 @@ int rpmdbAdd(rpmdb rpmdb, Header h)
 	}
 
 	rc = dbiPut(dbi, keyp, keylen, datap, datalen, 0);
+	xx = dbiSync(dbi, 0);
 
 	xx = dbiCclose(dbi, NULL, 0);
 
@@ -1710,7 +1733,8 @@ int rpmdbAdd(rpmdb rpmdb, Header h)
 		xx = dbiCopen(dbi, NULL, 0);
 		xx = dbiUpdateRecord(dbi, offset, h);
 		xx = dbiCclose(dbi, NULL, 0);
-		xx = dbiSync(dbi, 0);
+		if (!dbi->dbi_no_dbsync)
+		    xx = dbiSync(dbi, 0);
 		{   const char *n, *v, *r;
 		    headerNVR(h, &n, &v, &r);
 		    rpmMessage(RPMMESS_VERBOSE, "  +++ %10d %s-%s-%s\n", offset, n, v, r);
@@ -1785,7 +1809,9 @@ int rpmdbAdd(rpmdb rpmdb, Header h)
 	    }
 	    xx = dbiCclose(dbi, NULL, 0);
 
-	    dbiSync(dbi, 0);
+	    /* XXX HACK sync is on the bt with multiple db access */
+	    if (!dbi->dbi_no_dbsync)
+		xx = dbiSync(dbi, 0);
 
 	    switch (rpmtype) {
 	    case RPM_STRING_ARRAY_TYPE:
@@ -1829,7 +1855,7 @@ static void rpmdbRemoveDatabase(const char * rootdir, const char * dbpath)
     {	int i;
 
 	for (i = 0; i < dbiTagsMax; i++) {
-	    const char * base = db0basename(dbiTags[i]);
+	    const char * base = db1basename(dbiTags[i]);
 	    sprintf(filename, "%s/%s/%s", rootdir, dbpath, base);
 	    unlink(filename);
 	    xfree(base);
@@ -1909,7 +1935,7 @@ static int rpmdbMoveDatabase(const char * rootdir, const char * olddbpath,
     case 0:
       {	int i;
 	for (i = 0; i < dbiTagsMax; i++) {
-	    const char * base = db0basename(dbiTags[i]);
+	    const char * base = db1basename(dbiTags[i]);
 	    sprintf(ofilename, "%s/%s/%s", rootdir, olddbpath, base);
 	    sprintf(nfilename, "%s/%s/%s", rootdir, newdbpath, base);
 	    (void)rpmCleanPath(ofilename);
diff --git a/lib/rpmdb.h b/lib/rpmdb.h
index 6f0a607..f20b1d8 100644
--- a/lib/rpmdb.h
+++ b/lib/rpmdb.h
@@ -158,8 +158,11 @@ struct _dbiIndex {
     int			dbi_tear_down;
     int			dbi_use_cursors;
     int			dbi_get_rmw_cursor;
-    int			dbi_no_fsync;
-    int			dbi_temporary;
+    int			dbi_no_fsync;	/*<! no-op fsync for db */
+    int			dbi_no_dbsync;	/*<! don't call dbiSync */
+    int			dbi_lockdbfd;	/*<! do fcntl lock on db fd */
+    int			dbi_temporary;	/*<! non-persistent */
+    int			dbi_debug;
 
 	/* dbenv parameters */
     int			dbi_lorder;
@@ -360,7 +363,7 @@ int dbiByteSwapped(dbiIndex dbi);
  * @param rpmtag	rpm tag
  * @return		base file name
  */
-char * db0basename(int rpmtag);
+char * db1basename(int rpmtag);
 
 /**
  */
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index f75d797..2c92e11 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -348,9 +348,18 @@ int rpmdbInit(const char * root, int perms);
     /* nonzero on error */
 
 /**
- * @param db		rpm database
+ * Close all database indices and free rpmdb.
+ * @param rpmdb		rpm database
+ * @return		0 always
+ */
+int rpmdbClose ( /*@only@*/ rpmdb rpmdb);
+
+/**
+ * Sync all database indices.
+ * @param rpmdb		rpm database
+ * @return		0 always
  */
-void rpmdbClose ( /*@only@*/ rpmdb db);
+int rpmdbSync (rpmdb rpmdb);
 
 /**
  * Return number of instances of package in rpm database.
diff --git a/lib/transaction.c b/lib/transaction.c
index b266696..3aa98ce 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1679,6 +1679,7 @@ int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify,
 		ourrc++;
 	    break;
 	}
+	(void) rpmdbSync(ts->db);
     }
 
     freeFl(ts, flList);
diff --git a/macros.in b/macros.in
index 8ce482d..8f5b90d 100644
--- a/macros.in
+++ b/macros.in
@@ -1,4 +1,4 @@
-# $Id: macros.in,v 1.55 2000/04/28 15:14:47 jbj Exp $
+# $Id: macros.in,v 1.56 2000/05/01 17:50:35 jbj Exp $
 #==============================================================================
 # Macro naming conventions (preliminary):
 #
@@ -206,13 +206,14 @@
 #	Macros used to configure Berkley db parameters.
 #
 # Choose db interface:
-#	0	linux glibc libdb1 routines.
-#	1	db_185.h interface in db2/db3 libdb.a.
+#	0	same as 1
+#	1	native db1 interface (e.g. linux glibc libdb1 routines).
 #	2	native db2 interface.
 #	3	native db3 interface.
-#	-1	db3 -> db2 -> db1 -> db0 (as available).
-# There are two macros so that --rebuilddb can convert old_db_api -> new_db_api.
-%_dbapi			0
+#	-1	db3 -> db2 -> db1 (as available).
+#
+# There are two macros so that --rebuilddb can convert db1 -> db3
+%_dbapi			1
 %_dbapi_rebuild		3
 
 #
@@ -236,43 +237,42 @@
 #
 # See http://www.sleepycat.com for Berkeley db-3.0.55 configuration.
 #
-# The (intended) default value for Red Hat Linux is
-#	hash:mpool:shared:lock
+# The (intended) default value for rpm-3.1 on Red Hat Linux is
+#	db3:hash:mpool:cdb:usecursors:mp_mmapsize=8Mb:mp_size=8Mb:pagesize=512
 #
 # Additional rpm specific configuration:
-#   teardown	Should the DB3 environment be removed after use (experimental)?
-#   usecursors	Should DB3 cursors be used in get/put/del (experimental)?
+#   usecursors	Should DB3 cursors be used in get/put/del ?
 #
-%__dbi_flags		mpool:nommap
-%__dbi_type		hash
-%__dbi_perms		perms=0644
 %__dbi_major		db%{_dbapi}
+%__dbi_type		hash
+%__dbi_flags		mpool:cdb
 %__dbi_other		usecursors
 %__dbi_verbose		verbose
 %__dbi_mp_mmapsize	mp_mmapsize=16Mb
-%__dbi_mp_size		mp_size=4Mb
-%__dbi_pagesize		pagesize=16Kb
+%__dbi_mp_size		mp_size=512Kb
+%__dbi_pagesize		pagesize=512
+%__dbi_perms		perms=0644
 
 # This is a colon (or white space) separated list of tokens for Berkeley
 # dbi configuration.
 %_dbi_config	\
-  %{__dbi_flags}\
-  %{__dbi_type}\
-  %{__dbi_perms}\
   %{__dbi_major}\
+  %{__dbi_type}\
+  %{__dbi_flags}\
   %{__dbi_other}\
   %{__dbi_verbose}\
   %{__dbi_mp_mmapsize}\
   %{__dbi_mp_size}\
   %{__dbi_pagesize}\
+  %{__dbi_perms}\
 %{nil}
 
-# Depends is a per-transaction cache of known dependency resolutions.
-%_dbi_config_Depends	%{_dbi_config}:private:temporary
-
-# This is the list of tags for which indices will be built.
+# The list of tags for which indices will be built.
 %_dbi_indices	Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Depends
 
+# "Depends" is a per-transaction cache of known dependency resolutions.
+%_dbi_config_Depends	%{_dbi_config}:temporary
+
 #==============================================================================
 # ---- per-platform macros.
 #	Macros that are specific to an individual platform. The values here
diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index f62ecfe..87a87ac 100644
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -8,7 +8,7 @@ WriteMakefile(
 	      'OBJECT'	=> 'rpm.o constant.o',
 	      'VERSION_FROM' => 'rpm.pm',		# finds $VERSION
 	      'MAKEFILE'=> 'PMakefile',
-	      'LIBS'	=> [' -L/usr/local/lib  -lz -lbz2'],			# e.g., '-lm' 
+	      'LIBS'	=> [' -L/usr/local/lib  -lpthread -lz -lbz2'],			# e.g., '-lm' 
 	      'CCFLAGS' => '-g -O2 -D_GNU_SOURCE -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts',
 	      'OPTIMIZE'=> '-g',
 	      'DEFINE'	=> '-Dbool=char -DHAS_BOOL',
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b755c05..174dbca 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -27,7 +27,8 @@ build/reqprov.c
 build/spec.c
 lib/cpio.c
 lib/depends.c
-lib/db0.c
+lib/db1.c
+lib/db2.c
 lib/db3.c
 lib/falloc.c
 lib/formats.c
diff --git a/po/cs.po b/po/cs.po
index 7512d65..e88a750 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-28 11:08-0400\n"
+"POT-Creation-Date: 2000-05-01 13:41-0400\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -2186,89 +2186,99 @@ msgstr "bal
 msgid "loop in prerequisite chain: %s"
 msgstr "smyèka v øetìzu podmínek: %s"
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, fuzzy, c-format
 msgid "removed db file        %s\n"
 msgstr "odstraòuje se rejstøík souborù pro %s\n"
 
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "nelze provést statistiku %s: %s"
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "probíhá otevírání databázového re¾imu: 0%o\n"
 
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nelze otevøít %s: %s"
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "nelze získat %s zámek k databázi"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr "výhradní"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr "sdílený"
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
+#: lib/db3.c:1042
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr "nelze získat %s zámek k databázi"
+
+#: lib/db3.c:1049
+#, fuzzy, c-format
+msgid "locked  db index       %s/%s(%s)\n"
+msgstr "odstraòuje se rejstøík souborù pro %s\n"
+
 #: lib/falloc.c:135
 #, c-format
 msgid ""
@@ -2972,7 +2982,15 @@ msgstr "OK"
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2980,156 +2998,156 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "chyba: nelze otevøít %s\n"
 
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "chyba pøi získávání záznamu %s z %s"
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "chyba pøi ukládání záznamu %s do %s"
 
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "chyba pøi odstraòování záznamu %s do %s"
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr "nebyla nastavena dbpath"
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "chyba: nelze otevøít %s%s/packages.rpm\n"
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nelze èíst hlavièku u %d pro vyhledání"
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "balíèek %s nenalezen v %s"
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "balíèek %s nenalezen v %s"
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraòuje se polo¾ka databáze\n"
 
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuje se rejstøík skupin\n"
 
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "odstraòuje se rejstøík názvù\n"
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "nelze alokovat prostor pro databázi"
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "Probíhá získávání %s jako %s\n"
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "databáze se pøestavuje v koøenovém adresáøi %s\n"
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "doèasná databáze %s ji¾ existuje"
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "vytváøí se adresáø: %s\n"
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "chyba pøi vytváøení adresáøe %s: %s"
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "otevírá se stará databáze\n"
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "otevírá se nová databáze\n"
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "záznam èíslo %d v databázi je chybný -- vynechává se"
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nelze pøidat záznam - pùvodnì u %d"
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr "databázi nelze pøestavit; pùvodní databáze zùstává na svém místì\n"
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr "starou databázi nelze nahradit novou databází!\n"
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "aby se obnovily, nahrazuje soubory v %s soubory z %s"
 
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nelze odstranit %s: %s\n"
diff --git a/po/de.po b/po/de.po
index 6893db5..7c5a27c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-04-28 11:08-0400\n"
+"POT-Creation-Date: 2000-05-01 13:41-0400\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -2287,89 +2287,99 @@ msgstr "Paket %s wird nicht in %s aufgef
 msgid "loop in prerequisite chain: %s"
 msgstr ""
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
 # , c-format
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
 # , c-format
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "kann %s lock für die Datenbank nicht bekommen"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr "exklusiv"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr "geteilt"
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
+msgstr ""
+
+#: lib/db3.c:1042
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr "kann %s lock für die Datenbank nicht bekommen"
+
+#: lib/db3.c:1049
+#, c-format
+msgid "locked  db index       %s/%s(%s)\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -3088,7 +3098,15 @@ msgstr ""
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -3096,162 +3114,162 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "Fehler beim Eintrag %s von %s"
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 
 # FIXME
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr "»dbpath« ist nicht gesetzt"
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "Paket %s in %s nicht gefunden"
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "Paket %s in %s nicht gefunden"
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
 # FIXME
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 # FIXME
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
 # reservieren???
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "kann keinen Platz für die Datenbank bekommen"
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "die temporäre Datenbank %s existiert schon"
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, fuzzy, c-format
 msgid "creating directory: %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
diff --git a/po/fi.po b/po/fi.po
index 71ddfe8..34580e4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-04-28 11:08-0400\n"
+"POT-Creation-Date: 2000-05-01 13:41-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -2224,87 +2224,97 @@ msgstr "paketti %s ei ole %s:ss
 msgid "loop in prerequisite chain: %s"
 msgstr "silmukka edellytysten ketjussa: %s"
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "en voinut avata %s: %s"
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "en voi saada %s lukitusta tietokantaan"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr "poissulkevaa"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr "jaettua"
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
+msgstr ""
+
+#: lib/db3.c:1042
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr "en voi saada %s lukitusta tietokantaan"
+
+#: lib/db3.c:1049
+#, c-format
+msgid "locked  db index       %s/%s(%s)\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -3010,7 +3020,15 @@ msgstr ""
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -3018,156 +3036,156 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "virhe talletettaessa tietuetta %s %s:ään"
 
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "en voi lukea headeria %d:stä päivittäessä"
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "en voi varata tilaa tietokannalle"
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "väliaikainen tietokanta %s on jo olemassa"
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, fuzzy, c-format
 msgid "creating directory: %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "en voi lisätä tietuetta %d:stä"
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "en voinut avata %s: %s"
diff --git a/po/fr.po b/po/fr.po
index 33b7301..9dc27fd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-04-28 11:08-0400\n"
+msgstr "POT-Creation-Date: 2000-05-01 13:41-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
 #, c-format
@@ -2225,87 +2225,97 @@ msgstr "aucun package n'a 
 msgid "loop in prerequisite chain: %s"
 msgstr ""
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, fuzzy, c-format
 msgid "cannot get %s lock on database"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr ""
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr ""
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
+msgstr ""
+
+#: lib/db3.c:1042
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr "aucun package n'a été spécifié pour la désinstallation"
+
+#: lib/db3.c:1049
+#, c-format
+msgid "locked  db index       %s/%s(%s)\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -3013,7 +3023,15 @@ msgstr ""
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -3021,155 +3039,155 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 msgid "cannot allocate new instance in database"
 msgstr ""
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, c-format
 msgid "creating directory: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
diff --git a/po/ja.po b/po/ja.po
index 4fc6f2c..43f1abc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-04-28 11:08-0400\n"
+"POT-Creation-Date: 2000-05-01 13:41-0400\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -193,7 +193,7 @@ msgstr "copyright 
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.50 2000/04/28 15:14:48 jbj Exp $
+# $Id: ja.po,v 1.51 2000/05/01 17:50:36 jbj Exp $
 #: rpm.c:200
 #, c-format
 msgid "rpm: %s\n"
@@ -2194,89 +2194,99 @@ msgstr "%s 
 msgid "loop in prerequisite chain: %s"
 msgstr "prerequisite ¥Á¥§¡¼¥ó¤Î¥ë¡¼¥×: %s"
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, fuzzy, c-format
 msgid "removed db file        %s\n"
 msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
 
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n"
 
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr "½ü³°"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr "¶¦Í­"
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
+#: lib/db3.c:1042
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó"
+
+#: lib/db3.c:1049
+#, fuzzy, c-format
+msgid "locked  db index       %s/%s(%s)\n"
+msgstr "%s ÍѤΠfile ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
+
 #: lib/falloc.c:135
 #, c-format
 msgid ""
@@ -2994,7 +3004,15 @@ msgstr ""
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -3002,157 +3020,157 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)"
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
 
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼"
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï %s Ãæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï %s Ãæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥¨¥ó¥È¥ê¤òºï½ü¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹ÍѤζõ¤­ÍÆÎ̤¬Â­¤ê¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "°ì»þŪ¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹"
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ÎºîÀ®¥¨¥é¡¼: %s"
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹"
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n"
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹"
 
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 0a94319..209b088 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-04-28 11:08-0400\n"
+"POT-Creation-Date: 2000-05-01 13:41-0400\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -2145,89 +2145,99 @@ msgstr "pakiet %s jest w konflikcie: %s\n"
 msgid "loop in prerequisite chain: %s"
 msgstr ""
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, fuzzy, c-format
 msgid "removed db file        %s\n"
 msgstr "usuwanie indeksu plików dla %s\n"
 
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "b³êdny status pliku: %s"
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "otwiernie bazê danych w trybie 0x%x w %s\n"
 
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s"
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr ""
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr ""
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
+#: lib/db3.c:1042
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe"
+
+#: lib/db3.c:1049
+#, fuzzy, c-format
+msgid "locked  db index       %s/%s(%s)\n"
+msgstr "usuwanie indeksu plików dla %s\n"
+
 #: lib/falloc.c:135
 #, c-format
 msgid ""
@@ -2914,7 +2924,15 @@ msgstr "OK"
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2922,31 +2940,31 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "nie mo¿na otworzyæ %s\n"
 
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "b³±d pobierania rekordu %s z %s"
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "b³±d zapisywania rekordu %s do %s"
 
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "b³±d usuwania rekordu %s z %s"
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr "¶cie¿ka bazy danych nie zosta³a podana"
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -2955,125 +2973,125 @@ msgstr ""
 "nowym formacie"
 
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania"
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "pakiet %s nie znaleziony w %s"
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "pakiet %s nie znaleziony w %s"
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "usuwanie wpisu w bazie\n"
 
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "usuwanie indeksu grupy\n"
 
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "usuwanie indeksu nazw\n"
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "nie mo¿na alokowaæ przestrzeni dla bazy danych"
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "odbudowywujê bazê danych w rootdir %s\n"
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "tymczasowa baza danych %s ju¿ istnieje"
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "b³±d przy tworzeniu katalogu %s: %s"
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "otwieranie starej bazy danych\n"
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "otwieranie nowej bazy danych\n"
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto"
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d"
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n"
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr "zamiana starej bazy na now± nie powiod³a siê!\n"
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "naprawcze zastêpowanie plików w %s plikami z %s"
 
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0b2e5ba..cefc9c6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-04-28 11:08-0400\n"
+msgstr "POT-Creation-Date: 2000-05-01 13:41-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
 #, c-format
@@ -2286,89 +2286,99 @@ msgstr "n
 msgid "loop in prerequisite chain: %s"
 msgstr ""
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
 # , c-format
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
 # , c-format
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, fuzzy, c-format
 msgid "cannot get %s lock on database"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr ""
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr ""
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
+msgstr ""
+
+#: lib/db3.c:1042
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr "não foi passado pacote para desinstalação"
+
+#: lib/db3.c:1049
+#, c-format
+msgid "locked  db index       %s/%s(%s)\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -3083,7 +3093,15 @@ msgstr ""
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -3092,33 +3110,33 @@ msgid ""
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -3126,125 +3144,125 @@ msgstr ""
 
 # , c-format
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 msgid "cannot allocate new instance in database"
 msgstr ""
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, c-format
 msgid "creating directory: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
 # , c-format
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
diff --git a/po/rpm.pot b/po/rpm.pot
index 3595c36..7ae4d0b 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-28 11:08-0400\n"
+"POT-Creation-Date: 2000-05-01 13:41-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2076,87 +2076,97 @@ msgstr ""
 msgid "loop in prerequisite chain: %s"
 msgstr ""
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, c-format
 msgid "bad db file %s"
 msgstr ""
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr ""
 
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr ""
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr ""
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
+msgstr ""
+
+#: lib/db3.c:1042
+#, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr ""
+
+#: lib/db3.c:1049
+#, c-format
+msgid "locked  db index       %s/%s(%s)\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2838,7 +2848,15 @@ msgstr ""
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2846,155 +2864,155 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, c-format
 msgid "error removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr ""
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, c-format
 msgid "key \"%s\" not found in %s"
 msgstr ""
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr ""
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 msgid "cannot allocate new instance in database"
 msgstr ""
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, c-format
 msgid "creating directory: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index e1a15b3..2780520 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-04-28 11:08-0400\n"
+"POT-Creation-Date: 2000-05-01 13:41-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2152,89 +2152,99 @@ msgstr "
 msgid "loop in prerequisite chain: %s"
 msgstr "ÚÁÍËÎÕÔÙÊ ÃÉËÌ × ÃÅÐÏÞËÅ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ ÕÓÔÁÎÏ×ËÉ: %s"
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, fuzzy, c-format
 msgid "removed db file        %s\n"
 msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n"
 
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "ÎÅ×ÅÒÎÏÅ ÓÏÓÔÏÑÎÉÅ ÆÁÊÌÁ: %s"
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "ÏÔËÒÙ×ÁÀ ÂÁÚÕ × ÒÅÖÉÍÅ 0x%x × %s\n"
 
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s"
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ %s ÄÏÓÔÕÐ Ë ÂÁÚÅ ÄÁÎÎÙÈ"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr "ÒÁÚÄÅÌÑÅÍÙÊ"
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
+#: lib/db3.c:1042
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ %s ÄÏÓÔÕÐ Ë ÂÁÚÅ ÄÁÎÎÙÈ"
+
+#: lib/db3.c:1049
+#, fuzzy, c-format
+msgid "locked  db index       %s/%s(%s)\n"
+msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÆÁÊÌÏ× ÄÌÑ %s\n"
+
 #: lib/falloc.c:135
 #, c-format
 msgid ""
@@ -2918,7 +2928,15 @@ msgstr "Ok"
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2926,31 +2944,31 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n"
 
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "ÏÛÉÂËÁ ÐÏÌÕÞÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s"
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "ÏÛÉÂËÁ ÓÏÈÒÁÎÅÎÉÑ ÚÁÐÉÓÉ %s × %s"
 
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s"
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ dbpath"
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -2959,125 +2977,125 @@ msgstr ""
 "ÂÁÚÙ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ"
 
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s/packages.rpm\n"
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ÎÅ ÍÏÇÕ ÐÒÏÞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ÐÏÉÓËÁ"
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "ÐÁËÅÔ %s ÎÅ ÎÁÊÄÅÎ × %s"
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "ÐÁËÅÔ %s ÎÅ ÎÁÊÄÅÎ × %s"
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "ÕÄÁÌÑÀ ÚÁÐÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n"
 
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÇÒÕÐÐ\n"
 
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÉÍÅÎ\n"
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "ÎÅ ÍÏÇÕ ×ÙÄÅÌÉÔØ ÍÅÓÔÏ ÄÌÑ ÂÁÚÙ ÄÁÎÎÙÈ"
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "ÐÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n"
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ÐÅÒÅÓÔÒÁÉ×ÁÀ ÂÁÚÕ × ËÏÒÎÅ×ÏÍ ËÁÔÁÌÏÇÅ %s\n"
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "ÓÏÚÄÁÀ ËÁÔÁÌÏÇ: %s\n"
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ËÁÔÁÌÏÇÁ %s: %s"
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "ÏÔËÒÙ×ÁÀ ÓÔÁÒÕÀ ÂÁÚÕ\n"
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "ÏÔËÒÙ×ÁÀ ÎÏ×ÕÀ ÂÁÚÕ\n"
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %d × ÂÁÚÅ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÀ"
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "ÎÅ ÍÏÇÕ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %d)"
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n"
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr "ÚÁÍÅÎÁ ÓÔÁÒÏÊ ÂÁÚÙ ÎÁ ÎÏ×ÕÀ ÎÅ ÕÄÁÌÁÓØ!\n"
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÚÁÍÅÎÑÅÔ ÆÁÊÌÙ × %s ÆÁÊÌÁÍÉ ÉÚ %s"
 
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "ÕÄÁÌÅÎÉÅ ËÁÔÁÌÏÇÁ %s ÎÅ ÕÄÁÌÏÓØ: %s\n"
diff --git a/po/sk.po b/po/sk.po
index abf4a1b..43a2d55 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-04-28 11:08-0400\n"
+"POT-Creation-Date: 2000-05-01 13:41-0400\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -2155,89 +2155,99 @@ msgstr "bal
 msgid "loop in prerequisite chain: %s"
 msgstr "sluèka v re»azi po¾iadaviek: %s"
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, fuzzy, c-format
 msgid "removed db file        %s\n"
 msgstr "odstraòuje sa index súborov pre %s\n"
 
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "chybný stav súboru: %s"
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "otvára sa databáza s právami 0x%x v %s\n"
 
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nepodarilo sa otvori» %s: %s"
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "nie je mo¾né získa» %s zámok pre databázu"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr "výhradný"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr "zdieµaný"
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
+#: lib/db3.c:1042
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr "nie je mo¾né získa» %s zámok pre databázu"
+
+#: lib/db3.c:1049
+#, fuzzy, c-format
+msgid "locked  db index       %s/%s(%s)\n"
+msgstr "odstraòuje sa index súborov pre %s\n"
+
 #: lib/falloc.c:135
 #, c-format
 msgid ""
@@ -2922,7 +2932,15 @@ msgstr "V PORIADKU"
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2930,31 +2948,31 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "nie je mo¾né otvori» %s\n"
 
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "chyba pri naèítaní záznamu %s z %s"
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "chyba pri zápise záznamu %s do %s"
 
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "chyba pri odstraòovaní záznamu %s z %s"
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr "nebola nastavená ¾iadna dbpath"
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -2963,125 +2981,125 @@ msgstr ""
 "databázy v novom formáte"
 
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie"
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "balík %s nebol nájdený v %s"
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "balík %s nebol nájdený v %s"
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraòuje sa záznam z databázy\n"
 
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuje sa index skupín\n"
 
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "odstraòuje sa index názvov\n"
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "nie je mo¾né prideli» miesto pre databázu"
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu sa vytvára databáza v adresári %s\n"
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "doèasná databáza %s u¾ existuje"
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "chyba pri vytváraní adresára %s: %s"
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "otvára sa stará databáza\n"
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "otvára sa nová databáza\n"
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný"
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "nie je mo¾né prida» záznam pôvodne na %d"
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n"
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr "nepodarilo sa nahradi» starú databázu novou!\n"
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "nahradí súbory v %s súbormi z %s kvôli obnove"
 
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstráni» adresár %s: %s\n"
diff --git a/po/sl.po b/po/sl.po
index 9eb1019..d7d4b5c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.35 2000/04/28 15:14:48 jbj Exp $
+# $Id: sl.po,v 1.36 2000/05/01 17:50:36 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-04-28 11:08-0400\n"
+"POT-Creation-Date: 2000-05-01 13:41-0400\n"
 "PO-Revision-Date: 2000-02-17 22:25+01:00\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -2138,89 +2138,99 @@ msgstr "paket %s v sporu: %s\n"
 msgid "loop in prerequisite chain: %s"
 msgstr "zanka v predpogojevani verigi: %s"
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, fuzzy, c-format
 msgid "removed db file        %s\n"
 msgstr "odstranjujemo seznam datotek za %s\n"
 
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "okvarjeno stanje datoteke: %s"
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "odpiramo datoteko z naèinom 0x%x v %s\n"
 
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspe¹no odpiranje %s: %s\n"
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "datoteke ni mo¾no %s zakleniti"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr "izkljuèujoèe"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr "deljeno"
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
+#: lib/db3.c:1042
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr "datoteke ni mo¾no %s zakleniti"
+
+#: lib/db3.c:1049
+#, fuzzy, c-format
+msgid "locked  db index       %s/%s(%s)\n"
+msgstr "odstranjujemo seznam datotek za %s\n"
+
 #: lib/falloc.c:135
 #, c-format
 msgid ""
@@ -2907,7 +2917,15 @@ msgstr "V REDU"
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2915,157 +2933,157 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "ni mo¾no odpreti %s: %s\n"
 
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "napaka pri branju zapisa %s iz %s"
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "napaka pri pisanju zapisa %s v %s"
 
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "napaka pri brisanju zapisa %s iz %s"
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr "staro obliko podatkove zbirke pretvorite v novo z --rebuilddb"
 
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "paketa ni mo¾no odpreti: %s\n"
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ni mo¾no prebrati glave pri %d za vpogled"
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "paketa %s ni najti v %s"
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "paketa %s ni najti v %s"
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstranjujemo vnose v podatkovni zbirki\n"
 
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "odstranjujemo seznam imen\n"
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "ni mo¾no zagotoviti prostora za podatkovno zbirko"
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "preimenujemo %s v %s\n"
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "zaèasna podatkovna zbirka %s ¾e obstaja"
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "ustvarjamo imenik: %s\n"
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "napaka pri ustvarjanju imenika %s: %s"
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "odpiramo staro podatkovno zbirko\n"
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "odpiramo novo podatkovno zbirko\n"
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "zapis ¹t. %d v zbirki je okvarjen -- preskakujemo."
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "zapisa ni mo¾no dodati na %d"
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 "ponovna izgradnja podatkovne zbirke neuspe¹na; stara ostaja na istem mestu\n"
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr "zamenjava stare podatkovne zbirke z novo neuspe¹na!\n"
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "posku¹amo povrniti z nadomestitvijo datotek v %s z datotekami iz %s"
 
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspe¹na odstranitev imenika %s: %s\n"
diff --git a/po/sr.po b/po/sr.po
index 2389d05..94be8d2 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-04-28 11:08-0400\n"
+"POT-Creation-Date: 2000-05-01 13:41-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -2185,87 +2185,97 @@ msgstr "paket %s nije naveden u %s"
 msgid "loop in prerequisite chain: %s"
 msgstr "petlja u lancu: %s"
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr "ekskluzivno"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr "deljeno"
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
+msgstr ""
+
+#: lib/db3.c:1042
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka"
+
+#: lib/db3.c:1049
+#, c-format
+msgid "locked  db index       %s/%s(%s)\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -2970,7 +2980,15 @@ msgstr ""
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2978,156 +2996,156 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "gre¹ka kod uzimanja sloga %s iz %s"
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "gre¹ka zapisivanja sloga %s u %s"
 
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr "dbpath nije odreðen"
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "ne mogu da proèitam zaglavlje na %d za proveru"
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "paket %s nije naðen u %s"
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "paket %s nije naðen u %s"
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "ne mogu da zauzmem prostor za bazu podataka"
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "privremena baza podataka %s veæ postoji"
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, fuzzy, c-format
 msgid "creating directory: %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga"
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "ne mogu da dodam slog originalno na %d"
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
diff --git a/po/sv.po b/po/sv.po
index e2b0023..2487140 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,12 +1,12 @@
 # Swedish messages for RPM
 # Copyright © 1999 Free Software Foundation, Inc.
 # Göran Uddeborg <göran@uddeborg.pp.se>, 1999, 2000.
-# $Revision: 1.95 $
+# $Revision: 1.96 $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-04-28 11:08-0400\n"
+"POT-Creation-Date: 2000-05-01 13:41-0400\n"
 "PO-Revision-Date: 2000-02-21 12:20+0100\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -2127,89 +2127,99 @@ msgstr "paket %s st
 msgid "loop in prerequisite chain: %s"
 msgstr "cirkularitet i kedja av förutsättningar: %s"
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, fuzzy, c-format
 msgid "removed db file        %s\n"
 msgstr "tar bort filindex för %s\n"
 
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "felaktig filstatus: %s"
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "öppnar databas med rättighet 0x%x i %s\n"
 
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "kunde inte öppna %s: %s\n"
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "kan inte få %s lås på databas"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr "uteslutande"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr "delat"
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
 msgstr ""
 
+#: lib/db3.c:1042
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr "kan inte få %s lås på databas"
+
+#: lib/db3.c:1049
+#, fuzzy, c-format
+msgid "locked  db index       %s/%s(%s)\n"
+msgstr "tar bort filindex för %s\n"
+
 #: lib/falloc.c:135
 #, c-format
 msgid ""
@@ -2899,7 +2909,15 @@ msgstr "OK"
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -2907,31 +2925,31 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "kan inte öppna %s: %s\n"
 
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "fel när post %s hämtades från %s"
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "fel när post %s sparades i %s"
 
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "fel när post %s togs bort ur %s"
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -2940,125 +2958,125 @@ msgstr ""
 "i nytt format"
 
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "kan inte öppna paket: %s\n"
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "kan inte läsa huvud vid %d för uppslagning"
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "fann ej paket %s i %s"
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "fann ej paket %s i %s"
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "tar bort databasposter\n"
 
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "tar bort gruppindex\n"
 
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "tar bort namnindex\n"
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "kan inte allokera plats för databas"
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "byter namn på %s till %s\n"
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "bygger om databas %s till %s\n"
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "tillfällig databas %s existerar redan"
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, c-format
 msgid "creating directory: %s\n"
 msgstr "skapar katalog: %s\n"
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "fel när katalog skapades %s: %s"
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "öppnar gammal databas\n"
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "öppnar ny databas\n"
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "post nummer %d i databasen är felaktig -- hoppar över den"
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "kan inte lägga till post ursprungligen vid %d"
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr "kunde inte bygga om databasen; orginaldatabasen finns kvar\n"
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr "kunde inte ersätta gammal databas med ny databas!\n"
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "byt ut filer i %s med filer från %s för att återställa"
 
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
diff --git a/po/tr.po b/po/tr.po
index ef3e916..511af59 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-28 11:08-0400\n"
+"POT-Creation-Date: 2000-05-01 13:41-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2223,87 +2223,97 @@ msgstr "%s paketi %s alt
 msgid "loop in prerequisite chain: %s"
 msgstr "gerekenler zincirinde döngü: %s"
 
-#: lib/db0.c:385
+#: lib/db1.c:380
 #, c-format
 msgid "closed  db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:388
+#: lib/db1.c:383
 #, c-format
 msgid "removed db file        %s\n"
 msgstr ""
 
-#: lib/db0.c:417
+#: lib/db1.c:413
 #, fuzzy, c-format
 msgid "bad db file %s"
 msgstr "%s açýlamadý: %s"
 
-#: lib/db0.c:422
+#: lib/db1.c:418
 #, fuzzy, c-format
 msgid "opening db file        %s mode 0x%x\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/db0.c:431 lib/url.c:445
+#: lib/db1.c:426 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s açýlamadý: %s"
 
-#: lib/db0.c:443
+#: lib/db1.c:442
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "Veritabaný için %s kilit (lock) alýnamadý"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "exclusive"
 msgstr "özel"
 
-#: lib/db0.c:444
+#: lib/db1.c:443 lib/db3.c:1044
 msgid "shared"
 msgstr "paylaþýlan (shared)"
 
-#: lib/db3.c:249
+#: lib/db2.c:133 lib/db3.c:460
 #, c-format
-msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
+msgid "closed  db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:277
+#: lib/db2.c:145 lib/db3.c:472
 #, c-format
-msgid "%s has invalid numeric value, skipped\n"
+msgid "removed db environment %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:285
+#: lib/db2.c:182 lib/db3.c:509
 #, c-format
-msgid "%s has too large or too small long value, skipped\n"
+msgid "opening db environment %s/%s(%s) %s\n"
 msgstr ""
 
-#: lib/db3.c:293
+#: lib/db2.c:557 lib/db3.c:880
 #, c-format
-msgid "%s has too large or too small integer value, skipped\n"
+msgid "closed  db index       %s/%s(%s)\n"
 msgstr ""
 
-#: lib/db3.c:456
+#: lib/db2.c:635 lib/db3.c:957
 #, c-format
-msgid "closed  db environment %s/%s(%s)\n"
+msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
 msgstr ""
 
-#: lib/db3.c:468
+#: lib/db3.c:253
 #, c-format
-msgid "removed db environment %s/%s(%s)\n"
+msgid "dbiSetConfig: unrecognized db option: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/db3.c:505
+#: lib/db3.c:281
 #, c-format
-msgid "opening db environment %s/%s(%s) %s\n"
+msgid "%s has invalid numeric value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:880
+#: lib/db3.c:289
 #, c-format
-msgid "closed  db index       %s/%s(%s)\n"
+msgid "%s has too large or too small long value, skipped\n"
 msgstr ""
 
-#: lib/db3.c:957
+#: lib/db3.c:297
 #, c-format
-msgid "opening db index       %s/%s(%s) %s mode=0x%x\n"
+msgid "%s has too large or too small integer value, skipped\n"
+msgstr ""
+
+#: lib/db3.c:1042
+#, fuzzy, c-format
+msgid "cannot get %s lock on %s/%s(%s)\n"
+msgstr "Veritabaný için %s kilit (lock) alýnamadý"
+
+#: lib/db3.c:1049
+#, c-format
+msgid "locked  db index       %s/%s(%s)\n"
 msgstr ""
 
 #: lib/falloc.c:135
@@ -3010,7 +3020,15 @@ msgstr ""
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: lib/rpmdb.c:220
+#: lib/rpmdb.c:197
+msgid ""
+"\n"
+"--> This version of rpm was not compiled with support for db%d. Please    "
+"verify the setting of the macro %%_dbapi using \"rpm --showrc\" and    "
+"correct your configuration.\n"
+msgstr ""
+
+#: lib/rpmdb.c:223
 msgid ""
 "\n"
 "--> Please run \"rpm --rebuilddb\" as root to convert your database from\n"
@@ -3018,157 +3036,157 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:235
+#: lib/rpmdb.c:238
 #, fuzzy, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr "hata: %s eriþilemiyor\n"
 
-#: lib/rpmdb.c:289
+#: lib/rpmdb.c:292
 #, fuzzy, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr "%s kaydýna %s dosyasýnda eriþilemiyor:"
 
-#: lib/rpmdb.c:406
+#: lib/rpmdb.c:409
 #, c-format
 msgid "error storing record %s into %s"
 msgstr "%s kaydý %s dosyasýna yazýlamýyor"
 
-#: lib/rpmdb.c:415
+#: lib/rpmdb.c:418
 #, fuzzy, c-format
 msgid "error removing record %s from %s"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:603 lib/rpmdb.c:2047
+#: lib/rpmdb.c:619 lib/rpmdb.c:2073
 msgid "no dbpath has been set"
 msgstr "dbpath deðeri girilmemiþ"
 
-#: lib/rpmdb.c:692
+#: lib/rpmdb.c:708
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:894
+#: lib/rpmdb.c:910
 #, fuzzy, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr "hata: %s%s/packages.rpm açýlamýyor\n"
 
-#: lib/rpmdb.c:960 lib/rpmdb.c:1476 lib/uninstall.c:90
+#: lib/rpmdb.c:976 lib/rpmdb.c:1494 lib/uninstall.c:90
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr "%d kaydýndan baþlýk bilgisi okunamadý"
 
-#: lib/rpmdb.c:1431
+#: lib/rpmdb.c:1449
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "%s pakedi %s içerisinde bulunamadý"
 
-#: lib/rpmdb.c:1439
+#: lib/rpmdb.c:1457
 #, fuzzy, c-format
 msgid "key \"%s\" not removed from %s"
 msgstr "%s pakedi %s içerisinde bulunamadý"
 
-#: lib/rpmdb.c:1519
+#: lib/rpmdb.c:1539
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1528
+#: lib/rpmdb.c:1548
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:1536
+#: lib/rpmdb.c:1556
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:1540
+#: lib/rpmdb.c:1560
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
 # reservieren???
-#: lib/rpmdb.c:1687
+#: lib/rpmdb.c:1710
 #, fuzzy
 msgid "cannot allocate new instance in database"
 msgstr "Veritabaný için yer bulunamadý"
 
-#: lib/rpmdb.c:1735
+#: lib/rpmdb.c:1759
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1751
+#: lib/rpmdb.c:1775
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1758
+#: lib/rpmdb.c:1782
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1762
+#: lib/rpmdb.c:1786
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2072
+#: lib/rpmdb.c:2098
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/rpmdb.c:2076
+#: lib/rpmdb.c:2102
 #, c-format
 msgid "temporary database %s already exists"
 msgstr "geçici veritabaný %s mevcut"
 
-#: lib/rpmdb.c:2082
+#: lib/rpmdb.c:2108
 #, fuzzy, c-format
 msgid "creating directory: %s\n"
 msgstr "%s dizinin oluþturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2084
+#: lib/rpmdb.c:2110
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr "%s dizinin oluþturulmasýnda hata: %s"
 
-#: lib/rpmdb.c:2091
+#: lib/rpmdb.c:2117
 #, fuzzy, c-format
 msgid "opening old database with dbi_major %d\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/rpmdb.c:2100
+#: lib/rpmdb.c:2126
 #, fuzzy, c-format
 msgid "opening new database with dbi_major %d\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/rpmdb.c:2122
+#: lib/rpmdb.c:2148
 #, fuzzy, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr "veritabanýndaki %d numaralý kayýt hatalý -- atlanýyor"
 
-#: lib/rpmdb.c:2154
+#: lib/rpmdb.c:2180
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr "%d de yer alan kayýt saklayamýyor"
 
-#: lib/rpmdb.c:2172
+#: lib/rpmdb.c:2198
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2180
+#: lib/rpmdb.c:2206
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2182
+#: lib/rpmdb.c:2208
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2188
+#: lib/rpmdb.c:2214
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s açýlamadý: %s"
diff --git a/popt/po/tr.po b/popt/po/tr.po
index 30479e2..3eb8394 100644
--- a/popt/po/tr.po
+++ b/popt/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: popt 1.2\n"
-"POT-Creation-Date: 2000-01-06 13:31+0100\n"
+"POT-Creation-Date: 2000-04-22 14:29-0400\n"
 "PO-Revision-Date: 2000-01-06 13:01+0100\n"
 "Last-Translator: Fatih Demir <kabalak@gmx.net>\n"
 "Language-Team: Turkish Gnome Tranlation Team <gnotrap@gmx.net>\n"
@@ -14,346 +14,251 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../popthelp.c:262 ../test1.c:98
-msgid "\n"
-msgstr "\n"
-
-#: ../popthelp.c:196 ../popthelp.c:258
-msgid ""
-"\n"
-"       "
-msgstr ""
-"\n"
-"       "
+#: popthelp.c:23
+msgid "Show this help message"
+msgstr "Bu yardým iletisini gösterir"
 
-#: ../popthelp.c:137
-#, c-format
-msgid ""
-"\n"
-"%s\n"
-msgstr ""
-"\n"
-"%s\n"
-""
-
-#: ../popthelp.c:84 ../popthelp.c:201
-msgid " "
-msgstr " "
-
-#: ../popthelp.c:69
-#, c-format
-msgid "  %-*s   "
-msgstr "  %-*s   "
-
-#: ../popthelp.c:71
-#, c-format
-msgid "  %s\n"
-msgstr "  %s\n"
-
-#: ../popthelp.c:152 ../popthelp.c:259 ../test1.c:93
-#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: ../popthelp.c:164 ../popthelp.c:166
-#, c-format
-msgid " %s\n"
-msgstr " %s\n"
-
-#: ../popthelp.c:200
-#, c-format
-msgid " [-%s%s%s%s]"
-msgstr " [-%s%s%s%s]"
-
-#: ../popthelp.c:245
-#, c-format
-msgid " [-%s]"
-msgstr " [-%s]"
-
-#: ../test1.c:83
-#, c-format
-msgid " arg3: %d"
-msgstr " arg3: %d"
-
-#: ../test1.c:85
-#, c-format
-msgid " inc: %d"
-msgstr " inc: %d"
-
-#: ../test1.c:91
-msgid " rest:"
-msgstr " rest:"
-
-#: ../test1.c:87
-#, c-format
-msgid " short: %d"
-msgstr " short: %d"
-
-#: ../popthelp.c:83
-msgid ""
-"%%.%ds\n"
-"%%%ds"
-msgstr ""
-"%%.%ds\n"
-"%%%ds"
-
-#: ../popthelp.c:90
-#, c-format
-msgid "%s\n"
-msgstr "%s\n"
-
-#: ../findme.c:46 ../popt.c:201
-#, c-format
-msgid "%s/%s"
-msgstr "%s/%s"
-
-#: ../test1.c:19
-msgid "(none)"
-msgstr "(yok)"
-
-#: ../popthelp.c:200
-msgid "-"
-msgstr "-"
-
-#: ../popt.c:144 ../popt.c:436 ../popthelp.c:59
-#, c-format
-msgid "-%c"
-msgstr "-%c"
-
-#: ../popthelp.c:57
-#, c-format
-msgid "-%c, --%s"
-msgstr "-%c, --%s"
-
-#: ../popt.c:215
-msgid "--"
-msgstr "--"
-
-#: ../popt.c:142 ../popt.c:434 ../popthelp.c:61
-#, c-format
-msgid "--%s"
-msgstr "--%s"
-
-#: ../test1.c:63
-msgid "./test-poptrc"
-msgstr "./test-poptrc"
-
-#: ../poptconfig.c:144
-msgid "/.popt"
-msgstr "/.popt"
-
-#: ../poptconfig.c:137
-msgid "/etc/popt"
-msgstr "/etc/popt"
-
-#: ../popt.c:209
-msgid ";"
-msgstr ";"
-
-#: ../popthelp.c:64 ../popthelp.c:201
-msgid "="
-msgstr "="
-
-#: ../test1.c:49
-msgid "A third argument"
-msgstr "Üçüncü seçenek"
-
-#: ../test1.c:49
-msgid "ANARG"
-msgstr "BIRSECENEK"
-
-#: ../popthelp.c:41 ../test1.c:48
-msgid "ARG"
-msgstr "SECENEK"
-
-#: ../test1.c:40
-msgid "An included argument"
-msgstr "Dahil olan bir seçenek"
-
-#: ../test1.c:48
-msgid "Another argument"
-msgstr "Bir baþka seçenek"
-
-#: ../test1.c:57
-msgid "Callback arguments"
-msgstr "Geri-verim seçenekleri"
-
-#: ../popthelp.c:30
+#: popthelp.c:24
 msgid "Display brief usage message"
 msgstr "Kýsa bir kullaným iletisi göster"
 
-#: ../test1.c:45
-msgid ""
-"First argument with a really long description. After all, we have to test "
-"argument help wrapping somehow, right?"
-msgstr ""
-"Ilk uzun anlatýmllý seçenek . Herþey'den sonra , yardým"
-"iletisinin kýrýný göstermek zorundayýz , deðil mi ?"
+#~ msgid "\n"
+#~ msgstr "\n"
 
-#: ../poptconfig.c:141
-msgid "13ME"
-msgstr "13ME"
+#~ msgid ""
+#~ "\n"
+#~ "       "
+#~ msgstr ""
+#~ "\n"
+#~ "       "
 
-#: ../test1.c:51
-msgid "Needs a single -"
-msgstr "Tek bir - bekler"
+#~ msgid ""
+#~ "\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "%s\n"
 
-#: ../findme.c:26
-msgid "PATH"
-msgstr "PATH"
+#~ msgid " "
+#~ msgstr " "
 
-#: ../popt.c:83
-msgid "POSIXLY_CORRECT"
-msgstr "POSIXLY_CORRECT"
+#~ msgid "  %-*s   "
+#~ msgstr "  %-*s   "
 
-#: ../popt.c:83
-msgid "POSIX_ME_HARDER"
-msgstr "POSIX_ME_HARDER"
+#~ msgid "  %s\n"
+#~ msgstr "  %s\n"
 
-#: ../popthelp.c:29
-msgid "Show this help message"
-msgstr "Bu yardým iletisini gösterir"
+#~ msgid " %s"
+#~ msgstr " %s"
+
+#~ msgid " %s\n"
+#~ msgstr " %s\n"
+
+#~ msgid " [-%s%s%s%s]"
+#~ msgstr " [-%s%s%s%s]"
+
+#~ msgid " [-%s]"
+#~ msgstr " [-%s]"
+
+#~ msgid " arg3: %d"
+#~ msgstr " arg3: %d"
+
+#~ msgid " inc: %d"
+#~ msgstr " inc: %d"
+
+#~ msgid " rest:"
+#~ msgstr " rest:"
+
+#~ msgid " short: %d"
+#~ msgstr " short: %d"
+
+#~ msgid ""
+#~ "%%.%ds\n"
+#~ "%%%ds"
+#~ msgstr ""
+#~ "%%.%ds\n"
+#~ "%%%ds"
+
+#~ msgid "%s\n"
+#~ msgstr "%s\n"
+
+#~ msgid "%s/%s"
+#~ msgstr "%s/%s"
+
+#~ msgid "(none)"
+#~ msgstr "(yok)"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid "-%c"
+#~ msgstr "-%c"
+
+#~ msgid "-%c, --%s"
+#~ msgstr "-%c, --%s"
+
+#~ msgid "--"
+#~ msgstr "--"
+
+#~ msgid "--%s"
+#~ msgstr "--%s"
+
+#~ msgid "./test-poptrc"
+#~ msgstr "./test-poptrc"
+
+#~ msgid "/.popt"
+#~ msgstr "/.popt"
+
+#~ msgid "/etc/popt"
+#~ msgstr "/etc/popt"
+
+#~ msgid ";"
+#~ msgstr ";"
+
+#~ msgid "="
+#~ msgstr "="
+
+#~ msgid "A third argument"
+#~ msgstr "Üçüncü seçenek"
+
+#~ msgid "ANARG"
+#~ msgstr "BIRSECENEK"
+
+#~ msgid "ARG"
+#~ msgstr "SECENEK"
+
+#~ msgid "An included argument"
+#~ msgstr "Dahil olan bir seçenek"
+
+#~ msgid "Another argument"
+#~ msgstr "Bir baþka seçenek"
+
+#~ msgid "Callback arguments"
+#~ msgstr "Geri-verim seçenekleri"
+
+#~ msgid ""
+#~ "First argument with a really long description. After all, we have to test "
+#~ "argument help wrapping somehow, right?"
+#~ msgstr ""
+#~ "Ilk uzun anlatýmllý seçenek . Herþey'den sonra , yardýmiletisinin kýrýný "
+#~ "göstermek zorundayýz , deðil mi ?"
+
+#~ msgid "13ME"
+#~ msgstr "13ME"
+
+#~ msgid "Needs a single -"
+#~ msgstr "Tek bir - bekler"
+
+#~ msgid "PATH"
+#~ msgstr "PATH"
+
+#~ msgid "POSIXLY_CORRECT"
+#~ msgstr "POSIXLY_CORRECT"
+
+#~ msgid "POSIX_ME_HARDER"
+#~ msgstr "POSIX_ME_HARDER"
+
+#~ msgid "Test argument callbacks"
+#~ msgstr "Deneme seçeneklerinin geri-verimleri"
+
+#~ msgid "This shouldn't show up"
+#~ msgstr "Bu ileti sana çýkmamasý lazým"
+
+#~ msgid "UNUSED"
+#~ msgstr "UNUSED"
+
+#~ msgid "Unused option for help testing"
+#~ msgstr "Yardýmý denemek için kullanýlan bir avare seçenek"
+
+#~ msgid "Usage:"
+#~ msgstr "Kullaným :"
+
+#~ msgid "[OPTION...]"
+#~ msgstr "[SECENEK ... ]"
+
+#~ msgid "alias"
+#~ msgstr "nam-ý diðer"
+
+#~ msgid "aliases nested too deeply"
+#~ msgstr "nam-ý diðer iþini de abarttýn , ha"
+
+#~ msgid "arg for cb2"
+#~ msgstr "cb1 için seçenekler"
+
+#~ msgid "arg1"
+#~ msgstr "seçenek1"
+
+#~ msgid "arg1: %d arg2: %s"
+#~ msgstr "seçenek1: %d seçenek2: %s"
+
+#~ msgid "arg2"
+#~ msgstr "seçenek2"
+
+#~ msgid "arg3"
+#~ msgstr "seçenek3"
+
+#~ msgid "callback: %c %s %s "
+#~ msgstr "geri-verim: %c %s %s"
+
+#~ msgid "cb"
+#~ msgstr "cb"
+
+#~ msgid "cb2"
+#~ msgstr "cb2"
+
+#~ msgid "error in paramter quoting"
+#~ msgstr "veri veriminde hata oluþtu"
+
+#~ msgid "exec"
+#~ msgstr "exec"
+
+#~ msgid "help"
+#~ msgstr "yardým"
+
+#~ msgid "hidden"
+#~ msgstr "gizli"
+
+#~ msgid "inc"
+#~ msgstr "inc"
+
+#~ msgid "invalid numeric value"
+#~ msgstr "geçersiz sayýsal iþlem"
+
+#~ msgid "long"
+#~ msgstr "long"
+
+#~ msgid "missing argument"
+#~ msgstr "eksik seçenek argümaný"
 
-#: ../test1.c:30 ../test1.c:35
-msgid "Test argument callbacks"
-msgstr "Deneme seçeneklerinin geri-verimleri"
+#~ msgid "number too large or too small"
+#~ msgstr "sayý çok fazla uzun/kýsa"
 
-#: ../test1.c:53
-msgid "This shouldn't show up"
-msgstr "Bu ileti sana çýkmamasý lazým"
+#~ msgid "option type (%d) not implemented in popt\n"
+#~ msgstr "(%d) seçenek türü popt'de tanýnmýyor\n"
 
-#: ../test1.c:55
-msgid "UNUSED"
-msgstr "UNUSED"
+#~ msgid "sampledata"
+#~ msgstr "denemebilgisi"
 
-#: ../test1.c:36 ../test1.c:55
-msgid "Unused option for help testing"
-msgstr "Yardýmý denemek için kullanýlan bir avare seçenek"
+#~ msgid "shortoption"
+#~ msgstr "kýsaseçenek"
 
-#: ../popthelp.c:148
-msgid "Usage:"
-msgstr "Kullaným :"
+#~ msgid "test1"
+#~ msgstr "deneme_no1"
 
-#: ../popthelp.c:166
-msgid "[OPTION...]"
-msgstr "[SECENEK ... ]"
+#~ msgid "test1: bad argument %s: %s\n"
+#~ msgstr "deneme_no1:  kötü seçenek %s: %s\n"
 
-#: ../poptconfig.c:53
-msgid "alias"
-msgstr "nam-ý diðer"
+#~ msgid "unknown errno"
+#~ msgstr "tanýnmayan hata numarasý"
 
-#: ../popt.c:540
-msgid "aliases nested too deeply"
-msgstr "nam-ý diðer iþini de abarttýn , ha"
+#~ msgid "unknown error"
+#~ msgstr "tanýnmayan hata"
 
-#: ../test1.c:44
-msgid "arg for cb2"
-msgstr "cb1 için seçenekler"
+#~ msgid "unknown option"
+#~ msgstr "tanýnmayan seçenek"
 
-#: ../test1.c:45
-msgid "arg1"
-msgstr "seçenek1"
+#~ msgid "unused"
+#~ msgstr "kullanýlmýyor"
 
-#: ../test1.c:80
-#, c-format
-msgid "arg1: %d arg2: %s"
-msgstr "seçenek1: %d seçenek2: %s"
-
-#: ../test1.c:48
-msgid "arg2"
-msgstr "seçenek2"
-
-#: ../test1.c:49
-msgid "arg3"
-msgstr "seçenek3"
-
-#: ../test1.c:13
-#, c-format
-msgid "callback: %c %s %s "
-msgstr "geri-verim: %c %s %s"
-
-#: ../test1.c:35
-msgid "cb"
-msgstr "cb"
-
-#: ../test1.c:30
-msgid "cb2"
-msgstr "cb2"
-
-#: ../popt.c:542
-msgid "error in paramter quoting"
-msgstr "veri veriminde hata oluþtu"
-
-#: ../poptconfig.c:57
-msgid "exec"
-msgstr "exec"
-
-#: ../popthelp.c:29
-msgid "help"
-msgstr "yardým"
-
-#: ../test1.c:52
-msgid "hidden"
-msgstr "gizli"
-
-#: ../test1.c:40
-msgid "inc"
-msgstr "inc"
-
-#: ../popt.c:544
-msgid "invalid numeric value"
-msgstr "geçersiz sayýsal iþlem"
-
-#: ../test1.c:36
-msgid "long"
-msgstr "long"
-
-#: ../popt.c:536
-msgid "missing argument"
-msgstr "eksik seçenek argümaný"
-
-#: ../popt.c:546
-msgid "number too large or too small"
-msgstr "sayý çok fazla uzun/kýsa"
-
-#: ../popt.c:412
-#, c-format
-msgid "option type (%d) not implemented in popt\n"
-msgstr "(%d) seçenek türü popt'de tanýnmýyor\n"
-
-#: ../test1.c:34
-msgid "sampledata"
-msgstr "denemebilgisi"
-
-#: ../test1.c:50
-msgid "shortoption"
-msgstr "kýsaseçenek"
-
-#: ../test1.c:62
-msgid "test1"
-msgstr "deneme_no1"
-
-#: ../test1.c:66
-#, c-format
-msgid "test1: bad argument %s: %s\n"
-msgstr "deneme_no1:  kötü seçenek %s: %s\n"
-
-#: ../popt.c:34
-msgid "unknown errno"
-msgstr "tanýnmayan hata numarasý"
-
-#: ../popt.c:550
-msgid "unknown error"
-msgstr "tanýnmayan hata"
-
-#: ../popt.c:538
-msgid "unknown option"
-msgstr "tanýnmayan seçenek"
-
-#: ../test1.c:54
-msgid "unused"
-msgstr "kullanýlmýyor"
-
-#: ../popthelp.c:30
-msgid "usage"
-msgstr "kullaným"
+#~ msgid "usage"
+#~ msgstr "kullaným"
diff --git a/rpm.spec b/rpm.spec
index 97afcde..38503c0 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 3.1
 Version: %{version}
-Release: 0.13
+Release: 0.14
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -157,6 +157,21 @@ fi
 /usr/lib/rpm/rpmrc
 /usr/lib/rpm/vpkg-provides.sh
 /usr/lib/rpm/vpkg-provides2.sh
+%ifarch i386 i486 i586 i686
+/usr/lib/rpm/i[3456]86*
+%endif
+%ifarch alpha
+/usr/lib/rpm/alpha*
+%endif
+%ifarch sparc sparc64
+/usr/lib/rpm/sparc*
+%endif
+%ifarch ia64
+/usr/lib/rpm/ia64*
+%endif
+%ifarch powerpc ppc
+/usr/lib/rpm/powerpc*
+%endif
 
 %dir /usr/src/redhat
 %dir /usr/src/redhat/BUILD
@@ -219,6 +234,11 @@ fi
 /usr/include/popt.h
 
 %changelog
+* Mon May  1 2000 Jeff Johnson <jbj@redhat.com>
+- Rename db0.c to db1.c, resurrect db2.c (from db3.c).
+- Add ia64 and sparc64 changes.
+- rpm.spec: add per-platform sub-directories.
+
 * Fri Apr 28 2000 Jeff Johnson <jbj@redhat.com>
 - Filter DB_INCOMPLETE on db->sync, it's usually harmless.
 - Add per-transaction cache of resolved dependencies (aka Depends).
diff --git a/rpmrc.in b/rpmrc.in
index c1a49c4..6bdc9c9 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -1,4 +1,4 @@
-# $Id: rpmrc.in,v 2.19 2000/03/17 21:04:50 jbj Exp $
+# $Id: rpmrc.in,v 2.20 2000/05/01 17:50:35 jbj Exp $
 
 #############################################################
 
@@ -8,6 +8,7 @@
 # Values for RPM_OPT_FLAGS for various platforms
 
 optflags: i386 -O2 -m486 -fno-strength-reduce
+optflags: ia64 -O2
 optflags: alpha -O2
 optflags: sparc -O2
 optflags: sparcv9 -O2 -mv8 -mtune=ultrasparc
@@ -115,6 +116,8 @@ buildarchtranslate: osfmach3_i586: i386
 buildarchtranslate: osfmach3_i486: i386
 buildarchtranslate: osfmach3_i386: i386
 
+buildarchtranslate: ia64: ia64
+
 buildarchtranslate: i986: i386
 buildarchtranslate: i886: i386
 buildarchtranslate: i786: i386
@@ -146,6 +149,8 @@ buildarchtranslate: hades: m68kmint
 
 arch_compat: alpha: axp noarch
 
+arch_compat: ia64: noarch
+
 arch_compat: i986: i886
 arch_compat: i886: i786
 arch_compat: i786: i686
@@ -225,6 +230,8 @@ os_compat: MiNT: FreeMiNT mint TOS
 os_compat: mint: FreeMiNT MiNT TOS
 os_compat: TOS: FreeMiNT MiNT mint
 
+buildarch_compat: ia64: noarch
+
 buildarch_compat: i986: i886
 buildarch_compat: i886: i786
 buildarch_compat: i786: i686