24 files changed, 914 insertions, 416 deletions

diff --git a/CHANGES b/CHANGES
index c3c9122c0..204d570b8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@
 	- prefer db3 as default.
 	- permit db3 configuration using macros.
 	- create dbi from template rather than passed args.
+	- use hashed access for package headers.
 
 3.0.3 -> 3.0.4
 	- use compressed filenames on install side.
diff --git a/lib/db0.c b/lib/db0.c
index 49db973cb..4bd2b49f0 100644
--- a/lib/db0.c
+++ b/lib/db0.c
@@ -1,5 +1,7 @@
 #include "system.h"
 
+static int _debug = 0;
+
 #include <db1/db.h>
 
 #define	DB_VERSION_MAJOR	0
@@ -28,6 +30,24 @@ 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;
+
+    if (error == 0)
+	rc = 0;
+    else if (error < 0)
+	rc = -1;
+    else if (error > 0)
+	rc = 1;
+
+    if (printit && rc) {
+	fprintf(stderr, "*** db%d %s rc %d error %d\n", dbi->dbi_major, msg,
+		rc, error);
+    }
+
+    return rc;
+}
+
 #if defined(__USE_DB2)
 static int db_init(const char *home, int dbflags,
 			DB_ENV **dbenvp, DB_INFO **dbinfop)
@@ -218,10 +238,21 @@ static int db0SearchIndex(dbiIndex dbi, const char * str, dbiIndexSet * set) {
     case RET_SUCCESS:	/* 0 */
 	rc = 0;
 	if (set) {
+	    DBIR_t dbir = data.data;
+	    int i;
+
 	    *set = dbiCreateIndexSet();
-	    (*set)->recs = xmalloc(data.size);
-	    memcpy((*set)->recs, data.data, data.size);
-	    (*set)->count = data.size / sizeof(*(*set)->recs);
+	    (*set)->count = data.size / sizeof(*dbir);
+	    (*set)->recs = xmalloc((*set)->count * sizeof(*((*set)->recs)));
+
+	    /* Convert from 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;
+	    }
 	}
 	break;
     }
@@ -240,10 +271,19 @@ static int db0UpdateIndex(dbiIndex dbi, const char * str, dbiIndexSet set) {
 
     if (set->count) {
 	DBT data;
+	DBIR_t dbir = alloca(set->count * sizeof(*dbir));
+	int i;
+
+	/* 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;
+	}
 
 	_mymemset(&data, 0, sizeof(data));
-	data.data = set->recs;
-	data.size = set->count * sizeof(*(set->recs));
+	data.data = dbir;
+	data.size = set->count * sizeof(*dbir);
 
 #if defined(__USE_DB2)
 	rc = db->put(db, NULL, &key, &data, 0);
@@ -285,6 +325,72 @@ static int db0UpdateIndex(dbiIndex dbi, const char * str, dbiIndexSet set) {
 }
 /*@=compmempass@*/
 
+static int db0del(dbiIndex dbi, void * keyp, size_t keylen)
+{
+    DBT key;
+    DB * db = GetDB(dbi);
+    int rc;
+
+    _mymemset(&key, 0, sizeof(key));
+
+    key.data = keyp;
+    key.size = keylen;
+
+    rc = db->del(db, &key, 0);
+    rc = cvtdberr(dbi, "db->del", rc, _debug);
+
+    return rc;
+}
+
+static int db0get(dbiIndex dbi, void * keyp, size_t keylen,
+		void ** datap, size_t * datalen)
+{
+    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));
+
+    key.data = keyp;
+    key.size = keylen;
+    data.data = NULL;
+    data.size = 0;
+
+    rc = db->get(db, &key, &data, 0);
+    rc = cvtdberr(dbi, "db->get", rc, _debug);
+
+    if (rc == 0) {
+	*datap = data.data;
+	*datalen = data.size;
+    }
+
+    return rc;
+}
+
+static int db0put(dbiIndex dbi, void * keyp, size_t keylen,
+		void * datap, size_t datalen)
+{
+    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;
+
+    rc = db->put(db, &key, &data, 0);
+    rc = cvtdberr(dbi, "db->put", rc, _debug);
+
+    return rc;
+}
+
 static int db0open(dbiIndex dbi)
 {
     int rc;
@@ -325,5 +431,6 @@ fprintf(stderr, "*** db%dopen: %s\n", dbi->dbi_major, dbi->dbi_file);
 
 struct _dbiVec db0vec = {
     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
-    db0open, db0close, db0sync, db0GetFirstKey, db0SearchIndex, db0UpdateIndex
+    db0open, db0close, db0sync, db0GetFirstKey, db0SearchIndex, db0UpdateIndex,
+    db0del, db0get, db0put
 };
diff --git a/lib/db1.c b/lib/db1.c
index 17248c706..7145ff686 100644
--- a/lib/db1.c
+++ b/lib/db1.c
@@ -2,6 +2,8 @@
 
 #ifdef HAVE_DB_185_H
 
+static int _debug = 1;
+
 #include <db_185.h>
 
 #define	DB_VERSION_MAJOR	1
@@ -30,6 +32,24 @@ 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;
+
+    if (error == 0)
+	rc = 0;
+    else if (error < 0)
+	rc = -1;
+    else if (error > 0)
+	rc = 1;
+
+    if (printit && rc) {
+	fprintf(stderr, "*** db%d %s rc %d error %d\n", dbi->dbi_major, msg,
+		rc, error);
+    }
+
+    return rc;
+}
+
 #if defined(__USE_DB2)
 static int db_init(const char *home, int dbflags,
 			DB_ENV **dbenvp, DB_INFO **dbinfop)
@@ -220,10 +240,21 @@ static int db1SearchIndex(dbiIndex dbi, const char * str, dbiIndexSet * set) {
     case RET_SUCCESS:	/* 0 */
 	rc = 0;
 	if (set) {
+	    DBIR_t dbir = data.data;
+	    int i;
+
 	    *set = dbiCreateIndexSet();
-	    (*set)->recs = xmalloc(data.size);
-	    memcpy((*set)->recs, data.data, data.size);
-	    (*set)->count = data.size / sizeof(*(*set)->recs);
+	    (*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;
+	    }
 	}
 	break;
     }
