rename new FILENAMES tags to BASENAMES/DIRNAMES/DIRINDEXES.

CVS patchset: 3466
CVS date: 1999/12/08 19:04:50

25 files changed, 556 insertions, 515 deletions

diff --git a/CHANGES b/CHANGES
index c1939ae33..27b5e8bb4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,7 +13,8 @@
 	- expose enough of legacy fdio interface to compile rpmfind/rpm2html.
 	- fix: Fopen should use 0666 as default (umask will be applied later).
 	- fix: default for rd_timeoutsecs is 1 sec (avoid ufdio assertion).
-	- fix: new filelists require package index, not pointer.
+	- fix: new FILENAMES tags require package index, not pointer in lookups.
+	- rename new FILENAMES tags to BASENAMES/DIRNAMES/DIRINDEXES.
 
 3.0.2 -> 3.0.3
 	- add --eval to find result of macro expansion.
diff --git a/lib/depends.c b/lib/depends.c
index da02e79a5..970a8da87 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -150,7 +150,7 @@ static /*@exposed@*/ struct availablePackage * alAddPackage(struct availableList
     struct availablePackage * p;
     rpmRelocation * r;
     int i;
-    int_32 * fileDirIndex;
+    int_32 * dirIndexes;
     const char ** dirNames;
     int numDirs, dirNum;
     int * dirMapping;
@@ -189,15 +189,15 @@ static /*@exposed@*/ struct availablePackage * alAddPackage(struct availableList
 	    p->provideFlags = NULL;
     }
 
-    if (!headerGetEntryMinMemory(h, RPMTAG_COMPFILELIST, NULL, (void **) 
+    if (!headerGetEntryMinMemory(h, RPMTAG_BASENAMES, NULL, (void **) 
 				 &p->baseNames, &p->filesCount)) {
 	p->filesCount = 0;
 	p->baseNames = NULL;
     } else {
-        headerGetEntryMinMemory(h, RPMTAG_COMPDIRLIST, NULL, (void **) 
+        headerGetEntryMinMemory(h, RPMTAG_DIRNAMES, NULL, (void **) 
 				 &dirNames, &numDirs);
-        headerGetEntryMinMemory(h, RPMTAG_COMPFILEDIRS, NULL, (void **) 
-				 &fileDirIndex, NULL);
+        headerGetEntryMinMemory(h, RPMTAG_DIRINDEXES, NULL, (void **) 
+				 &dirIndexes, NULL);
 
 	/* XXX FIXME: We ought to relocate the directory list here */
 
@@ -234,20 +234,17 @@ static /*@exposed@*/ struct availablePackage * alAddPackage(struct availableList
 	while (first < p->filesCount) {
 	    last = first;
 	    while ((last + 1) < p->filesCount) {
-		if (fileDirIndex[first] != fileDirIndex[last + 1]) break;
+		if (dirIndexes[first] != dirIndexes[last + 1]) break;
 		last++;
 	    }
 
-	    dirMatch = al->dirs + dirMapping[fileDirIndex[first]];
+	    dirMatch = al->dirs + dirMapping[dirIndexes[first]];
 	    dirMatch->files = xrealloc(dirMatch->files,
 		sizeof(*dirMatch->files) * 
 		    (dirMatch->numFiles + last - first + 1));
 	    for (fileNum = first; fileNum <= last; fileNum++) {
 		dirMatch->files[dirMatch->numFiles].baseName =
 		    p->baseNames[fileNum];
-#ifdef	DYING
-		dirMatch->files[dirMatch->numFiles].package = p;
-#endif
 		dirMatch->files[dirMatch->numFiles].pkgNum = pkgNum;
 		dirMatch->numFiles++;
 	    }
@@ -779,11 +776,7 @@ alFileSatisfiesDepend(struct availableList * al,
 	    if (keyType)
 		rpmMessage(RPMMESS_DEBUG, _("%s: %s satisfied by added file "
 			    "list.\n"), keyType, fileName);
-#ifdef	DYING
-	    return dirMatch->files[i].package;
-#else
 	    return al->list + dirMatch->files[i].pkgNum;
-#endif
 	}
     }
 
@@ -1466,11 +1459,11 @@ int rpmdepCheck(rpmTransactionSet rpmdep,
 	    int fileAlloced = 0;
 	    int len;
 
-	    if (headerGetEntry(h, RPMTAG_COMPFILELIST, NULL, 
+	    if (headerGetEntry(h, RPMTAG_BASENAMES, NULL, 
 			   (void **) &baseNames, &fileCount)) {
-		headerGetEntry(h, RPMTAG_COMPDIRLIST, NULL, 
+		headerGetEntry(h, RPMTAG_DIRNAMES, NULL, 
 			    (void **) &dirNames, NULL);
-		headerGetEntry(h, RPMTAG_COMPFILEDIRS, NULL, 
+		headerGetEntry(h, RPMTAG_DIRINDEXES, NULL, 
 			    (void **) &dirIndexes, NULL);
 		rc = 0;
 		for (j = 0; j < fileCount; j++) {
diff --git a/lib/depends.h b/lib/depends.h
index 6cf007871..470064958 100644
--- a/lib/depends.h
+++ b/lib/depends.h
@@ -28,9 +28,6 @@ struct availableIndexEntry {
 } ;
 
 struct fileIndexEntry {
-#ifdef	DYING
-    /*@owned@*/ struct availablePackage * package;
-#endif
     int pkgNum;
     /*@dependent@*/ const char * baseName;
 } ;
diff --git a/lib/fprint.c b/lib/fprint.c
index 6b5e514e2..a212007a2 100644
--- a/lib/fprint.c
+++ b/lib/fprint.c
@@ -171,11 +171,11 @@ void fpLookupHeader(fingerPrintCache cache, Header h, fingerPrint * fpList)
     const char ** baseNames, ** dirNames;
     int_32 * dirIndexes;
 
-    if (!headerGetEntryMinMemory(h, RPMTAG_COMPFILELIST, NULL, 
+    if (!headerGetEntryMinMemory(h, RPMTAG_BASENAMES, NULL, 
 			(void **) &baseNames, &fileCount)) return;
-    headerGetEntryMinMemory(h, RPMTAG_COMPDIRLIST, NULL, (void **) &dirNames, 
+    headerGetEntryMinMemory(h, RPMTAG_DIRNAMES, NULL, (void **) &dirNames, 
 			NULL);
-    headerGetEntry(h, RPMTAG_COMPFILEDIRS, NULL, (void **) &dirIndexes, NULL);
+    headerGetEntry(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL);
 			
     fpLookupList(cache, dirNames, baseNames, dirIndexes, fileCount, fpList);
 
diff --git a/lib/header.c b/lib/header.c
index 7b0558004..da38b76a5 100644
--- a/lib/header.c
+++ b/lib/header.c
@@ -106,6 +106,54 @@ struct sprintfToken {
     } u;
 };
 
+#if HAVE_MCHECK_H
+static int probe_headers = 0;
+#define	HEADERPROBE(_h, _msg)	if (probe_headers) headerProbe((_h), (_msg))
+
+static void headerProbeAddr(Header h, const char * msg,
+	void * p, const char * imsg)
+{
+    const char * mchkstr = NULL;
+    switch (mprobe(p)) {
+    case MCHECK_DISABLED:
+    case MCHECK_OK:
+	return;
+	/*@notreached@*/ break;
+    case MCHECK_HEAD:
+	mchkstr = "HEAD";
+	break;
+    case MCHECK_TAIL:
+	mchkstr = "TAIL";
+	break;
+    case MCHECK_FREE:
+	mchkstr = "FREE";
+	break;
+    }
+    fprintf(stderr, "*** MCHECK_%s h %p", mchkstr, h);
+    if (imsg && p)
+	fprintf(stderr, " %s %p", imsg, p);
+    if (msg)
+	fprintf(stderr, " %s", msg);
+    fprintf(stderr, "\n");
+}
+
+static void headerProbe(Header h, const char *msg)
+{
+    char imsg[256];
+    int i;
+
+    headerProbeAddr(h, msg, h, "header");
+    sprintf(imsg, "index (used %d)", h->indexUsed);
+    headerProbeAddr(h, msg, h->index, imsg);
+    for (i = 0; i < h->indexUsed; i++) {
+	sprintf(imsg, "index[%d:%d].data", i, h->indexUsed);
+	headerProbeAddr(h, msg, h->index[i].data, imsg);
+    }
+}
+#else	/* HAVE_MCHECK_H */
+#define	HEADERPROBE(_h, _msg)
+#endif	/* HAVE_MCHECK_H */
+
 static void copyEntry(struct indexEntry * entry, /*@out@*/ int_32 * type,
 	/*@out@*/ void ** p, /*@out@*/ int_32 * c, int minimizeMemory)
 {
@@ -956,6 +1004,7 @@ static int intGetEntry(Header h, int_32 tag, /*@out@*/ int_32 *type,
     struct indexEntry * entry;
     char * chptr;
 
+    HEADERPROBE(h, "intGetEntry");
     /* First find the tag */
     entry = findEntry(h, tag, RPM_NULL_TYPE);
     if (!entry) {
@@ -1023,6 +1072,7 @@ void headerFree(Header h)
 
 Header headerLink(Header h)
 {
+    HEADERPROBE(h, "headerLink");
     h->usageCount++;
     return h;
 }
diff --git a/lib/install.c b/lib/install.c
index 842e05bae..0abf54bbe 100644
--- a/lib/install.c
+++ b/lib/install.c
@@ -107,11 +107,11 @@ static int assembleFileList(Header h, /*@out@*/ struct fileMemory ** memPtr,
 
     *memPtr = mem;
 
-    if (!headerIsEntry(h, RPMTAG_COMPFILELIST)) return 0;
+    if (!headerIsEntry(h, RPMTAG_BASENAMES)) return 0;
 
     rpmBuildFileList(h, &mem->names, fileCountPtr);
 
-    if (headerIsEntry(h, RPMTAG_ORIGCOMPFILELIST)) {
+    if (headerIsEntry(h, RPMTAG_ORIGBASENAMES)) {
 	buildOrigFileList(h, &mem->cpioNames, fileCountPtr);
     } else {
 	rpmBuildFileList(h, &mem->cpioNames, fileCountPtr);
@@ -465,7 +465,7 @@ static int installSources(Header h, const char * rootdir, FD_t fd,
     }
     rpmMessage(RPMMESS_DEBUG, _("spec file in: %s\n"), realSpecDir);
 
-    if (h != NULL && headerIsEntry(h, RPMTAG_COMPFILELIST)) {
+    if (h != NULL && headerIsEntry(h, RPMTAG_BASENAMES)) {
 	/* we can't remap v1 packages */
 	assembleFileList(h, &fileMem, &fileCount, &files, 0, NULL);
 
@@ -736,7 +736,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
 	/*@-unrecog@*/ chroot(rootdir); /*@=unrecog@*/
     }
 
-    if (!(flags & RPMTRANS_FLAG_JUSTDB) && headerIsEntry(h, RPMTAG_COMPFILELIST)) {
+    if (!(flags & RPMTRANS_FLAG_JUSTDB) && headerIsEntry(h, RPMTAG_BASENAMES)) {
 	const char * defaultPrefix;
 	/* old format relocateable packages need the entire default
 	   prefix stripped to form the cpio list, while all other packages
@@ -866,7 +866,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
 	if (fileMem) freeFileMemory(fileMem);
 	fileMem = NULL;
     } else if (flags & RPMTRANS_FLAG_JUSTDB) {
-	if (headerGetEntry(h, RPMTAG_COMPFILELIST, NULL, NULL, &fileCount)) {
+	if (headerGetEntry(h, RPMTAG_BASENAMES, NULL, NULL, &fileCount)) {
 	    fileStates = xmalloc(sizeof(*fileStates) * fileCount);
 	    memset(fileStates, RPMFILE_STATE_NORMAL, fileCount);
 	    headerAddEntry(h, RPMTAG_FILESTATES, RPM_CHAR_TYPE, fileStates,
diff --git a/lib/misc.c b/lib/misc.c
index 5b4a869ff..3d329df44 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -525,11 +525,11 @@ void compressFilelist(Header h)
     }
 
 exit:
-    headerAddEntry(h, RPMTAG_COMPDIRLIST, RPM_STRING_ARRAY_TYPE,
+    headerAddEntry(h, RPMTAG_DIRNAMES, RPM_STRING_ARRAY_TYPE,
 			dirNames, dirIndex + 1);
-    headerAddEntry(h, RPMTAG_COMPFILEDIRS, RPM_INT32_TYPE,
+    headerAddEntry(h, RPMTAG_DIRINDEXES, RPM_INT32_TYPE,
 			dirIndexes, count);
-    headerAddEntry(h, RPMTAG_COMPFILELIST, RPM_STRING_ARRAY_TYPE,
+    headerAddEntry(h, RPMTAG_BASENAMES, RPM_STRING_ARRAY_TYPE,
 			baseNames, count);
 
     xfree(fileNames);
@@ -586,8 +586,8 @@ void expandFilelist(Header h)
     const char ** fileNames = NULL;
     int count = 0;
 
-    doBuildFileList(h, &fileNames, &count, RPMTAG_COMPFILELIST,
-			RPMTAG_COMPDIRLIST, RPMTAG_COMPFILEDIRS);
+    doBuildFileList(h, &fileNames, &count, RPMTAG_BASENAMES,
+			RPMTAG_DIRNAMES, RPMTAG_DIRINDEXES);
 
     if (fileNames == NULL || count <= 0)
 	return;
@@ -597,20 +597,20 @@ void expandFilelist(Header h)
 
     xfree(fileNames);
 
-    headerRemoveEntry(h, RPMTAG_COMPFILELIST);
-    headerRemoveEntry(h, RPMTAG_COMPDIRLIST);
-    headerRemoveEntry(h, RPMTAG_COMPFILEDIRS);
+    headerRemoveEntry(h, RPMTAG_BASENAMES);
+    headerRemoveEntry(h, RPMTAG_DIRNAMES);
+    headerRemoveEntry(h, RPMTAG_DIRINDEXES);
 }
 
 
 void rpmBuildFileList(Header h, const char *** fileListPtr, int * fileCountPtr)
 {
-    doBuildFileList(h, fileListPtr, fileCountPtr,RPMTAG_COMPFILELIST,
-			RPMTAG_COMPDIRLIST, RPMTAG_COMPFILEDIRS);
+    doBuildFileList(h, fileListPtr, fileCountPtr, RPMTAG_BASENAMES,
+			RPMTAG_DIRNAMES, RPMTAG_DIRINDEXES);
 }
 
 void buildOrigFileList(Header h, const char *** fileListPtr, int * fileCountPtr)
 {
-    doBuildFileList(h, fileListPtr, fileCountPtr, RPMTAG_ORIGCOMPFILELIST,
-			RPMTAG_ORIGCOMPDIRLIST, RPMTAG_ORIGCOMPFILEDIRS);
+    doBuildFileList(h, fileListPtr, fileCountPtr, RPMTAG_ORIGBASENAMES,
+			RPMTAG_ORIGDIRNAMES, RPMTAG_ORIGDIRINDEXES);
 }
diff --git a/lib/query.c b/lib/query.c
index 317199699..155fb90ab 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -176,7 +176,7 @@ int showQueryPackage(QVA_t *qva, /*@unused@*/rpmdb db, Header h)
 	    queryHeader(fp, h, queryFormat);
 
 	if (queryFlags & QUERY_FOR_LIST) {
-	    if (!headerGetEntry(h, RPMTAG_COMPFILELIST, &type, 
+	    if (!headerGetEntry(h, RPMTAG_BASENAMES, &type, 
 				(void **) &baseNames, &count)) {
 		fputs(_("(contains no files)"), fp);
 		fputs("\n", fp);
@@ -185,9 +185,9 @@ int showQueryPackage(QVA_t *qva, /*@unused@*/rpmdb db, Header h)
 			 (void **) &fileStatesList, &count)) {
 		    fileStatesList = NULL;
 		}
-		headerGetEntry(h, RPMTAG_COMPDIRLIST, NULL,
+		headerGetEntry(h, RPMTAG_DIRNAMES, NULL,
 			 (void **) &dirNames, NULL);
-		headerGetEntry(h, RPMTAG_COMPFILEDIRS, NULL, 
+		headerGetEntry(h, RPMTAG_DIRINDEXES, NULL, 
 			 (void **) &dirIndexes, NULL);
 		headerGetEntry(h, RPMTAG_FILEFLAGS, &type, 
 			 (void **) &fileFlagsList, &count);
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 5d31c3c07..68bb18d66 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -396,11 +396,11 @@ int rpmdbFindByFile(rpmdb db, const char * filespec, dbiIndexSet * matches)
 	    continue;
 	}
 
-	headerGetEntryMinMemory(h, RPMTAG_COMPFILELIST, NULL, 
+	headerGetEntryMinMemory(h, RPMTAG_BASENAMES, NULL, 
 				(void **) &baseNames, NULL);
-	headerGetEntryMinMemory(h, RPMTAG_COMPFILEDIRS, NULL, 
+	headerGetEntryMinMemory(h, RPMTAG_DIRINDEXES, NULL, 
 				(void **) &dirIndexes, NULL);
-	headerGetEntryMinMemory(h, RPMTAG_COMPDIRLIST, NULL, 
+	headerGetEntryMinMemory(h, RPMTAG_DIRNAMES, NULL, 
 				(void **) &dirNames, NULL);
 
 	do {
@@ -571,7 +571,7 @@ int rpmdbRemove(rpmdb db, unsigned int offset, int tolerant)
 	free(conflictList);
     }
 
-    if (headerGetEntry(h, RPMTAG_COMPFILELIST, &type, (void **) &baseNames, 
+    if (headerGetEntry(h, RPMTAG_BASENAMES, &type, (void **) &baseNames, 
 	 &count)) {
 	for (i = 0; i < count; i++) {
 	    rpmMessage(RPMMESS_DEBUG, _("removing file index for %s\n"), 
@@ -644,7 +644,7 @@ int rpmdbAdd(rpmdb db, Header dbentry)
 
     count = 0;
 
-    headerGetEntry(dbentry, RPMTAG_COMPFILELIST, &type, (void **) 
+    headerGetEntry(dbentry, RPMTAG_BASENAMES, &type, (void **) 
 		    &baseNames, &count);
 
     if (_noDirTokens) {
@@ -937,11 +937,11 @@ int rpmdbFindFpList(rpmdb db, fingerPrint * fpList, dbiIndexSet * matchList,
 	    return 1;
 	}
 
-	headerGetEntryMinMemory(h, RPMTAG_COMPDIRLIST, NULL, 
+	headerGetEntryMinMemory(h, RPMTAG_DIRNAMES, NULL, 
 			    (void **) &dirNames, NULL);
-	headerGetEntryMinMemory(h, RPMTAG_COMPFILELIST, NULL, 
+	headerGetEntryMinMemory(h, RPMTAG_BASENAMES, NULL, 
 			    (void **) &fullBaseNames, &fc);
-	headerGetEntryMinMemory(h, RPMTAG_COMPFILEDIRS, NULL, 
+	headerGetEntryMinMemory(h, RPMTAG_DIRINDEXES, NULL, 
 			    (void **) &fullDirIndexes, NULL);
 
 	baseNames = xcalloc(num, sizeof(*baseNames));
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 7d9605a64..790325e37 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -149,12 +149,12 @@ extern const struct headerSprintfExtension rpmHeaderFormats[];
 #define	RPMTAG_PROVIDEVERSION		1113
 #define	RPMTAG_OBSOLETEFLAGS		1114
 #define	RPMTAG_OBSOLETEVERSION		1115
-#define	RPMTAG_COMPFILEDIRS		1116
-#define RPMTAG_COMPFILELIST		1117
-#define RPMTAG_COMPDIRLIST	        1118
-#define	RPMTAG_ORIGCOMPFILEDIRS		1119 /* internal */
-#define	RPMTAG_ORIGCOMPFILELIST		1120 /* internal */
-#define	RPMTAG_ORIGCOMPDIRLIST		1121 /* internal */
+#define	RPMTAG_DIRINDEXES		1116
+#define	RPMTAG_BASENAMES		1117
+#define	RPMTAG_DIRNAMES			1118
+#define	RPMTAG_ORIGDIRINDEXES		1119 /* internal */
+#define	RPMTAG_ORIGBASENAMES		1120 /* internal */
+#define	RPMTAG_ORIGDIRNAMES		1121 /* internal */
 
 #define	RPMTAG_FIRSTFREE_TAG		1122 /* internal */
 #define	RPMTAG_EXTERNAL_TAG		1000000
diff --git a/lib/transaction.c b/lib/transaction.c
index 51b579b65..e56cc1905 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -366,10 +366,10 @@ static Header relocateFileList(struct availablePackage * alp,
      * backwards so that /usr/local relocations take precedence over /usr 
      * ones. */
 
-    headerGetEntry(h, RPMTAG_COMPFILELIST, NULL, (void **) &baseNames, 
+    headerGetEntry(h, RPMTAG_BASENAMES, NULL, (void **) &baseNames, 
 		   &fileCount);
-    headerGetEntry(h, RPMTAG_COMPFILEDIRS, NULL, (void **) &dirIndexes, NULL);
-    headerGetEntry(h, RPMTAG_COMPDIRLIST, NULL, (void **) &dirNames, 
+    headerGetEntry(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL);
+    headerGetEntry(h, RPMTAG_DIRNAMES, NULL, (void **) &dirNames, 
 		   &dirCount);
     skipDirList = xcalloc(sizeof(*skipDirList), dirCount);
 
@@ -508,24 +508,24 @@ static Header relocateFileList(struct availablePackage * alp,
 	int t;
 
 	p = NULL;
-	headerGetEntry(h, RPMTAG_COMPFILELIST, &t, &p, &c);
-	headerAddEntry(h, RPMTAG_ORIGCOMPFILELIST, t, p, c);
+	headerGetEntry(h, RPMTAG_BASENAMES, &t, &p, &c);
+	headerAddEntry(h, RPMTAG_ORIGBASENAMES, t, p, c);
 	xfree(p);
 
 	p = NULL;
-	headerGetEntry(h, RPMTAG_COMPDIRLIST, &t, &p, &c);
-	headerAddEntry(h, RPMTAG_ORIGCOMPDIRLIST, t, p, c);
+	headerGetEntry(h, RPMTAG_DIRNAMES, &t, &p, &c);
+	headerAddEntry(h, RPMTAG_ORIGDIRNAMES, t, p, c);
 	xfree(p);
 
 	p = NULL;
-	headerGetEntry(h, RPMTAG_COMPFILEDIRS, &t, &p, &c);
-	headerAddEntry(h, RPMTAG_ORIGCOMPFILEDIRS, t, p, c);
+	headerGetEntry(h, RPMTAG_DIRINDEXES, &t, &p, &c);
+	headerAddEntry(h, RPMTAG_ORIGDIRINDEXES, t, p, c);
 
-	headerModifyEntry(h, RPMTAG_COMPFILELIST, RPM_STRING_ARRAY_TYPE,
+	headerModifyEntry(h, RPMTAG_BASENAMES, RPM_STRING_ARRAY_TYPE,
 			  baseNames, fileCount);
-	headerModifyEntry(h, RPMTAG_COMPDIRLIST, RPM_STRING_ARRAY_TYPE,
+	headerModifyEntry(h, RPMTAG_DIRNAMES, RPM_STRING_ARRAY_TYPE,
 			  dirNames, dirCount);
-	headerModifyEntry(h, RPMTAG_COMPFILEDIRS, RPM_INT32_TYPE,
+	headerModifyEntry(h, RPMTAG_DIRINDEXES, RPM_INT32_TYPE,
 			  dirIndexes, fileCount);
     }
 
@@ -1284,7 +1284,7 @@ int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify,
 	    dbiFreeIndexRecord(dbi);
 	}
 
-	if (headerGetEntry(alp->h, RPMTAG_COMPFILELIST, NULL, NULL, 
+	if (headerGetEntry(alp->h, RPMTAG_BASENAMES, NULL, NULL, 
 			   &fileCount))
 	    totalFileCount += fileCount;
     }
@@ -1295,7 +1295,7 @@ int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify,
 	Header h;
 
 	if ((h = rpmdbGetRecord(ts->db, ts->removedPackages[i]))) {
-	    if (headerGetEntry(h, RPMTAG_COMPFILELIST, NULL, NULL,
+	    if (headerGetEntry(h, RPMTAG_BASENAMES, NULL, NULL,
 			       &fileCount))
 		totalFileCount += fileCount;
 	    headerFree(h);
@@ -1319,7 +1319,7 @@ int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify,
 	    i = ts->order[oc].u.addedIndex;
 	    alp = ts->addedPackages.list + ts->order[oc].u.addedIndex;
 
-	    if (!headerGetEntryMinMemory(alp->h, RPMTAG_COMPFILELIST, NULL,
+	    if (!headerGetEntryMinMemory(alp->h, RPMTAG_BASENAMES, NULL,
 					 NULL, &fi->fc)) {
 		fi->h = headerLink(alp->h);
 		hdrs[i] = headerLink(fi->h);
@@ -1344,16 +1344,16 @@ int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify,
 	    fi->type = TR_REMOVED;
 	    break;
 	}
-	if (!headerGetEntry(fi->h, RPMTAG_COMPFILELIST, NULL,
+	if (!headerGetEntry(fi->h, RPMTAG_BASENAMES, NULL,
 				     (void **) &fi->bnl, &fi->fc)) {
 	    /* This catches removed packages w/ no file lists */
 	    fi->fc = 0;
 	    continue;
 	}
 
-	headerGetEntry(fi->h, RPMTAG_COMPFILEDIRS, NULL, (void **) &fi->dil, 
+	headerGetEntry(fi->h, RPMTAG_DIRINDEXES, NULL, (void **) &fi->dil, 
 		       NULL);
-	headerGetEntry(fi->h, RPMTAG_COMPDIRLIST, NULL, (void **) &fi->dnl, 
+	headerGetEntry(fi->h, RPMTAG_DIRNAMES, NULL, (void **) &fi->dnl, 
 		       NULL);
 
 	/* actions is initialized earlier for added packages */
diff --git a/lib/uninstall.c b/lib/uninstall.c
index 251dcb2e3..ce12eb93e 100644
--- a/lib/uninstall.c
+++ b/lib/uninstall.c
@@ -132,7 +132,7 @@ int removeBinaryPackage(const char * prefix, rpmdb db, unsigned int offset,
 		flags & RPMTRANS_FLAG_TEST);
 
     if (!(flags & RPMTRANS_FLAG_JUSTDB) &&
-	headerGetEntry(h, RPMTAG_COMPFILELIST, NULL, (void **) &baseNames, 
+	headerGetEntry(h, RPMTAG_BASENAMES, NULL, (void **) &baseNames, 
 	               &fileCount)) {
 	const char ** fileMd5List;
 	uint_32 * fileFlagsList;
@@ -142,9 +142,9 @@ int removeBinaryPackage(const char * prefix, rpmdb db, unsigned int offset,
 	char * fnbuffer = NULL;
 	int prefixlen = 0;
 
-	headerGetEntry(h, RPMTAG_COMPFILEDIRS, NULL, (void **) &dirIndexes,
+	headerGetEntry(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes,
 	               NULL);
-	headerGetEntry(h, RPMTAG_COMPDIRLIST, NULL, (void **) &dirNames,
+	headerGetEntry(h, RPMTAG_DIRNAMES, NULL, (void **) &dirNames,
 	               NULL);
 
 	/* Get alloca buffer for largest possible prefix + filename. */
diff --git a/lib/verify.c b/lib/verify.c
index 1314601fc..feb84dce8 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -90,11 +90,11 @@ int rpmVerifyFile(const char * prefix, Header h, int filenum, int * result,
 	flags = RPMVERIFY_ALL;
     }
 
-    headerGetEntry(h, RPMTAG_COMPFILELIST, &type, (void **) &baseNames, 
+    headerGetEntry(h, RPMTAG_BASENAMES, &type, (void **) &baseNames, 
 		   &count);
-    headerGetEntry(h, RPMTAG_COMPFILEDIRS, &type, (void **) &dirIndexes, 
+    headerGetEntry(h, RPMTAG_DIRINDEXES, &type, (void **) &dirIndexes, 
 		   NULL);
-    headerGetEntry(h, RPMTAG_COMPDIRLIST, &type, (void **) &dirNames, NULL);
+    headerGetEntry(h, RPMTAG_DIRNAMES, &type, (void **) &dirNames, NULL);
 
     filespec = alloca(strlen(dirNames[dirIndexes[filenum]]) + 
 		      strlen(baseNames[filenum]) + strlen(prefix) + 5);
@@ -258,7 +258,7 @@ static int verifyHeader(QVA_t *qva, Header h)
     if (!(qva->qva_flags & VERIFY_MD5)) omitMask = RPMVERIFY_MD5;
 
     if (headerGetEntry(h, RPMTAG_FILEFLAGS, NULL, (void **) &fileFlagsList, NULL) &&
-	headerIsEntry(h, RPMTAG_COMPFILELIST)) {
+	headerIsEntry(h, RPMTAG_BASENAMES)) {
 	rpmBuildFileList(h, &fileNames, &count);
 
 	for (i = 0; i < count; i++) {
diff --git a/po/cs.po b/po/cs.po
index 17652ab88..cf2cdf3f8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-08 11:31-0500\n"
+"POT-Creation-Date: 1999-12-08 13:59-0500\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"
@@ -2112,85 +2112,85 @@ msgid "error removing record %s into %s"
 msgstr "chyba pøi odstraòování záznamu %s do %s"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:414
+#: lib/depends.c:411
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:443
+#: lib/depends.c:440
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:535
+#: lib/depends.c:532
 msgid "dbrecMatchesDepFlags() failed to read header"
 msgstr "dbrecMatchesDepFlags() nemù¾e pøeèíst hlavièku"
 
-#: lib/depends.c:780
+#: lib/depends.c:777
 #, c-format
 msgid "%s: %s satisfied by added file list.\n"
 msgstr ""
 
-#: lib/depends.c:823
+#: lib/depends.c:816
 #, fuzzy, c-format
 msgid "%s: %s satisfied by added package.\n"
 msgstr "¾ádný balíèek nevlastní soubor %s\n"
 
-#: lib/depends.c:840
+#: lib/depends.c:833
 #, c-format
 msgid "%s: %s satisfied by added provide.\n"
 msgstr ""
 
-#: lib/depends.c:871
+#: lib/depends.c:864
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:899
+#: lib/depends.c:892
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:921
+#: lib/depends.c:914
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:943
+#: lib/depends.c:936
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "¾ádný balíèek nevlastní soubor %s\n"
 
-#: lib/depends.c:956
+#: lib/depends.c:949
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:966
+#: lib/depends.c:959
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1014
+#: lib/depends.c:1007
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "polo¾ka 'vy¾aduje' balíèku %s není splnìna: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1076
+#: lib/depends.c:1069
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balíèek %s koliduje: %s\n"
 
-#: lib/depends.c:1131 lib/depends.c:1430
+#: lib/depends.c:1124 lib/depends.c:1423
 #, c-format
 msgid "cannot read header at %d for dependency check"
 msgstr "nelze èíst hlavièku u %d pro kontrolu závislostí"
 
-#: lib/depends.c:1226
+#: lib/depends.c:1219
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "smyèka v øetìzu podmínek: %s"
@@ -2206,7 +2206,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141
-#: lib/header.c:2139 lib/header.c:2156 lib/header.c:2176
+#: lib/header.c:2189 lib/header.c:2206 lib/header.c:2226
 msgid "(not a number)"
 msgstr "(není èíslo)"
 
@@ -2235,78 +2235,78 @@ msgid "file %s is on an unknown device"
 msgstr "soubor %s je na neznámém zaøízení"
 
 #. This should not be allowed
-#: lib/header.c:170
+#: lib/header.c:218
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "Poèet RPM_STRING_TYPE pro grabData() musí být 1.\n"
 
-#: lib/header.c:201 lib/header.c:764
+#: lib/header.c:249 lib/header.c:812
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datový typ %d není podporován\n"
 
-#: lib/header.c:1121
+#: lib/header.c:1171
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Chybný poèet pro headerAddEntry(): %d\n"
 
-#: lib/header.c:1530
+#: lib/header.c:1580
 #, c-format
 msgid "missing { after %"
 msgstr "po % chybí {"
 
-#: lib/header.c:1558
+#: lib/header.c:1608
 msgid "missing } after %{"
 msgstr "po %{ chybí }"
 
-#: lib/header.c:1570
+#: lib/header.c:1620
 msgid "empty tag format"
 msgstr "prázdný formát pøíznaku"
 
-#: lib/header.c:1580
+#: lib/header.c:1630
 msgid "empty tag name"
 msgstr "prázdný název pøíznaku"
 
-#: lib/header.c:1595
+#: lib/header.c:1645
 msgid "unknown tag"
 msgstr "neznámý pøíznak"
 
-#: lib/header.c:1621
+#: lib/header.c:1671
 msgid "] expected at end of array"
 msgstr "na konci øady se oèekávala ]"
 
-#: lib/header.c:1637
+#: lib/header.c:1687
 msgid "unexpected ]"
 msgstr "neoèekávaná ]"
 
-#: lib/header.c:1639
+#: lib/header.c:1689
 msgid "unexpected }"
 msgstr "neoèekávaná }"
 
-#: lib/header.c:1693
+#: lib/header.c:1743
 msgid "? expected in expression"
 msgstr "ve výrazu se oèekával ?"
 
-#: lib/header.c:1700
+#: lib/header.c:1750
 msgid "{ expected after ? in expression"
 msgstr "ve výrazu se po ? oèekávala {"
 
-#: lib/header.c:1710 lib/header.c:1745
+#: lib/header.c:1760 lib/header.c:1795
 msgid "} expected in expression"
 msgstr "ve výrazu se oèekávala }"
 
-#: lib/header.c:1718
+#: lib/header.c:1768
 msgid ": expected following ? subexpression"
 msgstr "v podvýrazu se po ? oèekávala :"
 
-#: lib/header.c:1732
+#: lib/header.c:1782
 msgid "{ expected after : in expression"
 msgstr "ve výrazu se po : oèekávala {"
 
-#: lib/header.c:1753
+#: lib/header.c:1803
 msgid "| expected at end of expression"
 msgstr "na konci výrazu se oèekávala |"
 
-#: lib/header.c:1922
+#: lib/header.c:1972
 msgid "(unknown type)"
 msgstr "(neznámý typ)"
 
diff --git a/po/de.po b/po/de.po
index e0da6d2da..bdc508d5c 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: 1999-12-08 11:31-0500\n"
+"POT-Creation-Date: 1999-12-08 13:59-0500\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"
@@ -2213,85 +2213,85 @@ msgid "error removing record %s into %s"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:414
+#: lib/depends.c:411
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:443
+#: lib/depends.c:440
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:535
+#: lib/depends.c:532
 msgid "dbrecMatchesDepFlags() failed to read header"
 msgstr ""
 
-#: lib/depends.c:780
+#: lib/depends.c:777
 #, c-format
 msgid "%s: %s satisfied by added file list.\n"
 msgstr ""
 
-#: lib/depends.c:823
+#: lib/depends.c:816
 #, fuzzy, c-format
 msgid "%s: %s satisfied by added package.\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:840
+#: lib/depends.c:833
 #, c-format
 msgid "%s: %s satisfied by added provide.\n"
 msgstr ""
 
-#: lib/depends.c:871
+#: lib/depends.c:864
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:899
+#: lib/depends.c:892
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:921
+#: lib/depends.c:914
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:943
+#: lib/depends.c:936
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:956
+#: lib/depends.c:949
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:966
+#: lib/depends.c:959
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1014
+#: lib/depends.c:1007
 #, fuzzy, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 #. conflicts exist.
-#: lib/depends.c:1076
+#: lib/depends.c:1069
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
-#: lib/depends.c:1131 lib/depends.c:1430
+#: lib/depends.c:1124 lib/depends.c:1423
 #, c-format
 msgid "cannot read header at %d for dependency check"
 msgstr "kann Kopfzeilen bei %d nicht lesen, um Abhängigkeiten zu prüfen"
 
-#: lib/depends.c:1226
+#: lib/depends.c:1219
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2307,7 +2307,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141
-#: lib/header.c:2139 lib/header.c:2156 lib/header.c:2176
+#: lib/header.c:2189 lib/header.c:2206 lib/header.c:2226
 msgid "(not a number)"
 msgstr "(keine Zahl)"
 
@@ -2338,81 +2338,81 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:170
+#: lib/header.c:218
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:201 lib/header.c:764
+#: lib/header.c:249 lib/header.c:812
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1121
+#: lib/header.c:1171
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1530
+#: lib/header.c:1580
 #, c-format
 msgid "missing { after %"
 msgstr "fehlende { nach %{"
 
-#: lib/header.c:1558
+#: lib/header.c:1608
 msgid "missing } after %{"
 msgstr "fehlende } nach %{"
 
 # »Tag« übersetzen??? -ke-
-#: lib/header.c:1570
+#: lib/header.c:1620
 msgid "empty tag format"
 msgstr "leeres »Tag«-Format"
 
-#: lib/header.c:1580
+#: lib/header.c:1630
 msgid "empty tag name"
 msgstr "leerer »Tag«-Name"
 
-#: lib/header.c:1595
+#: lib/header.c:1645
 msgid "unknown tag"
 msgstr "unbekannter »Tag«"
 
-#: lib/header.c:1621
+#: lib/header.c:1671
 msgid "] expected at end of array"
 msgstr "] am Ende des Arrays erwartet"
 
-#: lib/header.c:1637
+#: lib/header.c:1687
 msgid "unexpected ]"
 msgstr "unerwartete ]"
 
-#: lib/header.c:1639
+#: lib/header.c:1689
 msgid "unexpected }"
 msgstr "unerwartete }"
 
-#: lib/header.c:1693
+#: lib/header.c:1743
 msgid "? expected in expression"
 msgstr "? im Ausdruck erwartet"
 
-#: lib/header.c:1700
+#: lib/header.c:1750
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "{ nach ? im Ausdruck erwartet"
 
-#: lib/header.c:1710 lib/header.c:1745
+#: lib/header.c:1760 lib/header.c:1795
 msgid "} expected in expression"
 msgstr "} im Ausdruck erwartet"
 
-#: lib/header.c:1718
+#: lib/header.c:1768
 msgid ": expected following ? subexpression"
 msgstr ": nach ? Unterausdruck erwartet"
 
-#: lib/header.c:1732
+#: lib/header.c:1782
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "{ nach : im Ausdruck erwartet"
 
-#: lib/header.c:1753
+#: lib/header.c:1803
 msgid "| expected at end of expression"
 msgstr "| am Ende des Ausdrucks erwartet"
 
-#: lib/header.c:1922
+#: lib/header.c:1972
 msgid "(unknown type)"
 msgstr "(unbekannter Typ)"
 
diff --git a/po/fi.po b/po/fi.po
index 8bbb226fd..27e07ab3b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-08 11:31-0500\n"
+"POT-Creation-Date: 1999-12-08 13:59-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -2150,85 +2150,85 @@ msgid "error removing record %s into %s"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:414
+#: lib/depends.c:411
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:443
+#: lib/depends.c:440
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:535
+#: lib/depends.c:532
 msgid "dbrecMatchesDepFlags() failed to read header"
 msgstr ""
 
-#: lib/depends.c:780
+#: lib/depends.c:777
 #, c-format
 msgid "%s: %s satisfied by added file list.\n"
 msgstr ""
 
-#: lib/depends.c:823
+#: lib/depends.c:816
 #, fuzzy, c-format
 msgid "%s: %s satisfied by added package.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:840
+#: lib/depends.c:833
 #, c-format
 msgid "%s: %s satisfied by added provide.\n"
 msgstr ""
 
-#: lib/depends.c:871
+#: lib/depends.c:864
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:899
+#: lib/depends.c:892
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:921
+#: lib/depends.c:914
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:943
+#: lib/depends.c:936
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:956
+#: lib/depends.c:949
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:966
+#: lib/depends.c:959
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1014
+#: lib/depends.c:1007
 #, fuzzy, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
 #. conflicts exist.
-#: lib/depends.c:1076
+#: lib/depends.c:1069
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/depends.c:1131 lib/depends.c:1430
+#: lib/depends.c:1124 lib/depends.c:1423
 #, c-format
 msgid "cannot read header at %d for dependency check"
 msgstr "en voi lukea headeria %d:ssä riippuvuutta tarkistaessa"
 
-#: lib/depends.c:1226
+#: lib/depends.c:1219
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "silmukka edellytysten ketjussa: %s"
@@ -2244,7 +2244,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141
-#: lib/header.c:2139 lib/header.c:2156 lib/header.c:2176
+#: lib/header.c:2189 lib/header.c:2206 lib/header.c:2226
 msgid "(not a number)"
 msgstr "(ei ole luku)"
 
@@ -2273,80 +2273,80 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:170
+#: lib/header.c:218
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:201 lib/header.c:764
+#: lib/header.c:249 lib/header.c:812
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1121
+#: lib/header.c:1171
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1530
+#: lib/header.c:1580
 #, c-format
 msgid "missing { after %"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#: lib/header.c:1558
+#: lib/header.c:1608
 msgid "missing } after %{"
 msgstr "puuttuva '{' '%{':n jälkeen"
 
-#: lib/header.c:1570
+#: lib/header.c:1620
 msgid "empty tag format"
 msgstr "tyhjä nimiön formaatti"
 
-#: lib/header.c:1580
+#: lib/header.c:1630
 msgid "empty tag name"
 msgstr "tyhjä nimiön nimi"
 
-#: lib/header.c:1595
+#: lib/header.c:1645
 msgid "unknown tag"
 msgstr "tuntematon nimiö"
 
-#: lib/header.c:1621
+#: lib/header.c:1671
 msgid "] expected at end of array"
 msgstr "']' puuttuu taulukkomäärittelyn lopusta"
 
-#: lib/header.c:1637
+#: lib/header.c:1687
 msgid "unexpected ]"
 msgstr "odottamaton ']'"
 
-#: lib/header.c:1639
+#: lib/header.c:1689
 msgid "unexpected }"
 msgstr "odottamaton '}'"
 
-#: lib/header.c:1693
+#: lib/header.c:1743
 msgid "? expected in expression"
 msgstr "odotin '?'-merkkiä ilmauksessa"
 
-#: lib/header.c:1700
+#: lib/header.c:1750
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "odotin '{' '?'-merkin jälkeen ilmauksessa "
 
-#: lib/header.c:1710 lib/header.c:1745
+#: lib/header.c:1760 lib/header.c:1795
 msgid "} expected in expression"
 msgstr "odotin '}'-merkkiä ilmauksessa"
 
-#: lib/header.c:1718
+#: lib/header.c:1768
 msgid ": expected following ? subexpression"
 msgstr "odotin ':' '?'-merkin jälkeen ali-ilmauksessa "
 
-#: lib/header.c:1732
+#: lib/header.c:1782
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa "
 
-#: lib/header.c:1753
+#: lib/header.c:1803
 msgid "| expected at end of expression"
 msgstr "odotin '}'-merkkiä ilmauksen lopussa"
 
-#: lib/header.c:1922
+#: lib/header.c:1972
 msgid "(unknown type)"
 msgstr "(tuntematon tyyppi)"
 
diff --git a/po/fr.po b/po/fr.po
index b88dbbc1a..0b59c8307 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 1999-12-08 11:31-0500\n"
+msgstr "POT-Creation-Date: 1999-12-08 13:59-0500\n"
 
 #: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407
 #, c-format
@@ -2151,85 +2151,85 @@ msgid "error removing record %s into %s"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:414
+#: lib/depends.c:411
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:443
+#: lib/depends.c:440
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:535
+#: lib/depends.c:532
 msgid "dbrecMatchesDepFlags() failed to read header"
 msgstr ""
 
-#: lib/depends.c:780
+#: lib/depends.c:777
 #, c-format
 msgid "%s: %s satisfied by added file list.\n"
 msgstr ""
 
-#: lib/depends.c:823
+#: lib/depends.c:816
 #, c-format
 msgid "%s: %s satisfied by added package.\n"
 msgstr ""
 
-#: lib/depends.c:840
+#: lib/depends.c:833
 #, c-format
 msgid "%s: %s satisfied by added provide.\n"
 msgstr ""
 
-#: lib/depends.c:871
+#: lib/depends.c:864
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:899
+#: lib/depends.c:892
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:921
+#: lib/depends.c:914
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:943
+#: lib/depends.c:936
 #, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr ""
 
-#: lib/depends.c:956
+#: lib/depends.c:949
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:966
+#: lib/depends.c:959
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1014
+#: lib/depends.c:1007
 #, fuzzy, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
 #. conflicts exist.
-#: lib/depends.c:1076
+#: lib/depends.c:1069
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/depends.c:1131 lib/depends.c:1430
+#: lib/depends.c:1124 lib/depends.c:1423
 #, c-format
 msgid "cannot read header at %d for dependency check"
 msgstr ""
 
-#: lib/depends.c:1226
+#: lib/depends.c:1219
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2245,7 +2245,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141
-#: lib/header.c:2139 lib/header.c:2156 lib/header.c:2176
+#: lib/header.c:2189 lib/header.c:2206 lib/header.c:2226
 msgid "(not a number)"
 msgstr ""
 
@@ -2274,80 +2274,80 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:170
+#: lib/header.c:218
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:201 lib/header.c:764
+#: lib/header.c:249 lib/header.c:812
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1121
+#: lib/header.c:1171
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1530
+#: lib/header.c:1580
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1558
+#: lib/header.c:1608
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1570
+#: lib/header.c:1620
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1580
+#: lib/header.c:1630
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1595
+#: lib/header.c:1645
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1621
+#: lib/header.c:1671
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1637
+#: lib/header.c:1687
 #, fuzzy
 msgid "unexpected ]"
 msgstr "source de requête inattendue"
 
-#: lib/header.c:1639
+#: lib/header.c:1689
 #, fuzzy
 msgid "unexpected }"
 msgstr "source de requête inattendue"
 
-#: lib/header.c:1693
+#: lib/header.c:1743
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1700
+#: lib/header.c:1750
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1710 lib/header.c:1745
+#: lib/header.c:1760 lib/header.c:1795
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1718
+#: lib/header.c:1768
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1732
+#: lib/header.c:1782
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1803
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1922
+#: lib/header.c:1972
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 12f0fa2b4..e92de6430 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: 1999-12-08 11:31-0500\n"
+"POT-Creation-Date: 1999-12-08 13:59-0500\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"
@@ -2069,85 +2069,85 @@ msgid "error removing record %s into %s"
 msgstr "b³±d usuwania rekordu %s z %s"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:414
+#: lib/depends.c:411
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:443
+#: lib/depends.c:440
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:535
+#: lib/depends.c:532
 msgid "dbrecMatchesDepFlags() failed to read header"
 msgstr "dbrecMatchesDepFlags() odczyt nag³ówka nie powiód³ siê"
 
-#: lib/depends.c:780
+#: lib/depends.c:777
 #, c-format
 msgid "%s: %s satisfied by added file list.\n"
 msgstr ""
 
-#: lib/depends.c:823
+#: lib/depends.c:816
 #, fuzzy, c-format
 msgid "%s: %s satisfied by added package.\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:840
+#: lib/depends.c:833
 #, c-format
 msgid "%s: %s satisfied by added provide.\n"
 msgstr ""
 
-#: lib/depends.c:871
+#: lib/depends.c:864
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:899
+#: lib/depends.c:892
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:921
+#: lib/depends.c:914
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:943
+#: lib/depends.c:936
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:956
+#: lib/depends.c:949
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:966
+#: lib/depends.c:959
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1014
+#: lib/depends.c:1007
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1076
+#: lib/depends.c:1069
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakiet %s jest w konflikcie: %s\n"
 
-#: lib/depends.c:1131 lib/depends.c:1430
+#: lib/depends.c:1124 lib/depends.c:1423
 #, c-format
 msgid "cannot read header at %d for dependency check"
 msgstr "nie mo¿na odczytaæ nag³ówka %d dla sprawdzenia zale¿no¶ci"
 
-#: lib/depends.c:1226
+#: lib/depends.c:1219
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2163,7 +2163,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141
-#: lib/header.c:2139 lib/header.c:2156 lib/header.c:2176
+#: lib/header.c:2189 lib/header.c:2206 lib/header.c:2226
 msgid "(not a number)"
 msgstr "(nie jest liczb±)"
 
@@ -2192,78 +2192,78 @@ msgid "file %s is on an unknown device"
 msgstr "plik %s jest na nieznanym urz±dzeniu"
 
 #. This should not be allowed
-#: lib/header.c:170
+#: lib/header.c:218
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE licznik musi byæ 1.\n"
 
-#: lib/header.c:201 lib/header.c:764
+#: lib/header.c:249 lib/header.c:812
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ danych %d nie jest obs³ugiwany\n"
 
-#: lib/header.c:1121
+#: lib/header.c:1171
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "B³edny licznik dla headerAddEntry(): %d\n"
 
-#: lib/header.c:1530
+#: lib/header.c:1580
 #, c-format
 msgid "missing { after %"
 msgstr "brak { po %"
 
-#: lib/header.c:1558
+#: lib/header.c:1608
 msgid "missing } after %{"
 msgstr "brak } po %{"
 
-#: lib/header.c:1570
+#: lib/header.c:1620
 msgid "empty tag format"
 msgstr "pusty format etykiety"
 
-#: lib/header.c:1580
+#: lib/header.c:1630
 msgid "empty tag name"
 msgstr "pusta nazwa etykiety"
 
-#: lib/header.c:1595
+#: lib/header.c:1645
 msgid "unknown tag"
 msgstr "nieznana etykieta"
 
-#: lib/header.c:1621
+#: lib/header.c:1671
 msgid "] expected at end of array"
 msgstr "spodziewany ] na koñcu tablicy"
 
-#: lib/header.c:1637
+#: lib/header.c:1687
 msgid "unexpected ]"
 msgstr "nie spodziewany ]"
 
-#: lib/header.c:1639
+#: lib/header.c:1689
 msgid "unexpected }"
 msgstr "nie spodziewany }"
 
-#: lib/header.c:1693
+#: lib/header.c:1743
 msgid "? expected in expression"
 msgstr "spodziewany ? w wyra¿eniu"
 
-#: lib/header.c:1700
+#: lib/header.c:1750
 msgid "{ expected after ? in expression"
 msgstr "spodziewany { po ? w wyra¿eniu"
 
-#: lib/header.c:1710 lib/header.c:1745
+#: lib/header.c:1760 lib/header.c:1795
 msgid "} expected in expression"
 msgstr "spodziewany } w wyra¿eniu"
 
-#: lib/header.c:1718
+#: lib/header.c:1768
 msgid ": expected following ? subexpression"
 msgstr "spodziewany : po podwyra¿eniu ?"
 
-#: lib/header.c:1732
+#: lib/header.c:1782
 msgid "{ expected after : in expression"
 msgstr "spodziewany { po : w wyra¿eniu"
 
-#: lib/header.c:1753
+#: lib/header.c:1803
 msgid "| expected at end of expression"
 msgstr "spodziewany | na koñcu wyra¿enia"
 
-#: lib/header.c:1922
+#: lib/header.c:1972
 msgid "(unknown type)"
 msgstr "(nieznany typ)"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b29eb3053..8560aa2e1 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: 1999-12-08 11:31-0500\n"
+msgstr "POT-Creation-Date: 1999-12-08 13:59-0500\n"
 
 #: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407
 #, c-format
@@ -2212,85 +2212,85 @@ msgid "error removing record %s into %s"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:414
+#: lib/depends.c:411
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:443
+#: lib/depends.c:440
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:535
+#: lib/depends.c:532
 msgid "dbrecMatchesDepFlags() failed to read header"
 msgstr ""
 
-#: lib/depends.c:780
+#: lib/depends.c:777
 #, c-format
 msgid "%s: %s satisfied by added file list.\n"
 msgstr ""
 
-#: lib/depends.c:823
+#: lib/depends.c:816
 #, c-format
 msgid "%s: %s satisfied by added package.\n"
 msgstr ""
 
-#: lib/depends.c:840
+#: lib/depends.c:833
 #, c-format
 msgid "%s: %s satisfied by added provide.\n"
 msgstr ""
 
-#: lib/depends.c:871
+#: lib/depends.c:864
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:899
+#: lib/depends.c:892
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:921
+#: lib/depends.c:914
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:943
+#: lib/depends.c:936
 #, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr ""
 
-#: lib/depends.c:956
+#: lib/depends.c:949
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:966
+#: lib/depends.c:959
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1014
+#: lib/depends.c:1007
 #, fuzzy, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "não foi passado pacote para instalação"
 
 #. conflicts exist.
-#: lib/depends.c:1076
+#: lib/depends.c:1069
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/depends.c:1131 lib/depends.c:1430
+#: lib/depends.c:1124 lib/depends.c:1423
 #, c-format
 msgid "cannot read header at %d for dependency check"
 msgstr ""
 
-#: lib/depends.c:1226
+#: lib/depends.c:1219
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2306,7 +2306,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141
-#: lib/header.c:2139 lib/header.c:2156 lib/header.c:2176
+#: lib/header.c:2189 lib/header.c:2206 lib/header.c:2226
 msgid "(not a number)"
 msgstr ""
 
@@ -2337,80 +2337,80 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:170
+#: lib/header.c:218
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:201 lib/header.c:764
+#: lib/header.c:249 lib/header.c:812
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1121
+#: lib/header.c:1171
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1530
+#: lib/header.c:1580
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1558
+#: lib/header.c:1608
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1570
+#: lib/header.c:1620
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1580
+#: lib/header.c:1630
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1595
+#: lib/header.c:1645
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1621
+#: lib/header.c:1671
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1637
+#: lib/header.c:1687
 #, fuzzy
 msgid "unexpected ]"
 msgstr "fonte de pesquisa não esperado"
 
-#: lib/header.c:1639
+#: lib/header.c:1689
 #, fuzzy
 msgid "unexpected }"
 msgstr "fonte de pesquisa não esperado"
 
-#: lib/header.c:1693
+#: lib/header.c:1743
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1700
+#: lib/header.c:1750
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1710 lib/header.c:1745
+#: lib/header.c:1760 lib/header.c:1795
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1718
+#: lib/header.c:1768
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1732
+#: lib/header.c:1782
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1803
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1922
+#: lib/header.c:1972
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/rpm.pot b/po/rpm.pot
index be47360e8..a4c82e36c 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-08 11:31-0500\n"
+"POT-Creation-Date: 1999-12-08 13:59-0500\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"
@@ -2002,85 +2002,85 @@ msgid "error removing record %s into %s"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:414
+#: lib/depends.c:411
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:443
+#: lib/depends.c:440
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:535
+#: lib/depends.c:532
 msgid "dbrecMatchesDepFlags() failed to read header"
 msgstr ""
 
-#: lib/depends.c:780
+#: lib/depends.c:777
 #, c-format
 msgid "%s: %s satisfied by added file list.\n"
 msgstr ""
 
-#: lib/depends.c:823
+#: lib/depends.c:816
 #, c-format
 msgid "%s: %s satisfied by added package.\n"
 msgstr ""
 
-#: lib/depends.c:840
+#: lib/depends.c:833
 #, c-format
 msgid "%s: %s satisfied by added provide.\n"
 msgstr ""
 
-#: lib/depends.c:871
+#: lib/depends.c:864
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:899
+#: lib/depends.c:892
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:921
+#: lib/depends.c:914
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:943
+#: lib/depends.c:936
 #, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr ""
 
-#: lib/depends.c:956
+#: lib/depends.c:949
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:966
+#: lib/depends.c:959
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1014
+#: lib/depends.c:1007
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1076
+#: lib/depends.c:1069
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1131 lib/depends.c:1430
+#: lib/depends.c:1124 lib/depends.c:1423
 #, c-format
 msgid "cannot read header at %d for dependency check"
 msgstr ""
 
-#: lib/depends.c:1226
+#: lib/depends.c:1219
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2096,7 +2096,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141
-#: lib/header.c:2139 lib/header.c:2156 lib/header.c:2176
+#: lib/header.c:2189 lib/header.c:2206 lib/header.c:2226
 msgid "(not a number)"
 msgstr ""
 
@@ -2125,78 +2125,78 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:170
+#: lib/header.c:218
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:201 lib/header.c:764
+#: lib/header.c:249 lib/header.c:812
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1121
+#: lib/header.c:1171
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1530
+#: lib/header.c:1580
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1558
+#: lib/header.c:1608
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1570
+#: lib/header.c:1620
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1580
+#: lib/header.c:1630
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1595
+#: lib/header.c:1645
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1621
+#: lib/header.c:1671
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1637
+#: lib/header.c:1687
 msgid "unexpected ]"
 msgstr ""
 
-#: lib/header.c:1639
+#: lib/header.c:1689
 msgid "unexpected }"
 msgstr ""
 
-#: lib/header.c:1693
+#: lib/header.c:1743
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1700
+#: lib/header.c:1750
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1710 lib/header.c:1745
+#: lib/header.c:1760 lib/header.c:1795
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1718
+#: lib/header.c:1768
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1732
+#: lib/header.c:1782
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1803
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1922
+#: lib/header.c:1972
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index b085bc717..1f1e50c22 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-08 11:31-0500\n"
+"POT-Creation-Date: 1999-12-08 13:59-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2076,85 +2076,85 @@ msgid "error removing record %s into %s"
 msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÚÁÐÉÓÉ %s ÉÚ %s"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:414
+#: lib/depends.c:411
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:443
+#: lib/depends.c:440
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:535
+#: lib/depends.c:532
 msgid "dbrecMatchesDepFlags() failed to read header"
 msgstr "ÏÛÉÂËÁ dbrecMatchesDepFlags() ÐÒÉ ÞÔÅÎÉÉ ÈÅÄÅÒÁ"
 
-#: lib/depends.c:780
+#: lib/depends.c:777
 #, c-format
 msgid "%s: %s satisfied by added file list.\n"
 msgstr ""
 
-#: lib/depends.c:823
+#: lib/depends.c:816
 #, fuzzy, c-format
 msgid "%s: %s satisfied by added package.\n"
 msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
 
-#: lib/depends.c:840
+#: lib/depends.c:833
 #, c-format
 msgid "%s: %s satisfied by added provide.\n"
 msgstr ""
 
-#: lib/depends.c:871
+#: lib/depends.c:864
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:899
+#: lib/depends.c:892
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:921
+#: lib/depends.c:914
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:943
+#: lib/depends.c:936
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
 
-#: lib/depends.c:956
+#: lib/depends.c:949
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:966
+#: lib/depends.c:959
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1014
+#: lib/depends.c:1007
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1076
+#: lib/depends.c:1069
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n"
 
-#: lib/depends.c:1131 lib/depends.c:1430
+#: lib/depends.c:1124 lib/depends.c:1423
 #, c-format
 msgid "cannot read header at %d for dependency check"
 msgstr "ÎÅ ÍÏÇÕ ÐÒÏÞÅÓÔØ ÈÅÄÅÒ × %d ÄÌÑ ÐÒÏ×ÅÒËÉ ÚÁ×ÉÓÉÍÏÓÔÅÊ"
 
-#: lib/depends.c:1226
+#: lib/depends.c:1219
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "ÚÁÍËÎÕÔÙÊ ÃÉËÌ × ÃÅÐÏÞËÅ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ ÕÓÔÁÎÏ×ËÉ: %s"
@@ -2170,7 +2170,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141
-#: lib/header.c:2139 lib/header.c:2156 lib/header.c:2176
+#: lib/header.c:2189 lib/header.c:2206 lib/header.c:2226
 msgid "(not a number)"
 msgstr "(ÎÅ ÞÉÓÌÏ)"
 
@@ -2199,78 +2199,78 @@ msgid "file %s is on an unknown device"
 msgstr "ÆÁÊÌ %s - ÎÁ ÎÅÉÚ×ÅÓÔÎÏÍ ÕÓÔÒÏÊÓÔ×Å"
 
 #. This should not be allowed
-#: lib/header.c:170
+#: lib/header.c:218
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE count must be 1.\n"
 
-#: lib/header.c:201 lib/header.c:764
+#: lib/header.c:249 lib/header.c:812
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: lib/header.c:1121
+#: lib/header.c:1171
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "îÅ×ÅÒÎÏÅ ÞÉÓÌÏ ÄÌÑ headerAddEntry(): %d\n"
 
-#: lib/header.c:1530
+#: lib/header.c:1580
 #, c-format
 msgid "missing { after %"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"{\" ÐÏÓÌÅ \"%\""
 
-#: lib/header.c:1558
+#: lib/header.c:1608
 msgid "missing } after %{"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ \"}\" ÐÏÓÌÅ \"%{\""
 
-#: lib/header.c:1570
+#: lib/header.c:1620
 msgid "empty tag format"
 msgstr "ÐÕÓÔÏÊ ÆÏÒÍÁÔ ÔÜÇÁ"
 
-#: lib/header.c:1580
+#: lib/header.c:1630
 msgid "empty tag name"
 msgstr "ÐÕÓÔÏÅ ÉÍÑ ÔÜÇÁ"
 
-#: lib/header.c:1595
+#: lib/header.c:1645
 msgid "unknown tag"
 msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÔÜÇ"
 
-#: lib/header.c:1621
+#: lib/header.c:1671
 msgid "] expected at end of array"
 msgstr "× ËÏÎÃÅ ÍÁÓÓÉ×Á ÏÖÉÄÁÌÁÓØ \"]\""
 
-#: lib/header.c:1637
+#: lib/header.c:1687
 msgid "unexpected ]"
 msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"]\""
 
-#: lib/header.c:1639
+#: lib/header.c:1689
 msgid "unexpected }"
 msgstr "ÎÅÏÖÉÄÁÎÎÁÑ \"}\""
 
-#: lib/header.c:1693
+#: lib/header.c:1743
 msgid "? expected in expression"
 msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÓÑ \"?\""
 
-#: lib/header.c:1700
+#: lib/header.c:1750
 msgid "{ expected after ? in expression"
 msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÁÓØ \"{\""
 
-#: lib/header.c:1710 lib/header.c:1745
+#: lib/header.c:1760 lib/header.c:1795
 msgid "} expected in expression"
 msgstr "× ×ÙÒÁÖÅÎÉÉ ÏÖÉÄÁÌÁÓØ \"}\""
 
-#: lib/header.c:1718
+#: lib/header.c:1768
 msgid ": expected following ? subexpression"
 msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \"?\" ÏÖÉÄÁÌÏÓØ \":\""
 
-#: lib/header.c:1732
+#: lib/header.c:1782
 msgid "{ expected after : in expression"
 msgstr "× ×ÙÒÁÖÅÎÉÉ ÐÏÓÌÅ \":\" ÏÖÉÄÁÌÁÓØ \"{\""
 
-#: lib/header.c:1753
+#: lib/header.c:1803
 msgid "| expected at end of expression"
 msgstr "× ËÏÎÃÅ ×ÙÒÁÖÅÎÉÑ ÏÖÉÄÁÌÓÑ \"|\""
 
-#: lib/header.c:1922
+#: lib/header.c:1972
 msgid "(unknown type)"
 msgstr "(ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ)"
 
diff --git a/po/sk.po b/po/sk.po
index a24bdf4d5..9bb50bf65 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: 1999-12-08 11:31-0500\n"
+"POT-Creation-Date: 1999-12-08 13:59-0500\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"
@@ -2080,85 +2080,85 @@ msgid "error removing record %s into %s"
 msgstr "chyba pri odstraòovaní záznamu %s z %s"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:414
+#: lib/depends.c:411
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:443
+#: lib/depends.c:440
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:535
+#: lib/depends.c:532
 msgid "dbrecMatchesDepFlags() failed to read header"
 msgstr "dbrecMatchesDepFlags() sa nepodarilo preèíta» hlavièku"
 
-#: lib/depends.c:780
+#: lib/depends.c:777
 #, c-format
 msgid "%s: %s satisfied by added file list.\n"
 msgstr ""
 
-#: lib/depends.c:823
+#: lib/depends.c:816
 #, fuzzy, c-format
 msgid "%s: %s satisfied by added package.\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
-#: lib/depends.c:840
+#: lib/depends.c:833
 #, c-format
 msgid "%s: %s satisfied by added provide.\n"
 msgstr ""
 
-#: lib/depends.c:871
+#: lib/depends.c:864
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:899
+#: lib/depends.c:892
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:921
+#: lib/depends.c:914
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:943
+#: lib/depends.c:936
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
-#: lib/depends.c:956
+#: lib/depends.c:949
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:966
+#: lib/depends.c:959
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1014
+#: lib/depends.c:1007
 #, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1076
+#: lib/depends.c:1069
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balík %s koliduje: %s\n"
 
-#: lib/depends.c:1131 lib/depends.c:1430
+#: lib/depends.c:1124 lib/depends.c:1423
 #, c-format
 msgid "cannot read header at %d for dependency check"
 msgstr "nie je mo¾né preèíta» hlavièku na %d pre kontrolu závislostí"
 
-#: lib/depends.c:1226
+#: lib/depends.c:1219
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "sluèka v re»azi po¾iadaviek: %s"
@@ -2174,7 +2174,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141
-#: lib/header.c:2139 lib/header.c:2156 lib/header.c:2176
+#: lib/header.c:2189 lib/header.c:2206 lib/header.c:2226
 msgid "(not a number)"
 msgstr "(nie je èíslo)"
 
@@ -2203,78 +2203,78 @@ msgid "file %s is on an unknown device"
 msgstr "súbor %s sa nachádza na neznámom zariadení"
 
 #. This should not be allowed
-#: lib/header.c:170
+#: lib/header.c:218
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE poèet musí by» 1.\n"
 
-#: lib/header.c:201 lib/header.c:764
+#: lib/header.c:249 lib/header.c:812
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ údajov %d nie je podorovaný\n"
 
-#: lib/header.c:1121
+#: lib/header.c:1171
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr "Chybný poèet pre headerAddEntry(): %d\n"
 
-#: lib/header.c:1530
+#: lib/header.c:1580
 #, c-format
 msgid "missing { after %"
 msgstr "chýbajúce { po %"
 
-#: lib/header.c:1558
+#: lib/header.c:1608
 msgid "missing } after %{"
 msgstr "chýbajúce } po %{"
 
-#: lib/header.c:1570
+#: lib/header.c:1620
 msgid "empty tag format"
 msgstr "prázdny tag formát"
 
-#: lib/header.c:1580
+#: lib/header.c:1630
 msgid "empty tag name"
 msgstr "prázdne meno tagu"
 
-#: lib/header.c:1595
+#: lib/header.c:1645
 msgid "unknown tag"
 msgstr "neznámy tag"
 
-#: lib/header.c:1621
+#: lib/header.c:1671
 msgid "] expected at end of array"
 msgstr "] oèakávané na konci poµa"
 
-#: lib/header.c:1637
+#: lib/header.c:1687
 msgid "unexpected ]"
 msgstr "neoèakávané ]"
 
-#: lib/header.c:1639
+#: lib/header.c:1689
 msgid "unexpected }"
 msgstr "neoèakávané }"
 
-#: lib/header.c:1693
+#: lib/header.c:1743
 msgid "? expected in expression"
 msgstr "? oèakávané vo výraze"
 
-#: lib/header.c:1700
+#: lib/header.c:1750
 msgid "{ expected after ? in expression"
 msgstr "{ oèakávané po ? vo výraze"
 
-#: lib/header.c:1710 lib/header.c:1745
+#: lib/header.c:1760 lib/header.c:1795
 msgid "} expected in expression"
 msgstr "} oèakávané vo výraze"
 
-#: lib/header.c:1718
+#: lib/header.c:1768
 msgid ": expected following ? subexpression"
 msgstr ": oèakávané po ? podvýraze"
 
-#: lib/header.c:1732
+#: lib/header.c:1782
 msgid "{ expected after : in expression"
 msgstr "{ oèakávané po : vo výraze"
 
-#: lib/header.c:1753
+#: lib/header.c:1803
 msgid "| expected at end of expression"
 msgstr "| oèakávené na konci výrazu"
 
-#: lib/header.c:1922
+#: lib/header.c:1972
 msgid "(unknown type)"
 msgstr "(neznámy typ)"
 
diff --git a/po/sr.po b/po/sr.po
index f193a2d8f..09e36ceb5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-12-08 11:31-0500\n"
+"POT-Creation-Date: 1999-12-08 13:59-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -2111,85 +2111,85 @@ msgid "error removing record %s into %s"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:414
+#: lib/depends.c:411
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:443
+#: lib/depends.c:440
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:535
+#: lib/depends.c:532
 msgid "dbrecMatchesDepFlags() failed to read header"
 msgstr ""
 
-#: lib/depends.c:780
+#: lib/depends.c:777
 #, c-format
 msgid "%s: %s satisfied by added file list.\n"
 msgstr ""
 
-#: lib/depends.c:823
+#: lib/depends.c:816
 #, fuzzy, c-format
 msgid "%s: %s satisfied by added package.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:840
+#: lib/depends.c:833
 #, c-format
 msgid "%s: %s satisfied by added provide.\n"
 msgstr ""
 
-#: lib/depends.c:871
+#: lib/depends.c:864
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:899
+#: lib/depends.c:892
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:921
+#: lib/depends.c:914
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:943
+#: lib/depends.c:936
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:956
+#: lib/depends.c:949
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:966
+#: lib/depends.c:959
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1014
+#: lib/depends.c:1007
 #, fuzzy, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "paket %s nije naveden u %s"
 
 #. conflicts exist.
-#: lib/depends.c:1076
+#: lib/depends.c:1069
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/depends.c:1131 lib/depends.c:1430
+#: lib/depends.c:1124 lib/depends.c:1423
 #, c-format
 msgid "cannot read header at %d for dependency check"
 msgstr "ne mogu da proèitam zaglavlje na %s za proveru zavisnosti"
 
-#: lib/depends.c:1226
+#: lib/depends.c:1219
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "petlja u lancu: %s"
@@ -2205,7 +2205,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141
-#: lib/header.c:2139 lib/header.c:2156 lib/header.c:2176
+#: lib/header.c:2189 lib/header.c:2206 lib/header.c:2226
 msgid "(not a number)"
 msgstr "(nije broj)"
 
@@ -2234,80 +2234,80 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:170
+#: lib/header.c:218
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:201 lib/header.c:764
+#: lib/header.c:249 lib/header.c:812
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1121
+#: lib/header.c:1171
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1530
+#: lib/header.c:1580
 #, c-format
 msgid "missing { after %"
 msgstr "nedostaje { posle %"
 
-#: lib/header.c:1558
+#: lib/header.c:1608
 msgid "missing } after %{"
 msgstr "nedostaje } posle %"
 
-#: lib/header.c:1570
+#: lib/header.c:1620
 msgid "empty tag format"
 msgstr "prazan 'tag' format'"
 
-#: lib/header.c:1580
+#: lib/header.c:1630
 msgid "empty tag name"
 msgstr "prazno ime tag-a"
 
-#: lib/header.c:1595
+#: lib/header.c:1645
 msgid "unknown tag"
 msgstr "nepoznat tag"
 
-#: lib/header.c:1621
+#: lib/header.c:1671
 msgid "] expected at end of array"
 msgstr "] oèekivano na kraju niza"
 
-#: lib/header.c:1637
+#: lib/header.c:1687
 msgid "unexpected ]"
 msgstr "neoèekivano ]"
 
-#: lib/header.c:1639
+#: lib/header.c:1689
 msgid "unexpected }"
 msgstr "neoèekivano }"
 
-#: lib/header.c:1693
+#: lib/header.c:1743
 msgid "? expected in expression"
 msgstr "oèekivan znak ? u izrazu"
 
-#: lib/header.c:1700
+#: lib/header.c:1750
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "{ oèekivano posle ? u izrazu"
 
-#: lib/header.c:1710 lib/header.c:1745
+#: lib/header.c:1760 lib/header.c:1795
 msgid "} expected in expression"
 msgstr "} oèekivano u izrazu"
 
-#: lib/header.c:1718
+#: lib/header.c:1768
 msgid ": expected following ? subexpression"
 msgstr "oèekivano : praæeno ? podizrazom"
 
-#: lib/header.c:1732
+#: lib/header.c:1782
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "{ oèekivano posle : u izrazu"
 
-#: lib/header.c:1753
+#: lib/header.c:1803
 msgid "| expected at end of expression"
 msgstr "| oèekivano na kraju izraza"
 
-#: lib/header.c:1922
+#: lib/header.c:1972
 msgid "(unknown type)"
 msgstr "(nepoznat tip)"
 
diff --git a/po/sv.po b/po/sv.po
index 82ce7833c..27c3640a7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 1999-12-08 11:31-0500\n"
+msgstr "POT-Creation-Date: 1999-12-08 13:59-0500\n"
 
 #: build.c:25 lib/rpminstall.c:247 lib/rpminstall.c:407
 #, c-format
@@ -2165,85 +2165,85 @@ msgid "error removing record %s into %s"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:414
+#: lib/depends.c:411
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:443
+#: lib/depends.c:440
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:535
+#: lib/depends.c:532
 msgid "dbrecMatchesDepFlags() failed to read header"
 msgstr ""
 
-#: lib/depends.c:780
+#: lib/depends.c:777
 #, c-format
 msgid "%s: %s satisfied by added file list.\n"
 msgstr ""
 
-#: lib/depends.c:823
+#: lib/depends.c:816
 #, c-format
 msgid "%s: %s satisfied by added package.\n"
 msgstr ""
 
-#: lib/depends.c:840
+#: lib/depends.c:833
 #, c-format
 msgid "%s: %s satisfied by added provide.\n"
 msgstr ""
 
-#: lib/depends.c:871
+#: lib/depends.c:864
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:899
+#: lib/depends.c:892
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:921
+#: lib/depends.c:914
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:943
+#: lib/depends.c:936
 #, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr ""
 
-#: lib/depends.c:956
+#: lib/depends.c:949
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:966
+#: lib/depends.c:959
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1014
+#: lib/depends.c:1007
 #, fuzzy, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "inga paket angivna för installation"
 
 #. conflicts exist.
-#: lib/depends.c:1076
+#: lib/depends.c:1069
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "inga paket angivna för avinstallation"
 
-#: lib/depends.c:1131 lib/depends.c:1430
+#: lib/depends.c:1124 lib/depends.c:1423
 #, c-format
 msgid "cannot read header at %d for dependency check"
 msgstr ""
 
-#: lib/depends.c:1226
+#: lib/depends.c:1219
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""
@@ -2259,7 +2259,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141
-#: lib/header.c:2139 lib/header.c:2156 lib/header.c:2176
+#: lib/header.c:2189 lib/header.c:2206 lib/header.c:2226
 msgid "(not a number)"
 msgstr ""
 
@@ -2288,80 +2288,80 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:170
+#: lib/header.c:218
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:201 lib/header.c:764
+#: lib/header.c:249 lib/header.c:812
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1121
+#: lib/header.c:1171
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1530
+#: lib/header.c:1580
 #, c-format
 msgid "missing { after %"
 msgstr ""
 
-#: lib/header.c:1558
+#: lib/header.c:1608
 msgid "missing } after %{"
 msgstr ""
 
-#: lib/header.c:1570
+#: lib/header.c:1620
 msgid "empty tag format"
 msgstr ""
 
-#: lib/header.c:1580
+#: lib/header.c:1630
 msgid "empty tag name"
 msgstr ""
 
-#: lib/header.c:1595
+#: lib/header.c:1645
 msgid "unknown tag"
 msgstr ""
 
-#: lib/header.c:1621
+#: lib/header.c:1671
 msgid "] expected at end of array"
 msgstr ""
 
-#: lib/header.c:1637
+#: lib/header.c:1687
 #, fuzzy
 msgid "unexpected ]"
 msgstr "oväntad undersöknings källa"
 
-#: lib/header.c:1639
+#: lib/header.c:1689
 #, fuzzy
 msgid "unexpected }"
 msgstr "oväntad undersöknings källa"
 
-#: lib/header.c:1693
+#: lib/header.c:1743
 msgid "? expected in expression"
 msgstr ""
 
-#: lib/header.c:1700
+#: lib/header.c:1750
 msgid "{ expected after ? in expression"
 msgstr ""
 
-#: lib/header.c:1710 lib/header.c:1745
+#: lib/header.c:1760 lib/header.c:1795
 msgid "} expected in expression"
 msgstr ""
 
-#: lib/header.c:1718
+#: lib/header.c:1768
 msgid ": expected following ? subexpression"
 msgstr ""
 
-#: lib/header.c:1732
+#: lib/header.c:1782
 msgid "{ expected after : in expression"
 msgstr ""
 
-#: lib/header.c:1753
+#: lib/header.c:1803
 msgid "| expected at end of expression"
 msgstr ""
 
-#: lib/header.c:1922
+#: lib/header.c:1972
 msgid "(unknown type)"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 71d9c2cab..8718d5f00 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-08 11:31-0500\n"
+"POT-Creation-Date: 1999-12-08 13:59-0500\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"
@@ -2149,85 +2149,85 @@ msgid "error removing record %s into %s"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:414
+#: lib/depends.c:411
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:443
+#: lib/depends.c:440
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:535
+#: lib/depends.c:532
 msgid "dbrecMatchesDepFlags() failed to read header"
 msgstr ""
 
-#: lib/depends.c:780
+#: lib/depends.c:777
 #, c-format
 msgid "%s: %s satisfied by added file list.\n"
 msgstr ""
 
-#: lib/depends.c:823
+#: lib/depends.c:816
 #, fuzzy, c-format
 msgid "%s: %s satisfied by added package.\n"
 msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
 
-#: lib/depends.c:840
+#: lib/depends.c:833
 #, c-format
 msgid "%s: %s satisfied by added provide.\n"
 msgstr ""
 
-#: lib/depends.c:871
+#: lib/depends.c:864
 #, c-format
 msgid "%s: %s satisfied by rpmrc provides.\n"
 msgstr ""
 
-#: lib/depends.c:899
+#: lib/depends.c:892
 #, c-format
 msgid "%s: %s satisfied by db file lists.\n"
 msgstr ""
 
-#: lib/depends.c:921
+#: lib/depends.c:914
 #, c-format
 msgid "%s: %s satisfied by db provides.\n"
 msgstr ""
 
-#: lib/depends.c:943
+#: lib/depends.c:936
 #, fuzzy, c-format
 msgid "%s: %s satisfied by db packages.\n"
 msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
 
-#: lib/depends.c:956
+#: lib/depends.c:949
 #, c-format
 msgid "%s: %s satisfied by rpmlib version.\n"
 msgstr ""
 
-#: lib/depends.c:966
+#: lib/depends.c:959
 #, c-format
 msgid "%s: %s unsatisfied.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1014
+#: lib/depends.c:1007
 #, fuzzy, c-format
 msgid "package %s require not satisfied: %s\n"
 msgstr "%s paketi %s altýnda gözükmüyor"
 
 #. conflicts exist.
-#: lib/depends.c:1076
+#: lib/depends.c:1069
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s paketi %s altýnda gözükmüyor"
 
-#: lib/depends.c:1131 lib/depends.c:1430
+#: lib/depends.c:1124 lib/depends.c:1423
 #, c-format
 msgid "cannot read header at %d for dependency check"
 msgstr "baðýmlýlýk sorgulamasý için %d numaralý baþlýk okunamýyor"
 
-#: lib/depends.c:1226
+#: lib/depends.c:1219
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "gerekenler zincirinde döngü: %s"
@@ -2243,7 +2243,7 @@ msgid ""
 msgstr ""
 
 #: lib/formats.c:69 lib/formats.c:87 lib/formats.c:108 lib/formats.c:141
-#: lib/header.c:2139 lib/header.c:2156 lib/header.c:2176
+#: lib/header.c:2189 lib/header.c:2206 lib/header.c:2226
 msgid "(not a number)"
 msgstr "(üye deðil)"
 
@@ -2272,80 +2272,80 @@ msgid "file %s is on an unknown device"
 msgstr ""
 
 #. This should not be allowed
-#: lib/header.c:170
+#: lib/header.c:218
 msgid "grabData() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
-#: lib/header.c:201 lib/header.c:764
+#: lib/header.c:249 lib/header.c:812
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
 
-#: lib/header.c:1121
+#: lib/header.c:1171
 #, c-format
 msgid "Bad count for headerAddEntry(): %d\n"
 msgstr ""
 
-#: lib/header.c:1530
+#: lib/header.c:1580
 #, c-format
 msgid "missing { after %"
 msgstr "% den sonra eksik {"
 
-#: lib/header.c:1558
+#: lib/header.c:1608
 msgid "missing } after %{"
 msgstr "%{ den sonra eksik }"
 
-#: lib/header.c:1570
+#: lib/header.c:1620
 msgid "empty tag format"
 msgstr "boþ tag tanýmlamasý"
 
-#: lib/header.c:1580
+#: lib/header.c:1630
 msgid "empty tag name"
 msgstr "boþ tag ismi"
 
-#: lib/header.c:1595
+#: lib/header.c:1645
 msgid "unknown tag"
 msgstr "bilinmeyen tag"
 
-#: lib/header.c:1621
+#: lib/header.c:1671
 msgid "] expected at end of array"
 msgstr "dizinin sonunda ] bekleniyordu"
 
-#: lib/header.c:1637
+#: lib/header.c:1687
 msgid "unexpected ]"
 msgstr "beklenmeyen ]"
 
-#: lib/header.c:1639
+#: lib/header.c:1689
 msgid "unexpected }"
 msgstr "beklenmeyen }"
 
-#: lib/header.c:1693
+#: lib/header.c:1743
 msgid "? expected in expression"
 msgstr "dizi içerisinde ? bekleniyordu"
 
-#: lib/header.c:1700
+#: lib/header.c:1750
 #, fuzzy
 msgid "{ expected after ? in expression"
 msgstr "dizi içerisinde ? den sonra { bekleniyordu"
 
-#: lib/header.c:1710 lib/header.c:1745
+#: lib/header.c:1760 lib/header.c:1795
 msgid "} expected in expression"
 msgstr "dizi içerisinde } bekleniyordu"
 
-#: lib/header.c:1718
+#: lib/header.c:1768
 msgid ": expected following ? subexpression"
 msgstr "? altdizisinden sonra : bekleniyordu"
 
-#: lib/header.c:1732
+#: lib/header.c:1782
 #, fuzzy
 msgid "{ expected after : in expression"
 msgstr "dizide : den sonra { bekleniyordu"
 
-#: lib/header.c:1753
+#: lib/header.c:1803
 msgid "| expected at end of expression"
 msgstr "dizinin sonunda | bekleniyordu"
 
-#: lib/header.c:1922
+#: lib/header.c:1972
 msgid "(unknown type)"
 msgstr "(bilinmeyen tip)"