@@ -242,10 +273,19 @@ static int db1UpdateIndex(dbiIndex dbi, const char * str, dbiIndexSet set) {
 
     if (set->count) {
 	DBT data;
+	DBIR_t dbir = alloca(set->count * sizeof(*dbir));
+	int i;
+
+	/* 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;
+	}
 
 	_mymemset(&data, 0, sizeof(data));
-	data.data = set->recs;
-	data.size = set->count * sizeof(*(set->recs));
+	data.data = dbir;
+	data.size = set->count * sizeof(*dbir);
 
 #if defined(__USE_DB2)
 	rc = db->put(db, NULL, &key, &data, 0);
@@ -287,6 +327,72 @@ static int db1UpdateIndex(dbiIndex dbi, const char * str, dbiIndexSet set) {
 }
 /*@=compmempass@*/
 
+static int db1del(dbiIndex dbi, void * keyp, size_t keylen)
+{
+    DBT key;
+    DB * db = GetDB(dbi);
+    int rc;
+
+    _mymemset(&key, 0, sizeof(key));
+
+    key.data = keyp;
+    key.size = keylen;
+
+    rc = db->del(db, &key, 0);
+    rc = cvtdberr(dbi, "db->del", rc, _debug);
+
+    return rc;
+}
+
+static int db1get(dbiIndex dbi, void * keyp, size_t keylen,
+		void ** datap, size_t * datalen)
+{
+    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));
+
+    key.data = keyp;
+    key.size = keylen;
+    data.data = NULL;
+    data.size = 0;
+
+    rc = db->get(db, &key, &data, 0);
+    rc = cvtdberr(dbi, "db->get", rc, _debug);
+
+    if (rc == 0) {
+	*datap = data.data;
+	*datalen = data.size;
+    }
+
+    return rc;
+}
+
+static int db1put(dbiIndex dbi, void * keyp, size_t keylen,
+		void * datap, size_t datalen)
+{
+    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;
+
+    rc = db->put(db, &key, &data, 0);
+    rc = cvtdberr(dbi, "db->put", rc, _debug);
+
+    return rc;
+}
+
 static int db1open(dbiIndex dbi)
 {
     int rc;
@@ -327,7 +433,8 @@ fprintf(stderr, "*** db%dopen: %s\n", dbi->dbi_major, dbi->dbi_file);
 
 struct _dbiVec db1vec = {
     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
-    db1open, db1close, db1sync, db1GetFirstKey, db1SearchIndex, db1UpdateIndex
+    db1open, db1close, db1sync, db1GetFirstKey, db1SearchIndex, db1UpdateIndex,
+    db1del, db1get, db1put
 };
 
 #endif	/* HABE_DB_185_H */
diff --git a/lib/db2.c b/lib/db2.c
index 1ed4bec50..c40851495 100644
--- a/lib/db2.c
+++ b/lib/db2.c
@@ -365,10 +365,21 @@ static int db2SearchIndex(dbiIndex dbi, const char * str, dbiIndexSet * set)
 #endif
 
     if (rc == 0 && set) {
+	DBIR_t dbir = data.data;
+	int i;
+
 	*set = dbiCreateIndexSet();
-	(*set)->recs = xmalloc(data.size);
-	memcpy((*set)->recs, data.data, data.size);
-	(*set)->count = data.size / sizeof(*(*set)->recs);
+	(*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;
+	}
     }
     return rc;
 }
@@ -386,10 +397,19 @@ static int db2UpdateIndex(dbiIndex dbi, const char * str, dbiIndexSet set)
 
     if (set->count) {
 	DBT data;
+	DBIR_t dbir = alloca(set->count * sizeof(*dbir));
+	int i;
+
+	/* 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;
+	}
 
 	_mymemset(&data, 0, sizeof(data));
-	data.data = set->recs;
-	data.size = set->count * sizeof(*(set->recs));
+	data.data = dbir;
+	data.size = set->count * sizeof(*dbir);
 
 #if defined(__USE_DB2) || defined(__USE_DB3)
 	rc = db->put(db, NULL, &key, &data, 0);
@@ -413,6 +433,75 @@ static int db2UpdateIndex(dbiIndex dbi, const char * str, dbiIndexSet set)
 }
 /*@=compmempass@*/
 
+static int db2del(dbiIndex dbi, void * keyp, size_t keylen)
+{
+    DB_TXN * txnid = NULL;
+    DBT key;
+    DB * db = GetDB(dbi);
+    int rc;
+
+    _mymemset(&key, 0, sizeof(key));
+
+    key.data = keyp;
+    key.size = keylen;
+
+    rc = db->del(db, txnid, &key, 0);
+    rc = cvtdberr(dbi, "db->del", rc, _debug);
+
+    return rc;
+}
+
+static int db2get(dbiIndex dbi, void * keyp, size_t keylen,
+		void ** datap, size_t * datalen)
+{
+    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));
+
+    key.data = keyp;
+    key.size = keylen;
+    data.data = NULL;
+    data.size = 0;
+
+    rc = db->get(db, txnid, &key, &data, 0);
+    rc = cvtdberr(dbi, "db->get", rc, _debug);
+
+    if (rc == 0) {
+	*datap = data.data;
+	*datalen = data.size;
+    }
+
+    return rc;
+}
+
+static int db2put(dbiIndex dbi, void * keyp, size_t keylen,
+		void * datap, size_t datalen)
+{
+    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;
+
+    rc = db->put(db, txnid, &key, &data, 0);
+    rc = cvtdberr(dbi, "db->get", rc, _debug);
+
+    return rc;
+}
+
 static int db2open(dbiIndex dbi)
 {
     int rc = 0;
@@ -479,7 +568,8 @@ fprintf(stderr, "*** db%dopen: %s\n", dbi->dbi_major, dbfile);
 
 struct _dbiVec db2vec = {
     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
-    db2open, db2close, db2sync, db2GetFirstKey, db2SearchIndex, db2UpdateIndex
+    db2open, db2close, db2sync, db2GetFirstKey, db2SearchIndex, db2UpdateIndex,
+    db2del, db2get, db2put
 };
 
 #endif	/* DB_VERSION_MAJOR == 2 */
diff --git a/lib/db3.c b/lib/db3.c
index 83a67c7ea..5b57d2e43 100644
--- a/lib/db3.c
+++ b/lib/db3.c
@@ -489,21 +489,28 @@ static int db3SearchIndex(dbiIndex dbi, const char * str, dbiIndexSet * set)
     } else
 #endif
     rc = db->get(db, NULL, &key, &data, 0);
-#if 0
     _printit = (rc == DB_NOTFOUND ? 0 : _debug);
-#else
-    _printit = _debug;
-#endif
     rc = cvtdberr(dbi, "db->get", rc, _printit);
 #else
     rc = db->get(db, &key, &data, 0);
 #endif
 
     if (rc == 0 && set) {
+	DBIR_t dbir = data.data;
+	int i;
+
 	*set = dbiCreateIndexSet();
-	(*set)->recs = xmalloc(data.size);
-	memcpy((*set)->recs, data.data, data.size);
-	(*set)->count = data.size / sizeof(*(*set)->recs);
+	(*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;
+	}
     }
     return rc;
 }
@@ -525,6 +532,16 @@ static int db3UpdateIndex(dbiIndex dbi, const char * str, dbiIndexSet set)
     if (set->count) {
 
 #if defined(__USE_DB2) || defined(__USE_DB3)
+	DBIR_t dbir = alloca(set->count * sizeof(*dbir));
+	int i;
+
+	/* 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;
+	}
+	
 #if defined(__USE_DB3)
 	if (dbi->dbi_dbcursor) {
 	    DBC *dbcursor = dbi->dbi_dbcursor;
@@ -532,16 +549,16 @@ static int db3UpdateIndex(dbiIndex dbi, const char * str, dbiIndexSet set)
 
 	    rc = dbcursor->c_get(dbcursor, &key, &data, (DB_SET|DB_RMW));
 	    xx = cvtdberr(dbi, "db->c_get RMW put", rc, _debug);
-	    data.data = set->recs;
-	    data.size = set->count * sizeof(*(set->recs));
+	    data.data = dbir;
+	    data.size = set->count * sizeof(*dbir);
 	    rc = dbcursor->c_put(dbcursor, &key, &data,
 		(rc == DB_NOTFOUND ? DB_KEYFIRST : DB_CURRENT));
 	    rc = cvtdberr(dbi, "db->c_put RMW", rc, _debug);
 	} else
 #endif
 	{
-	    data.data = set->recs;
-	    data.size = set->count * sizeof(*(set->recs));
+	    data.data = dbir;
+	    data.size = set->count * sizeof(*dbir);
 	    rc = db->put(db, NULL, &key, &data, 0);
 	    rc = cvtdberr(dbi, "db->put", rc, _debug);
 	}
@@ -579,6 +596,83 @@ static int db3UpdateIndex(dbiIndex dbi, const char * str, dbiIndexSet set)
 }
 /*@=compmempass@*/
 
+static int db3del(dbiIndex dbi, void * keyp, size_t keylen)
+{
+    DB_TXN * txnid = NULL;
+    DBT key;
+    DB * db = GetDB(dbi);
+    int rc;
+
+    _mymemset(&key, 0, sizeof(key));
+
+    key.data = keyp;
+    key.size = keylen;
+
+    rc = db->del(db, txnid, &key, 0);
+if (_debug)
+fprintf(stderr, "*** db3del(%p, %p,%d) rc %d\n", dbi, keyp, keylen, rc);
+    rc = cvtdberr(dbi, "db->del", rc, _debug);
+
+    return rc;
+}
+
+static int db3get(dbiIndex dbi, void * keyp, size_t keylen,
+		void ** datap, size_t * datalen)
+{
+    DB_TXN * txnid = NULL;
+    DBT key, data;
+    DB * db = GetDB(dbi);
+    int _printit;
+    int rc;
+
+    if (datap) *datap = NULL;
+    if (datalen) *datalen = 0;
+    _mymemset(&key, 0, sizeof(key));
+    _mymemset(&data, 0, sizeof(data));
+
+    key.data = keyp;
+    key.size = keylen;
+    data.data = NULL;
+    data.size = 0;
+
+    rc = db->get(db, txnid, &key, &data, 0);
+    _printit = (rc == DB_NOTFOUND ? 0 : _debug);
+    rc = cvtdberr(dbi, "db->get", rc, _printit);
+
+    if (rc == 0) {
+	*datap = data.data;
+	*datalen = data.size;
+    }
+if (_debug)
+fprintf(stderr, "*** db3get(%p, %p,%d, %p,%d) rc %d\n", dbi, keyp, keylen, *datap, *datalen, rc);
+
+    return rc;
+}
+
+static int db3put(dbiIndex dbi, void * keyp, size_t keylen,
+		void * datap, size_t datalen)
+{
+    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;
+
+    rc = db->put(db, txnid, &key, &data, 0);
+if (_debug)
+fprintf(stderr, "*** db3put(%p, %p,%d, %p,%d) rc %d\n", dbi, keyp, keylen, datap, datalen, rc);
+    rc = cvtdberr(dbi, "db->get", rc, _debug);
+
+    return rc;
+}
+
 static int db3open(dbiIndex dbi)
 {
     int rc = 0;
@@ -637,8 +731,13 @@ static int db3open(dbiIndex dbi)
 		rc = cvtdberr(dbi, "db->set_flags", rc, _debug);
 	    }
 	    dbi->dbi_dbinfo = NULL;
-	    rc = db->open(db, dbfile, NULL, dbi_to_dbtype(dbi->dbi_type),
+	    if (dbi->dbi_rpmtag == 0) {
+		rc = db->open(db, dbfile, "packages.rpm", dbi_to_dbtype(dbi->dbi_type),
+			dbflags, dbi->dbi_perms);
+	    } else {
+		rc = db->open(db, "packages.db3", dbfile, dbi_to_dbtype(dbi->dbi_type),
 			dbflags, dbi->dbi_perms);
+	    }
 	    rc = cvtdberr(dbi, "db->open", rc, _debug);
 
 	    __do_dbcursor_rmw = rpmExpandNumeric("%{_db3_dbcursor_rmw}");
@@ -693,7 +792,8 @@ fprintf(stderr, "*** db%dopen: %s\n", dbi->dbi_major, dbfile);
 
 struct _dbiVec db3vec = {
     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
-    db3open, db3close, db3sync, db3GetFirstKey, db3SearchIndex, db3UpdateIndex
+    db3open, db3close, db3sync, db3GetFirstKey, db3SearchIndex, db3UpdateIndex,
+    db3del, db3get, db3put
 };
 
 #endif	/* DB_VERSION_MAJOR == 3 */
diff --git a/lib/dbindex.h b/lib/dbindex.h
index 67d3fa785..6c6d267f1 100644
--- a/lib/dbindex.h
+++ b/lib/dbindex.h
@@ -13,15 +13,27 @@ typedef /*@abstract@*/ struct _dbiIndex * dbiIndex;
 
 /* this will break if sizeof(int) != 4 */
 /**
- * A single item in an index database.
- * Note: In rpm-3.0.4 and earlier, this structure was passed by value.
+ * A single item from an index database (i.e. the "data returned").
+ * Note: In rpm-3.0.4 and earlier, this structure was passed by value,
+ * and was identical to the "data saved" structure below.
  */
 struct _dbiIndexRecord {
     unsigned int recOffset;		/*!< byte offset of header in db */
     unsigned int fileNumber;		/*!< file array index */
+    int fpNum;				/*!< finger print index */
+    int dbNum;				/*!< database index */
 };
 
 /**
+ * A single item in an index database (i.e. the "data saved").
+ */
+struct _dbiIR {
+    unsigned int recOffset;		/*!< byte offset of header in db */
+    unsigned int fileNumber;		/*!< file array index */
+};
+typedef	struct _dbiIR * DBIR_t;
+
+/**
  * Items retrieved from the index database.
  */
 struct _dbiIndexSet {
@@ -83,6 +95,37 @@ struct _dbiVec {
  * @return	0 success, 1 not found
  */
     int (*UpdateIndex) (dbiIndex dbi, const char * str, dbiIndexSet set);
+
+/**
+ * Delete item using db->del.
+ * @param dbi	index database handle
+ * @param keyp	key data
+ * @param keylen key data length
+ */
+    int (*del) (dbiIndex dbi, void * keyp, size_t keylen);
+
+/**
+ * Retrieve item using db->get.
+ * @param dbi	index database handle
+ * @param keyp	key data
+ * @param keylen key data length
+ * @param datap	address of data pointer
+ * @param datalen address of data length
+ */
+    int (*get) (dbiIndex dbi, void * keyp, size_t keylen,
+			void ** datap, size_t * datalen);
+
+/**
+ * Save item using db->put.
+ * @param dbi	index database handle
+ * @param keyp	key data
+ * @param keylen key data length
+ * @param datap	data pointer
+ * @param datalen data length
+ */
+    int (*put) (dbiIndex dbi, void * keyp, size_t keylen,
+			void * datap, size_t datalen);
+
 };
 
 /**
diff --git a/lib/rebuilddb.c b/lib/rebuilddb.c
index 5d267a6c7..e9a44ca71 100644
--- a/lib/rebuilddb.c
+++ b/lib/rebuilddb.c
@@ -144,7 +144,8 @@ fprintf(stderr, "*** rpmdbRebuild: filterdbdups %d preferdb %d\n", _filterDbDups
 	recnum = rpmdbNextRecNum(olddb, recnum);
     }
 
-    __do_dbenv_remove = 1;	/* XXX in dbindex.c, shared with rebuilddb.c */
+    if (!nocleanup)
+	__do_dbenv_remove = 1;	/* XXX in dbindex.c, shared with rebuilddb.c */
     rpmdbClose(olddb);
     rpmdbClose(newdb);
 
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 6a239288e..1e07d4f59 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -1,5 +1,7 @@
 #include "system.h"
 
+static int _debug = 0;
+
 #include <sys/file.h>
 #include <signal.h>
 #include <sys/signal.h>
@@ -24,8 +26,8 @@ extern int _noDirTokens;
 #define	_DBI_MAJOR	-1
 
 struct _dbiIndex rpmdbi[] = {
-    { "packages.rpm", 0,
-	DBI_RECNO, _DBI_FLAGS, _DBI_PERMS, _DBI_MAJOR,
+    { "packages.db3", 0,
+	DBI_HASH, _DBI_FLAGS, _DBI_PERMS, _DBI_MAJOR,
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL },
 #define	RPMDBI_PACKAGES		0
     { "nameindex.rpm", RPMTAG_NAME,
@@ -57,7 +59,7 @@ struct _dbiIndex rpmdbi[] = {
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL },
 #define	RPMDBI_TRIGGER		7
     { NULL }
-#define	RPMDBI_MIN		1	/* XXX no package headers yet */
+#define	RPMDBI_MIN		0
 #define	RPMDBI_MAX		8
 };
 
@@ -234,8 +236,10 @@ int openDatabase(const char * prefix, const char * dbpath, rpmdb *rpmdbp, int mo
 	    dbiIndex dbiTemplate;
 
 	    dbiTemplate = rpmdbi + dbix;
+
 	    rc = openDbFile(prefix, dbpath, dbiTemplate, justcheck, mode,
 			&db->_dbi[dbix]);
+	    if (dbix == 0) rc = 0;	/* XXX HACK */
 	    if (rc)
 		continue;
 
@@ -318,7 +322,7 @@ void rpmdbClose (rpmdb db)
     int dbix;
 
     if (db->pkgs != NULL) Fclose(db->pkgs);
-    for (dbix = RPMDBI_MIN; dbix < RPMDBI_MAX; dbix++) {
+    for (dbix = RPMDBI_MAX; --dbix >= RPMDBI_MAX; ) {
 	if (db->_dbi[dbix] == NULL)
 	    continue;
     	dbiCloseIndex(db->_dbi[dbix]);
@@ -394,6 +398,20 @@ static Header doGetRecord(rpmdb db, unsigned int offset, int pristine)
 
 Header rpmdbGetRecord(rpmdb db, unsigned int offset)
 {
+    int _use_falloc = rpmExpandNumeric("%{_db3_use_falloc}");
+    dbiIndex dbi;
+
+    if (!_use_falloc && (dbi = db->_dbi[RPMDBI_PACKAGES]) != NULL) {
+	void * uh;
+	size_t uhlen;
+	int rc;
+
+	rc = (*dbi->dbi_vec->get) (dbi, &offset, sizeof(offset), &uh, &uhlen);
+	if (rc)
+	    return NULL;
+	return headerLoad(uh);
+    }
+
     return doGetRecord(db, offset, 0);
 }
 
@@ -437,14 +455,14 @@ int rpmdbFindByFile(rpmdb db, const char * filespec, dbiIndexSet * matches)
     *matches = dbiCreateIndexSet();
     rec = dbiReturnIndexRecordInstance(0, 0);
     i = 0;
-    while (i < dbiIndexSetCount(allMatches)) {
+    while (i < allMatches->count) {
 	const char ** baseNames, ** dirNames;
 	int_32 * dirIndexes;
-	unsigned int recoff = dbiIndexRecordOffset(allMatches, i);
+	unsigned int offset = dbiIndexRecordOffset(allMatches, i);
 	unsigned int prevoff;
 	Header h;
 
-	if ((h = rpmdbGetRecord(db, recoff)) == NULL) {
+	if ((h = rpmdbGetRecord(db, offset)) == NULL) {
 	    i++;
 	    continue;
 	}
@@ -467,11 +485,11 @@ int rpmdbFindByFile(rpmdb db, const char * filespec, dbiIndexSet * matches)
 		dbiAppendIndexRecord(*matches, rec);
 	    }
 
-	    prevoff = recoff;
+	    prevoff = offset;
 	    i++;
-	    recoff = dbiIndexRecordOffset(allMatches, i);
-	} while (i < dbiIndexSetCount(allMatches) && 
-		(i == 0 || recoff == prevoff));
+	    offset = dbiIndexRecordOffset(allMatches, i);
+	} while (i < allMatches->count && 
+		(i == 0 || offset == prevoff));
 
 	free(baseNames);
 	free(dirNames);
@@ -489,7 +507,7 @@ int rpmdbFindByFile(rpmdb db, const char * filespec, dbiIndexSet * matches)
 
     fpCacheFree(fpc);
 
-    if (dbiIndexSetCount(*matches) == 0) {
+    if ((*matches)->count == 0) {
 	dbiFreeIndexSet(*matches);
 	*matches = NULL; 
 	return 1;
@@ -577,6 +595,15 @@ int rpmdbRemove(rpmdb db, unsigned int offset, int tolerant)
 	    int rpmcnt = 0;
 
 	    dbi = db->_dbi[dbix];
+
+if (_debug)
+fprintf(stderr, "*** removing dbix %d tag %d offset 0x%x\n", dbix, dbi->dbi_rpmtag, offset);
+	    if (dbi->dbi_rpmtag == 0) {
+		/* XXX TODO: remove h to packages.rpm */
+		(void) (*dbi->dbi_vec->del) (dbi, &offset, sizeof(offset));
+		continue;
+	    }
+	
 	    if (!headerGetEntry(h, dbi->dbi_rpmtag, &rpmtype,
 		(void **) &rpmvals, &rpmcnt)) {
 		rpmMessage(RPMMESS_DEBUG, _("removing 0 %s entries.\n"),
@@ -690,13 +717,12 @@ int rpmdbAdd(rpmdb db, Header h)
     int rc = 0;
 
     /*
-     * If old style filenames is requested, the basenames need to be
+     * If old style filename tags is requested, the basenames need to be
      * retrieved early, and the header needs to be converted before
      * being written to the package header database.
      */
 
-    headerGetEntry(h, RPMTAG_BASENAMES, &type, (void **) 
-		    &baseNames, &count);
+    headerGetEntry(h, RPMTAG_BASENAMES, &type, (void **) &baseNames, &count);
 
     if (_noDirTokens)
 	expandFilelist(h);
@@ -734,6 +760,17 @@ int rpmdbAdd(rpmdb db, Header h)
 
 	    dbi = db->_dbi[dbix];
 
+if (_debug)
+fprintf(stderr, "*** adding dbix %d tag %d offset 0x%x\n", dbix, dbi->dbi_rpmtag, offset);
+	    if (dbi->dbi_rpmtag == 0) {
+		size_t uhlen = headerSizeof(h, HEADER_MAGIC_NO);
+		void * uh = headerUnload(h);
+		/* XXX TODO: add h to packages.rpm */
+		(void) (*dbi->dbi_vec->put) (dbi, &offset, sizeof(offset), uh, uhlen);
+		free(uh);
+		continue;
+	    }
+	
 	    /* XXX preserve legacy behavior */
 	    switch (dbi->dbi_rpmtag) {
 	    case RPMTAG_BASENAMES:
@@ -925,16 +962,20 @@ int rpmdbMoveDatabase(const char * rootdir, const char * olddbpath, const char *
     return rc;
 }
 
-struct intMatch {
+#ifdef	DYING
+typedef struct intMatch {
     unsigned int recOffset;
     unsigned int fileNumber;
     int fpNum;
-};
+} IM_t;
+#else
+typedef	struct _dbiIndexRecord IM_t;
+#endif
 
 static int intMatchCmp(const void * one, const void * two)
 {
-    const struct intMatch * a = one;
-    const struct intMatch * b = two;
+    const IM_t * a = one;
+    const IM_t * b = two;
 
     if (a->recOffset < b->recOffset)
 	return -1;
@@ -949,7 +990,7 @@ int rpmdbFindFpList(rpmdb db, fingerPrint * fpList, dbiIndexSet * matchList,
 {
     int numIntMatches = 0;
     int intMatchesAlloced = numItems;
-    struct intMatch * intMatches;
+    IM_t * intMatches;
     int i, j;
     int start, end;
     int num;
@@ -980,18 +1021,20 @@ int rpmdbFindFpList(rpmdb db, fingerPrint * fpList, dbiIndexSet * matchList,
 	    return 1;
 	    /*@notreached@*/ break;
 	case 0:
-	    if ((numIntMatches + dbiIndexSetCount(matches)) >= intMatchesAlloced) {
-		intMatchesAlloced += dbiIndexSetCount(matches);
+	    if ((numIntMatches + matches->count) >= intMatchesAlloced) {
+		intMatchesAlloced += matches->count;
 		intMatchesAlloced += intMatchesAlloced / 5;
 		intMatches = xrealloc(intMatches, 
 				     sizeof(*intMatches) * intMatchesAlloced);
 	    }
 
-	    for (j = 0; j < dbiIndexSetCount(matches); j++) {
+	    for (j = 0; j < matches->count; j++) {
+		IM_t * im;
 		
-		intMatches[numIntMatches].recOffset = dbiIndexRecordOffset(matches, j);
-		intMatches[numIntMatches].fileNumber = dbiIndexRecordFileNumber(matches, j);
-		intMatches[numIntMatches].fpNum = i;
+		im = intMatches + numIntMatches;
+		im->recOffset = dbiIndexRecordOffset(matches, j);
+		im->fileNumber = dbiIndexRecordFileNumber(matches, j);
+		im->fpNum = i;
 		numIntMatches++;
 	    }
 
@@ -1015,7 +1058,7 @@ int rpmdbFindFpList(rpmdb db, fingerPrint * fpList, dbiIndexSet * matchList,
 
     /* For each set of files matched in a package ... */
     for (start = 0; start < numIntMatches; start = end) {
-	struct intMatch * im;
+	IM_t * im;
 	Header h;
 	fingerPrint * fps;
 
diff --git a/macros.in b/macros.in
index 99ef827ba..ff82e8436 100644
--- a/macros.in
+++ b/macros.in
@@ -1,4 +1,4 @@
-# $Id: macros.in,v 1.49 2000/04/03 14:24:55 jbj Exp $
+# $Id: macros.in,v 1.50 2000/04/06 15:20:29 jbj Exp $
 #==============================================================================
 # Macro naming conventions (preliminary):
 #
@@ -206,6 +206,9 @@
 #	2	native db2 interface.
 #	3	native db3 interface.
 %_preferdb		3
+%_db3_flags		create:mpool
+%_db3_dbenv_remove	yes
+%_db3_use_falloc	no
 
 # Filter duplicate entries in db (needed only to correct bug pre rpm-3.0.4)
 %_filterdbdups		no
diff --git a/po/cs.po b/po/cs.po
index 84d62a659..a3ffba822 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-04 06:01-0400\n"
+"POT-Creation-Date: 2000-04-06 10:45-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"
@@ -2844,7 +2844,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr "zobrazit seznam souborù balíèkù"
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr "nebyla nastavena dbpath"
 
@@ -2898,20 +2898,20 @@ msgstr "nelze pøidat záznam - pùvodnì u %d"
 msgid "record number %d in database is bad -- skipping."
 msgstr "záznam èíslo %d v databázi je chybný -- vynechává se"
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 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/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr "starou databázi nelze nahradit novou databází!\n"
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr "aby se obnovily, nahrazuje soubory v %s soubory z %s"
 
-#: lib/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nelze odstranit %s: %s\n"
@@ -3001,95 +3001,95 @@ msgstr ""
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, fuzzy, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr "probíhá otevírání databázového re¾imu: 0%o\n"
 
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nelze otevøít %s: %s"
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "nelze získat %s zámek k databázi"
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr "výhradní"
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr "sdílený"
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, fuzzy, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr "balíèek %s nenalezen v %s"
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "balíèek %s nenalezen v %s"
 
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:581
 #, fuzzy, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr "nelze èíst hlavièku u %d pro vyhledání"
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraòuje se polo¾ka databáze\n"
 
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuje se rejstøík skupin\n"
 
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "odstraòuje se rejstøík názvù\n"
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr "nelze alokovat prostor pro databázi"
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "Probíhá získávání %s jako %s\n"
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr "nelze èíst hlavièku u %d pro inovaci"
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr "hlavièka zmìnila velikost!"
 
diff --git a/po/de.po b/po/de.po
index 17c19fbf0..2edabc889 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-04 06:01-0400\n"
+"POT-Creation-Date: 2000-04-06 10:45-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"
@@ -2960,7 +2960,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr "Dateiliste des Pakets anzeigen"
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr "»dbpath« ist nicht gesetzt"
 
@@ -3016,21 +3016,21 @@ msgid "record number %d in database is bad -- skipping."
 msgstr ""
 "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr ""
 
 # , c-format
-#: lib/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -3120,99 +3120,99 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, fuzzy, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
 # , c-format
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "kann %s lock für die Datenbank nicht bekommen"
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr "exklusiv"
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr "geteilt"
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, fuzzy, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr "Paket %s in %s nicht gefunden"
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "Paket %s in %s nicht gefunden"
 
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:581
 #, fuzzy, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
 # FIXME
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 # FIXME
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
 # reservieren???
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr "kann keinen Platz für die Datenbank bekommen"
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr "kann Kopfzeilen bei %d nicht lesen, um Update durchzuführen"
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index e5b52da3b..2cd9bd84b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-04-04 06:01-0400\n"
+"POT-Creation-Date: 2000-04-06 10:45-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -2882,7 +2882,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr "näytä paketin tiedostolistaus"
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
@@ -2936,20 +2936,20 @@ msgstr "en voi lisätä tietuetta %d:stä"
 msgid "record number %d in database is bad -- skipping."
 msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "en voinut avata %s: %s"
@@ -3039,95 +3039,95 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, fuzzy, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "en voi saada %s lukitusta tietokantaan"
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr "poissulkevaa"
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr "jaettua"
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, fuzzy, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:581
 #, fuzzy, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr "en voi lukea headeria %d:stä päivittäessä"
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr "en voi varata tilaa tietokannalle"
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr "en voi lukea headeria %d:stä päivittäessä"
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index b8cbc4e84..c77f65e61 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-04-04 06:01-0400\n"
+msgstr "POT-Creation-Date: 2000-04-06 10:45-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:425
 #, c-format
@@ -2886,7 +2886,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr "        -l                - affiche la liste des packages"
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -2940,20 +2940,20 @@ msgstr ""
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -3042,95 +3042,95 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr ""
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr ""
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, fuzzy, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, 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:563
+#: lib/rpmdb.c:581
 #, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr ""
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr ""
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index ef06b0292..3f71f55bf 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-04 06:01-0400\n"
+"POT-Creation-Date: 2000-04-06 10:45-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 ¤¬¤¢¤ê¤Þ¤»¤ó!\n"
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.36 2000/04/04 10:10:48 jbj Exp $
+# $Id: ja.po,v 1.37 2000/04/06 15:20:30 jbj Exp $
 #: rpm.c:200
 #, c-format
 msgid "rpm: %s\n"
@@ -2866,7 +2866,7 @@ msgstr "Îóµó¤·¤¿¥Õ¥¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤·¤Þ¤¹"
 msgid "display a verbose file listing"
 msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ò¾éŤËɽ¼¨¤·¤Þ¤¹"
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
@@ -2920,21 +2920,21 @@ msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Þ¤»¤ó"
 msgid "record number %d in database is bad -- skipping."
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Þ¤¹"
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Þ¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n"
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ð¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Þ¤¹"
 
-#: lib/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n"
@@ -3024,95 +3024,95 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, fuzzy, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥â¡¼¥É 0x%x ¤Î¥ª¡¼¥×¥ó (%s)\n"
 
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î %s ¤ò¥í¥Ã¥¯¤Ç¤­¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr "½ü³°"
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr "¶¦Í­"
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, fuzzy, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï %s Ãæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï %s Ãæ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:581
 #, fuzzy, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¥¨¥ó¥È¥ê¤òºï½ü¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹ÍѤζõ¤­ÍÆÎ̤¬Â­¤ê¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Þ¤¹\n"
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr "¥¢¥Ã¥×¥Ç¡¼¥ÈÍѤΠ%d ¤Ç¥Ø¥Ã¥À¤òÆɤá¤Þ¤»¤ó"
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr "¥Ø¥Ã¥À¤Î¥µ¥¤¥º¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿"
 
diff --git a/po/pl.po b/po/pl.po
index 281dc868e..7888e5eb7 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-04 06:01-0400\n"
+"POT-Creation-Date: 2000-04-06 10:45-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"
@@ -2787,7 +2787,7 @@ msgstr "wy¶wietl status pokazywanych plików"
 msgid "display a verbose file listing"
 msgstr "wy¶wietl wiêcej informacji o plikach z listy"
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr "¶cie¿ka bazy danych nie zosta³a podana"
 
@@ -2841,20 +2841,20 @@ msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d"
 msgid "record number %d in database is bad -- skipping."
 msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto"
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 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/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr "zamiana starej bazy na now± nie powiod³a siê!\n"
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr "naprawcze zastêpowanie plików w %s plikami z %s"
 
-#: lib/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n"
@@ -2943,30 +2943,30 @@ msgstr ")"
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr "otwiernie bazê danych w trybie 0x%x w %s\n"
 
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s"
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "utworzenie blokady %s na bazie danych nie jest mo¿liwe"
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr ""
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr ""
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -2974,66 +2974,66 @@ msgstr ""
 "baza danych jest w starym formacie; u¿yj --rebuilddb aby wygenerowaæ bazê  w "
 "nowym formacie"
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, fuzzy, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr "pakiet %s nie znaleziony w %s"
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "pakiet %s nie znaleziony w %s"
 
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:581
 #, fuzzy, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania"
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "usuwanie wpisu w bazie\n"
 
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "usuwanie indeksu grupy\n"
 
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "usuwanie indeksu nazw\n"
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr "nie mo¿na alokowaæ przestrzeni dla bazy danych"
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla uaktualnienia"
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr "nag³ówek zmieni³ swój rozmiar!"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index cccbfaf85..c6fdef2fb 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-04 06:01-0400\n"
+msgstr "POT-Creation-Date: 2000-04-06 10:45-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:425
 #, c-format
@@ -2952,7 +2952,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr "mostre a lista de arquivos do pacote"
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -3006,21 +3006,21 @@ msgstr ""
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr ""
 
 # , c-format
-#: lib/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
@@ -3113,96 +3113,96 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, fuzzy, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
 # , c-format
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr ""
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr ""
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, fuzzy, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:581
 #, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr ""
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr ""
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr ""
 
diff --git a/po/rpm.pot b/po/rpm.pot
index aff267eaf..ea68ba601 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-04 06:01-0400\n"
+"POT-Creation-Date: 2000-04-06 10:45-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"
@@ -2713,7 +2713,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr ""
 
@@ -2767,20 +2767,20 @@ msgstr ""
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
@@ -2868,95 +2868,95 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr ""
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr ""
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr ""
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr ""
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, c-format
 msgid "key \"%s\" not found in %s"
 msgstr ""
 
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:581
 #, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr ""
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr ""
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index 2d3bfcb4d..76212693a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-04-04 06:01-0400\n"
+"POT-Creation-Date: 2000-04-06 10:45-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2791,7 +2791,7 @@ msgstr "ÐÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ÐÏËÁÚÁÎÎÙÈ ÆÁÊÌÏ×"
 msgid "display a verbose file listing"
 msgstr "×Ù×ÅÓÔÉ ÄÅÔÁÌØÎÙÊ ÓÐÉÓÏË ÆÁÊÌÏ× ÐÁËÅÔÁ"
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎÁ dbpath"
 
@@ -2845,20 +2845,20 @@ msgstr "ÎÅ ÍÏÇÕ ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ (ÐÅÒ×ÏÎÁÞÁÌØÎÏ × %d)"
 msgid "record number %d in database is bad -- skipping."
 msgstr "ÚÁÐÉÓØ ÎÏÍÅÒ %d × ÂÁÚÅ ÎÅ×ÅÒÎÁ, ÐÒÏÐÕÓËÁÀ"
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr "ÐÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n"
 
-#: lib/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr "ÚÁÍÅÎÁ ÓÔÁÒÏÊ ÂÁÚÙ ÎÁ ÎÏ×ÕÀ ÎÅ ÕÄÁÌÁÓØ!\n"
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr "ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÚÁÍÅÎÑÅÔ ÆÁÊÌÙ × %s ÆÁÊÌÁÍÉ ÉÚ %s"
 
-#: lib/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "ÕÄÁÌÅÎÉÅ ËÁÔÁÌÏÇÁ %s ÎÅ ÕÄÁÌÏÓØ: %s\n"
@@ -2947,30 +2947,30 @@ msgstr ")"
 msgid "OK"
 msgstr "Ok"
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr "ÏÔËÒÙ×ÁÀ ÂÁÚÕ × ÒÅÖÉÍÅ 0x%x × %s\n"
 
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ %s: %s"
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "ÎÅ ÍÏÇÕ ÐÏÌÕÞÉÔØ %s ÄÏÓÔÕÐ Ë ÂÁÚÅ ÄÁÎÎÙÈ"
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr "ÉÓËÌÀÞÉÔÅÌØÎÙÊ"
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr "ÒÁÚÄÅÌÑÅÍÙÊ"
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -2978,66 +2978,66 @@ msgstr ""
 "ÎÁÊÄÅÎÁ ÂÁÚÁ ÄÁÎÎÙÈ ÓÔÁÒÏÇÏ ÆÏÒÍÁÔÁ; ÉÓÐÏÌØÚÕÊÔÅ --rebuilddb ÄÌÑ ÇÅÎÅÒÁÃÉÉ "
 "ÂÁÚÙ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ"
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, fuzzy, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr "ÐÁËÅÔ %s ÎÅ ÎÁÊÄÅÎ × %s"
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "ÐÁËÅÔ %s ÎÅ ÎÁÊÄÅÎ × %s"
 
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:581
 #, fuzzy, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr "ÎÅ ÍÏÇÕ ÐÒÏÞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ÐÏÉÓËÁ"
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "ÕÄÁÌÑÀ ÚÁÐÉÓØ ÂÁÚÙ ÄÁÎÎÙÈ\n"
 
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÇÒÕÐÐ\n"
 
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "ÕÄÁÌÑÀ ÉÎÄÅËÓ ÉÍÅÎ\n"
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr "ÎÅ ÍÏÇÕ ×ÙÄÅÌÉÔØ ÍÅÓÔÏ ÄÌÑ ÂÁÚÙ ÄÁÎÎÙÈ"
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "ÐÅÒÅÉÍÅÎÏ×Ù×ÁÀ %s × %s\n"
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr "ÎÅ ÍÏÇÕ ÐÒÏÞÉÔÁÔØ ÈÅÄÅÒ × %d ÄÌÑ ÁÐÇÒÅÊÄÁ"
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr "ÈÅÄÅÒ ÉÚÍÅÎÉÌ ÒÁÚÍÅÒ!"
 
diff --git a/po/sk.po b/po/sk.po
index 239a60ce9..8092103cc 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-04 06:01-0400\n"
+"POT-Creation-Date: 2000-04-06 10:45-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"
@@ -2795,7 +2795,7 @@ msgstr "zobrazii» stav daných súborov"
 msgid "display a verbose file listing"
 msgstr "zobrazi» podrobný zoznam súborov balíka"
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr "nebola nastavená ¾iadna dbpath"
 
@@ -2849,20 +2849,20 @@ msgstr "nie je mo¾né prida» záznam pôvodne na %d"
 msgid "record number %d in database is bad -- skipping."
 msgstr "záznam èíslo %d v databáze je chybný -- bol vynechaný"
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n"
 
-#: lib/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr "nepodarilo sa nahradi» starú databázu novou!\n"
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr "nahradí súbory v %s súbormi z %s kvôli obnove"
 
-#: lib/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstráni» adresár %s: %s\n"
@@ -2951,30 +2951,30 @@ msgstr ")"
 msgid "OK"
 msgstr "V PORIADKU"
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr "otvára sa databáza s právami 0x%x v %s\n"
 
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "nepodarilo sa otvori» %s: %s"
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "nie je mo¾né získa» %s zámok pre databázu"
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr "výhradný"
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr "zdieµaný"
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -2982,66 +2982,66 @@ msgstr ""
 "existuje databáza v starom formáte; pou¾ite --rebuilddb pre vytvorenie "
 "databázy v novom formáte"
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, fuzzy, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr "balík %s nebol nájdený v %s"
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "balík %s nebol nájdený v %s"
 
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:581
 #, fuzzy, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie"
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstraòuje sa záznam z databázy\n"
 
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuje sa index skupín\n"
 
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "odstraòuje sa index názvov\n"
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr "nie je mo¾né prideli» miesto pre databázu"
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr "nie je mo¾né preèíta» hlavièku na %d pre úpravu"
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr "zmenila sa veµkos» hlavièky!"
 
diff --git a/po/sl.po b/po/sl.po
index 402f37d4c..b1e47a914 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.21 2000/04/04 10:10:49 jbj Exp $
+# $Id: sl.po,v 1.22 2000/04/06 15:20:31 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-04-04 06:01-0400\n"
+"POT-Creation-Date: 2000-04-06 10:45-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"
@@ -2781,7 +2781,7 @@ msgstr "izpis stanja seznama datotek"
 msgid "display a verbose file listing"
 msgstr "izpis ob¹irnega seznama datotek"
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
@@ -2835,21 +2835,21 @@ msgstr "zapisa ni mo¾no dodati na %d"
 msgid "record number %d in database is bad -- skipping."
 msgstr "zapis ¹t. %d v zbirki je okvarjen -- preskakujemo."
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 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/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr "zamenjava stare podatkovne zbirke z novo neuspe¹na!\n"
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr "posku¹amo povrniti z nadomestitvijo datotek v %s z datotekami iz %s"
 
-#: lib/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspe¹na odstranitev imenika %s: %s\n"
@@ -2937,95 +2937,95 @@ msgstr ")"
 msgid "OK"
 msgstr "V REDU"
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr "odpiramo datoteko z naèinom 0x%x v %s\n"
 
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspe¹no odpiranje %s: %s\n"
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "datoteke ni mo¾no %s zakleniti"
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr "izkljuèujoèe"
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr "deljeno"
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr "staro obliko podatkove zbirke pretvorite v novo z --rebuilddb"
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, fuzzy, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr "paketa %s ni najti v %s"
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "paketa %s ni najti v %s"
 
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:581
 #, fuzzy, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr "ni mo¾no prebrati glave pri %d za vpogled"
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "odstranjujemo vnose v podatkovni zbirki\n"
 
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "odstranjujemo seznam imen\n"
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr "ni mo¾no zagotoviti prostora za podatkovno zbirko"
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "preimenujemo %s v %s\n"
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr "glave pri %d ni mo¾no prebrati za obnovo"
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr "velikost glave se je spremenila!"
 
diff --git a/po/sr.po b/po/sr.po
index 82a96e012..184b26e72 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-04-04 06:01-0400\n"
+"POT-Creation-Date: 2000-04-06 10:45-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"
@@ -2842,7 +2842,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr "prika¾i listu datoteka u paketu"
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr "dbpath nije odreðen"
 
@@ -2896,20 +2896,20 @@ msgstr "ne mogu da dodam slog originalno na %d"
 msgid "record number %d in database is bad -- skipping."
 msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga"
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -2999,95 +2999,95 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, fuzzy, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "ne mogu da dobijem %s zakljuèavanje baze podataka"
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr "ekskluzivno"
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr "deljeno"
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, fuzzy, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr "paket %s nije naðen u %s"
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "paket %s nije naðen u %s"
 
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:581
 #, fuzzy, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr "ne mogu da proèitam zaglavlje na %d za proveru"
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr "ne mogu da zauzmem prostor za bazu podataka"
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr "ne mogu da proèitam zaglavlje na %d za a¾uriranje"
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 6644c3b65..5231acee1 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.81 $
+# $Revision: 1.82 $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-04-04 06:01-0400\n"
+"POT-Creation-Date: 2000-04-06 10:45-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"
@@ -2773,7 +2773,7 @@ msgstr "visa tillstånd för de listade filerna"
 msgid "display a verbose file listing"
 msgstr "visa en utförlig fillistning"
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
@@ -2827,20 +2827,20 @@ msgstr "kan inte lägga till post ursprungligen vid %d"
 msgid "record number %d in database is bad -- skipping."
 msgstr "post nummer %d i databasen är felaktig -- hoppar över den"
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr "kunde inte bygga om databasen; orginaldatabasen finns kvar\n"
 
-#: lib/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr "kunde inte ersätta gammal databas med ny databas!\n"
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces 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/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
@@ -2928,30 +2928,30 @@ msgstr ")"
 msgid "OK"
 msgstr "OK"
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr "öppnar databas med rättighet 0x%x i %s\n"
 
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, c-format
 msgid "failed to open %s: %s\n"
 msgstr "kunde inte öppna %s: %s\n"
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "kan inte få %s lås på databas"
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr "uteslutande"
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr "delat"
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
@@ -2959,66 +2959,66 @@ msgstr ""
 "databas i gammalt format finns; använd --rebuilddb för att skapa en databas "
 "i nytt format"
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, fuzzy, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr "fann ej paket %s i %s"
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "fann ej paket %s i %s"
 
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:581
 #, fuzzy, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr "kan inte läsa huvud vid %d för uppslagning"
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, fuzzy, c-format
 msgid "removing 0 %s entries.\n"
 msgstr "tar bort databasposter\n"
 
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "tar bort gruppindex\n"
 
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "tar bort namnindex\n"
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr "kan inte allokera plats för databas"
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "byter namn på %s till %s\n"
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr "kan inte läsa huvud vid %d för uppdatering"
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr "huvud ändrade storlek!"
 
diff --git a/po/tr.po b/po/tr.po
index 5d5cfb351..a83c9ed7c 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-04 06:01-0400\n"
+"POT-Creation-Date: 2000-04-06 10:45-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"
@@ -2882,7 +2882,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr "Paketin içerdiði dosyalarý gösterme"
 
-#: lib/rebuilddb.c:34 lib/rpmdb.c:290
+#: lib/rebuilddb.c:34 lib/rpmdb.c:294
 msgid "no dbpath has been set"
 msgstr "dbpath deðeri girilmemiþ"
 
@@ -2936,20 +2936,20 @@ msgstr "%d de yer alan kayýt saklayamýyor"
 msgid "record number %d in database is bad -- skipping."
 msgstr "veritabanýndaki %d numaralý kayýt hatalý -- atlanýyor"
 
-#: lib/rebuilddb.c:152
+#: lib/rebuilddb.c:153
 msgid "failed to rebuild database; original database remains in place\n"
 msgstr ""
 
-#: lib/rebuilddb.c:160
+#: lib/rebuilddb.c:161
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rebuilddb.c:162
+#: lib/rebuilddb.c:163
 #, c-format
 msgid "replaces files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rebuilddb.c:168
+#: lib/rebuilddb.c:169
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s açýlamadý: %s"
@@ -3039,96 +3039,96 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: lib/rpmdb.c:188
+#: lib/rpmdb.c:190
 #, fuzzy, c-format
 msgid "opening database mode 0x%x in %s\n"
 msgstr "mevcut veritabanýný kullanýlarak veritabýnýný yeniden oluþturur"
 
-#: lib/rpmdb.c:200 lib/url.c:445
+#: lib/rpmdb.c:202 lib/url.c:445
 #, fuzzy, c-format
 msgid "failed to open %s: %s\n"
 msgstr "%s açýlamadý: %s"
 
-#: lib/rpmdb.c:214 lib/rpmdb.c:222
+#: lib/rpmdb.c:216 lib/rpmdb.c:224
 #, c-format
 msgid "cannot get %s lock on database"
 msgstr "Veritabaný için %s kilit (lock) alýnamadý"
 
-#: lib/rpmdb.c:215
+#: lib/rpmdb.c:217
 msgid "exclusive"
 msgstr "özel"
 
-#: lib/rpmdb.c:223
+#: lib/rpmdb.c:225
 msgid "shared"
 msgstr "paylaþýlan (shared)"
 
-#: lib/rpmdb.c:263
+#: lib/rpmdb.c:267
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
-#: lib/rpmdb.c:536
+#: lib/rpmdb.c:554
 #, fuzzy, c-format
 msgid "package not found with key \"%s\" in %s"
 msgstr "%s pakedi %s içerisinde bulunamadý"
 
-#: lib/rpmdb.c:545
+#: lib/rpmdb.c:563
 #, fuzzy, c-format
 msgid "key \"%s\" not found in %s"
 msgstr "%s pakedi %s içerisinde bulunamadý"
 
-#: lib/rpmdb.c:563
+#: lib/rpmdb.c:581
 #, fuzzy, c-format
 msgid "rpmdbRemove: cannot read header at 0x%x"
 msgstr "%d kaydýndan baþlýk bilgisi okunamadý"
 
-#: lib/rpmdb.c:582
+#: lib/rpmdb.c:609
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:588
+#: lib/rpmdb.c:615
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:596
+#: lib/rpmdb.c:623
 #, fuzzy, c-format
 msgid "removing %d entries in %s index:\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
-#: lib/rpmdb.c:600 lib/rpmdb.c:775
+#: lib/rpmdb.c:627 lib/rpmdb.c:812
 #, c-format
 msgid "\t%6d %s\n"
 msgstr ""
 
 # reservieren???
-#: lib/rpmdb.c:719
+#: lib/rpmdb.c:745
 msgid "cannot allocate space for database"
 msgstr "Veritabaný için yer bulunamadý"
 
-#: lib/rpmdb.c:752
+#: lib/rpmdb.c:789
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:764
+#: lib/rpmdb.c:801
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:771
+#: lib/rpmdb.c:808
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:829
+#: lib/rpmdb.c:866
 #, c-format
 msgid "cannot read header at %d for update"
 msgstr "%d numaralý paketin güncelleme için gereken 'header' kýsmý okunamadý"
 
-#: lib/rpmdb.c:842
+#: lib/rpmdb.c:879
 msgid "header changed size!"
 msgstr ""
 
diff --git a/rpm.spec b/rpm.spec
index 0a654a360..dd7a5664a 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.3
+Release: 0.4
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -219,6 +219,9 @@ fi
 /usr/include/popt.h
 
 %changelog
+* Thu Apr  6 2000 Jeff Johnson <jbj@redhat.com>
+- use hashed access for package headers.
+
 * Tue Apr  4 2000 Jeff Johnson <jbj@redhat.com>
 - create dbi from template rather than passed args.