- split file info tag sets into rpmfi.c.

- create toy TFI_t iterators.

CVS patchset: 5179
CVS date: 2001/11/13 19:04:33

46 files changed, 3047 insertions, 3518 deletions

diff --git a/CHANGES b/CHANGES
index 076e5c55b..26db30295 100644
--- a/CHANGES
+++ b/CHANGES
@@ -58,6 +58,8 @@
 	- eliminate header reference in rpmtransAddPackage, use TFI_t data.
 	- commit to using rpmDepSet and TFI_t, not header.
 	- lclint rpmio fiddles.
+	- split file info tag sets into rpmfi.c.
+	- create toy TFI_t iterators.
 
 4.0.3 -> 4.0.4:
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 92996bdec..09576d2dd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -20,7 +20,7 @@ pkginc_HEADERS = \
 noinst_HEADERS = \
 	cpio.h depends.h fsm.h header_internal.h \
 	manifest.h psm.h \
-	rpmal.h rpmds.h rpmlead.h signature.h
+	rpmal.h rpmds.h rpmfi.h rpmlead.h signature.h
 
 mylibpaths = \
 	-L$(top_builddir)/lib/.libs \
@@ -37,8 +37,8 @@ librpm_la_SOURCES = \
 	header.c header_internal.c \
 	manifest.c misc.c package.c \
 	problems.c poptI.c poptQV.c psm.c query.c \
-	rpmal.c rpmchecksig.c rpmds.c rpminstall.c rpmlead.c rpmlibprov.c \
-	rpmrc.c rpmvercmp.c \
+	rpmal.c rpmchecksig.c rpmds.c rpmfi.c rpminstall.c \
+	rpmlead.c rpmlibprov.c rpmrc.c rpmvercmp.c \
 	signature.c stringbuf.c transaction.c \
 	verify.c
 librpm_la_LDFLAGS = -release @VERSION@
diff --git a/lib/depends.c b/lib/depends.c
index b959d0c1d..bfafe6a7b 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -1840,7 +1840,8 @@ int rpmdepCheck(rpmTransactionSet ts,
 	if (rc)
 	    goto exit;
 
-	fi = p->fi;
+	fi = tfiInit(p->fi, 0);
+
 	if (fi == NULL)
 	    continue;
 	if (fi->bnl == NULL)
@@ -1851,7 +1852,7 @@ int rpmdepCheck(rpmTransactionSet ts,
 	    continue;	/* XXX can't happen */
 
 	rc = 0;
-	for (fi->i = 0; fi->i < fi->fc; fi->i++) {
+	while (tfiNext(fi) >= 0) {
 	    int len;
 
 	    len = strlen(fi->bnl[fi->i]) + 1 +
@@ -1868,7 +1869,6 @@ int rpmdepCheck(rpmTransactionSet ts,
 	    rc = 1;
 	    /*@innerbreak@*/ break;
 	}
-
 	if (rc)
 	    goto exit;
     }
diff --git a/lib/depends.h b/lib/depends.h
index 87890b520..610e08020 100644
--- a/lib/depends.h
+++ b/lib/depends.h
@@ -9,14 +9,9 @@
 #include <header.h>
 #include <rpmhash.h>
 
-#include "rpmal.h"
-
-typedef enum rpmTransactionType_e {
-    TR_ADDED,		/*!< Package will be installed. */
-    TR_REMOVED		/*!< Package will be removed. */
-} rpmTransactionType;
-
 #include "rpmds.h"
+#include "rpmfi.h"
+#include "rpmal.h"
 
 typedef /*@abstract@*/ struct tsortInfo_s *		tsortInfo;
 
@@ -69,6 +64,13 @@ struct tsortInfo_s {
 /*@=fielduse@*/
 
 /** \ingroup rpmdep
+ */
+typedef enum rpmTransactionType_e {
+    TR_ADDED,			/*!< Package will be installed. */
+    TR_REMOVED			/*!< Package will be removed. */
+} rpmTransactionType;
+
+/** \ingroup rpmdep
  * A single package instance to be installed/removed atomically.
  */
 struct transactionElement_s {
diff --git a/lib/psm.c b/lib/psm.c
index fc00eadd9..6c68fb29f 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -75,459 +75,6 @@ int rpmVersionCompare(Header first, Header second)
     return rpmvercmp(one, two);
 }
 
-/**
- */
-static /*@observer@*/ const char *const ftstring (fileTypes ft)
-	/*@*/
-{
-    switch (ft) {
-    case XDIR:	return "directory";
-    case CDEV:	return "char dev";
-    case BDEV:	return "block dev";
-    case LINK:	return "link";
-    case SOCK:	return "sock";
-    case PIPE:	return "fifo/pipe";
-    case REG:	return "file";
-    default:	return "unknown file type";
-    }
-    /*@notreached@*/
-}
-
-fileTypes whatis(uint_16 mode)
-{
-    if (S_ISDIR(mode))	return XDIR;
-    if (S_ISCHR(mode))	return CDEV;
-    if (S_ISBLK(mode))	return BDEV;
-    if (S_ISLNK(mode))	return LINK;
-    if (S_ISSOCK(mode))	return SOCK;
-    if (S_ISFIFO(mode))	return PIPE;
-    return REG;
-}
-
-#define alloca_strdup(_s)	strcpy(alloca(strlen(_s)+1), (_s))
-
-Header relocateFileList(const rpmTransactionSet ts, TFI_t fi,
-		Header origH, fileAction * actions)
-{
-    transactionElement p = fi->te;
-    HGE_t hge = fi->hge;
-    HAE_t hae = fi->hae;
-    HME_t hme = fi->hme;
-    HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData);
-    static int _printed = 0;
-    int allowBadRelocate = (ts->ignoreSet & RPMPROB_FILTER_FORCERELOCATE);
-    rpmRelocation * relocations = NULL;
-    int numRelocations;
-    const char ** validRelocations;
-    rpmTagType validType;
-    int numValid;
-    const char ** baseNames;
-    const char ** dirNames;
-    int_32 * dirIndexes;
-    int_32 * newDirIndexes;
-    int_32 fileCount;
-    int_32 dirCount;
-    uint_32 * fFlags = NULL;
-    uint_16 * fModes = NULL;
-    char * skipDirList;
-    Header h;
-    int nrelocated = 0;
-    int fileAlloced = 0;
-    char * fn = NULL;
-    int haveRelocatedFile = 0;
-    int reldel = 0;
-    int len;
-    int i, j, xx;
-
-    if (!hge(origH, RPMTAG_PREFIXES, &validType,
-			(void **) &validRelocations, &numValid))
-	numValid = 0;
-
-    numRelocations = 0;
-    if (p->relocs)
-	while (p->relocs[numRelocations].newPath ||
-	       p->relocs[numRelocations].oldPath)
-	    numRelocations++;
-
-    /*
-     * If no relocations are specified (usually the case), then return the
-     * original header. If there are prefixes, however, then INSTPREFIXES
-     * should be added, but, since relocateFileList() can be called more
-     * than once for the same header, don't bother if already present.
-     */
-    if (p->relocs == NULL || numRelocations == 0) {
-	if (numValid) {
-	    if (!headerIsEntry(origH, RPMTAG_INSTPREFIXES))
-		xx = hae(origH, RPMTAG_INSTPREFIXES,
-			validType, validRelocations, numValid);
-	    validRelocations = hfd(validRelocations, validType);
-	}
-	/* XXX FIXME multilib file actions need to be checked. */
-	return headerLink(origH, "relocate(return)");
-    }
-
-    h = headerLink(origH, "relocate(orig)");
-
-    relocations = alloca(sizeof(*relocations) * numRelocations);
-
-    /* Build sorted relocation list from raw relocations. */
-    for (i = 0; i < numRelocations; i++) {
-	char * t;
-
-	/*
-	 * Default relocations (oldPath == NULL) are handled in the UI,
-	 * not rpmlib.
-	 */
-	if (p->relocs[i].oldPath == NULL) continue; /* XXX can't happen */
-
-	/* FIXME: Trailing /'s will confuse us greatly. Internal ones will 
-	   too, but those are more trouble to fix up. :-( */
-	t = alloca_strdup(p->relocs[i].oldPath);
-	/*@-branchstate@*/
-	relocations[i].oldPath = (t[0] == '/' && t[1] == '\0')
-	    ? t
-	    : stripTrailingChar(t, '/');
-	/*@=branchstate@*/
-
-	/* An old path w/o a new path is valid, and indicates exclusion */
-	if (p->relocs[i].newPath) {
-	    int del;
-
-	    t = alloca_strdup(p->relocs[i].newPath);
-	    /*@-branchstate@*/
-	    relocations[i].newPath = (t[0] == '/' && t[1] == '\0')
-		? t
-		: stripTrailingChar(t, '/');
-	    /*@=branchstate@*/
-
-	    /*@-nullpass@*/	/* FIX:  relocations[i].oldPath == NULL */
-	    /* Verify that the relocation's old path is in the header. */
-	    for (j = 0; j < numValid; j++) {
-		if (!strcmp(validRelocations[j], relocations[i].oldPath))
-		    /*@innerbreak@*/ break;
-	    }
-
-	    /* XXX actions check prevents problem from being appended twice. */
-	    if (j == numValid && !allowBadRelocate && actions) {
-		rpmProblemSetAppend(ts->probs, RPMPROB_BADRELOCATE,
-			p->NEVR, p->key,
-			relocations[i].oldPath, NULL, NULL, 0);
-	    }
-	    del =
-		strlen(relocations[i].newPath) - strlen(relocations[i].oldPath);
-	    /*@=nullpass@*/
-
-	    if (del > reldel)
-		reldel = del;
-	} else {
-	    relocations[i].newPath = NULL;
-	}
-    }
-
-    /* stupid bubble sort, but it's probably faster here */
-    for (i = 0; i < numRelocations; i++) {
-	int madeSwap;
-	madeSwap = 0;
-	for (j = 1; j < numRelocations; j++) {
-	    rpmRelocation tmpReloc;
-	    if (relocations[j - 1].oldPath == NULL || /* XXX can't happen */
-		relocations[j    ].oldPath == NULL || /* XXX can't happen */
-	strcmp(relocations[j - 1].oldPath, relocations[j].oldPath) <= 0)
-		/*@innercontinue@*/ continue;
-	    /*@-usereleased@*/ /* LCL: ??? */
-	    tmpReloc = relocations[j - 1];
-	    relocations[j - 1] = relocations[j];
-	    relocations[j] = tmpReloc;
-	    /*@=usereleased@*/
-	    madeSwap = 1;
-	}
-	if (!madeSwap) break;
-    }
-
-    if (!_printed) {
-	_printed = 1;
-	rpmMessage(RPMMESS_DEBUG, _("========== relocations\n"));
-	for (i = 0; i < numRelocations; i++) {
-	    if (relocations[i].oldPath == NULL) continue; /* XXX can't happen */
-	    if (relocations[i].newPath == NULL)
-		rpmMessage(RPMMESS_DEBUG, _("%5d exclude  %s\n"),
-			i, relocations[i].oldPath);
-	    else
-		rpmMessage(RPMMESS_DEBUG, _("%5d relocate %s -> %s\n"),
-			i, relocations[i].oldPath, relocations[i].newPath);
-	}
-    }
-
-    /* Add relocation values to the header */
-    if (numValid) {
-	const char ** actualRelocations;
-	int numActual;
-
-	actualRelocations = xmalloc(numValid * sizeof(*actualRelocations));
-	numActual = 0;
-	for (i = 0; i < numValid; i++) {
-	    for (j = 0; j < numRelocations; j++) {
-		if (relocations[j].oldPath == NULL || /* XXX can't happen */
-		    strcmp(validRelocations[i], relocations[j].oldPath))
-		    /*@innercontinue@*/ continue;
-		/* On install, a relocate to NULL means skip the path. */
-		if (relocations[j].newPath) {
-		    actualRelocations[numActual] = relocations[j].newPath;
-		    numActual++;
-		}
-		/*@innerbreak@*/ break;
-	    }
-	    if (j == numRelocations) {
-		actualRelocations[numActual] = validRelocations[i];
-		numActual++;
-	    }
-	}
-
-	if (numActual)
-	    xx = hae(h, RPMTAG_INSTPREFIXES, RPM_STRING_ARRAY_TYPE,
-		       (void **) actualRelocations, numActual);
-
-	actualRelocations = _free(actualRelocations);
-	validRelocations = hfd(validRelocations, validType);
-    }
-
-    xx = hge(h, RPMTAG_BASENAMES, NULL, (void **) &baseNames, &fileCount);
-    xx = hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL);
-    xx = hge(h, RPMTAG_DIRNAMES, NULL, (void **) &dirNames, &dirCount);
-    xx = hge(h, RPMTAG_FILEFLAGS, NULL, (void **) &fFlags, NULL);
-    xx = hge(h, RPMTAG_FILEMODES, NULL, (void **) &fModes, NULL);
-
-    skipDirList = alloca(dirCount * sizeof(*skipDirList));
-    memset(skipDirList, 0, dirCount * sizeof(*skipDirList));
-
-    newDirIndexes = alloca(sizeof(*newDirIndexes) * fileCount);
-    memcpy(newDirIndexes, dirIndexes, sizeof(*newDirIndexes) * fileCount);
-    dirIndexes = newDirIndexes;
-
-    /*
-     * For all relocations, we go through sorted file/relocation lists 
-     * backwards so that /usr/local relocations take precedence over /usr 
-     * ones.
-     */
-
-    /* Relocate individual paths. */
-
-    for (i = fileCount - 1; i >= 0; i--) {
-	fileTypes ft;
-	int fnlen;
-
-	/*
-	 * If only adding libraries of different arch into an already
-	 * installed package, skip all other files.
-	 */
-	if (p->multiLib && !isFileMULTILIB((fFlags[i]))) {
-	    if (actions) {
-		actions[i] = FA_SKIPMULTILIB;
-		rpmMessage(RPMMESS_DEBUG, _("excluding multilib path %s%s\n"), 
-			dirNames[dirIndexes[i]], baseNames[i]);
-	    }
-	    continue;
-	}
-
-	len = reldel +
-		strlen(dirNames[dirIndexes[i]]) + strlen(baseNames[i]) + 1;
-	/*@-branchstate@*/
-	if (len >= fileAlloced) {
-	    fileAlloced = len * 2;
-	    fn = xrealloc(fn, fileAlloced);
-	}
-	/*@=branchstate@*/
-	*fn = '\0';
-	fnlen = stpcpy( stpcpy(fn, dirNames[dirIndexes[i]]), baseNames[i]) - fn;
-
-	/*
-	 * See if this file path needs relocating.
-	 */
-	/*
-	 * XXX FIXME: Would a bsearch of the (already sorted) 
-	 * relocation list be a good idea?
-	 */
-	for (j = numRelocations - 1; j >= 0; j--) {
-	    if (relocations[j].oldPath == NULL) /* XXX can't happen */
-		/*@innercontinue@*/ continue;
-	    len = strcmp(relocations[j].oldPath, "/")
-		? strlen(relocations[j].oldPath)
-		: 0;
-
-	    if (fnlen < len)
-		/*@innercontinue@*/ continue;
-	    /*
-	     * Only subdirectories or complete file paths may be relocated. We
-	     * don't check for '\0' as our directory names all end in '/'.
-	     */
-	    if (!(fn[len] == '/' || fnlen == len))
-		/*@innercontinue@*/ continue;
-
-	    if (strncmp(relocations[j].oldPath, fn, len))
-		/*@innercontinue@*/ continue;
-	    /*@innerbreak@*/ break;
-	}
-	if (j < 0) continue;
-
-	ft = whatis(fModes[i]);
-
-	/* On install, a relocate to NULL means skip the path. */
-	if (relocations[j].newPath == NULL) {
-	    if (ft == XDIR) {
-		/* Start with the parent, looking for directory to exclude. */
-		for (j = dirIndexes[i]; j < dirCount; j++) {
-		    len = strlen(dirNames[j]) - 1;
-		    while (len > 0 && dirNames[j][len-1] == '/') len--;
-		    if (fnlen != len)
-			/*@innercontinue@*/ continue;
-		    if (strncmp(fn, dirNames[j], fnlen))
-			/*@innercontinue@*/ continue;
-		    /*@innerbreak@*/ break;
-		}
-		if (j < dirCount)
-		    skipDirList[j] = 1;
-	    }
-	    if (actions) {
-		actions[i] = FA_SKIPNSTATE;
-		rpmMessage(RPMMESS_DEBUG, _("excluding %s %s\n"),
-			ftstring(ft), fn);
-	    }
-	    continue;
-	}
-
-	/* Relocation on full paths only, please. */
-	if (fnlen != len) continue;
-
-	if (actions)
-	    rpmMessage(RPMMESS_DEBUG, _("relocating %s to %s\n"),
-		    fn, relocations[j].newPath);
-	nrelocated++;
-
-	strcpy(fn, relocations[j].newPath);
-	{   char * te = strrchr(fn, '/');
-	    if (te) {
-		if (te > fn) te++;	/* root is special */
-		fnlen = te - fn;
-	    } else
-		te = fn + strlen(fn);
-	    /*@-nullpass -nullderef@*/	/* LCL: te != NULL here. */
-	    if (strcmp(baseNames[i], te)) /* basename changed too? */
-		baseNames[i] = alloca_strdup(te);
-	    *te = '\0';			/* terminate new directory name */
-	    /*@=nullpass =nullderef@*/
-	}
-
-	/* Does this directory already exist in the directory list? */
-	for (j = 0; j < dirCount; j++) {
-	    if (fnlen != strlen(dirNames[j]))
-		/*@innercontinue@*/ continue;
-	    if (strncmp(fn, dirNames[j], fnlen))
-		/*@innercontinue@*/ continue;
-	    /*@innerbreak@*/ break;
-	}
-	
-	if (j < dirCount) {
-	    dirIndexes[i] = j;
-	    continue;
-	}
-
-	/* Creating new paths is a pita */
-	if (!haveRelocatedFile) {
-	    const char ** newDirList;
-
-	    haveRelocatedFile = 1;
-	    newDirList = xmalloc((dirCount + 1) * sizeof(*newDirList));
-	    for (j = 0; j < dirCount; j++)
-		newDirList[j] = alloca_strdup(dirNames[j]);
-	    dirNames = hfd(dirNames, RPM_STRING_ARRAY_TYPE);
-	    dirNames = newDirList;
-	} else {
-	    dirNames = xrealloc(dirNames, 
-			       sizeof(*dirNames) * (dirCount + 1));
-	}
-
-	dirNames[dirCount] = alloca_strdup(fn);
-	dirIndexes[i] = dirCount;
-	dirCount++;
-    }
-
-    /* Finish off by relocating directories. */
-    for (i = dirCount - 1; i >= 0; i--) {
-	for (j = numRelocations - 1; j >= 0; j--) {
-
-	    if (relocations[j].oldPath == NULL) /* XXX can't happen */
-		/*@innercontinue@*/ continue;
-	    len = strcmp(relocations[j].oldPath, "/")
-		? strlen(relocations[j].oldPath)
-		: 0;
-
-	    if (len && strncmp(relocations[j].oldPath, dirNames[i], len))
-		/*@innercontinue@*/ continue;
-
-	    /*
-	     * Only subdirectories or complete file paths may be relocated. We
-	     * don't check for '\0' as our directory names all end in '/'.
-	     */
-	    if (dirNames[i][len] != '/')
-		/*@innercontinue@*/ continue;
-
-	    if (relocations[j].newPath) { /* Relocate the path */
-		const char * s = relocations[j].newPath;
-		char * t = alloca(strlen(s) + strlen(dirNames[i]) - len + 1);
-
-		(void) stpcpy( stpcpy(t, s) , dirNames[i] + len);
-		if (actions)
-		    rpmMessage(RPMMESS_DEBUG,
-			_("relocating directory %s to %s\n"), dirNames[i], t);
-		dirNames[i] = t;
-		nrelocated++;
-	    }
-	}
-    }
-
-    /* Save original filenames in header and replace (relocated) filenames. */
-    if (nrelocated) {
-	int c;
-	void * d;
-	rpmTagType t;
-
-	d = NULL;
-	xx = hge(h, RPMTAG_BASENAMES, &t, &d, &c);
-	xx = hae(h, RPMTAG_ORIGBASENAMES, t, d, c);
-	d = hfd(d, t);
-
-	d = NULL;
-	xx = hge(h, RPMTAG_DIRNAMES, &t, &d, &c);
-	xx = hae(h, RPMTAG_ORIGDIRNAMES, t, d, c);
-	d = hfd(d, t);
-
-	d = NULL;
-	xx = hge(h, RPMTAG_DIRINDEXES, &t, &d, &c);
-	xx = hae(h, RPMTAG_ORIGDIRINDEXES, t, d, c);
-	d = hfd(d, t);
-
-	xx = hme(h, RPMTAG_BASENAMES, RPM_STRING_ARRAY_TYPE,
-			  baseNames, fileCount);
-	fi->bnl = hfd(fi->bnl, RPM_STRING_ARRAY_TYPE);
-	xx = hge(h, RPMTAG_BASENAMES, NULL, (void **) &fi->bnl, &fi->fc);
-
-	xx = hme(h, RPMTAG_DIRNAMES, RPM_STRING_ARRAY_TYPE,
-			  dirNames, dirCount);
-	fi->dnl = hfd(fi->dnl, RPM_STRING_ARRAY_TYPE);
-	xx = hge(h, RPMTAG_DIRNAMES, NULL, (void **) &fi->dnl, &fi->dc);
-
-	xx = hme(h, RPMTAG_DIRINDEXES, RPM_INT32_TYPE,
-			  dirIndexes, fileCount);
-	xx = hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &fi->dil, NULL);
-    }
-
-    baseNames = hfd(baseNames, RPM_STRING_ARRAY_TYPE);
-    dirNames = hfd(dirNames, RPM_STRING_ARRAY_TYPE);
-    fn = _free(fn);
-
-    return h;
-}
-
 /*@observer@*/ const char *const fiTypeString(TFI_t fi)
 {
     switch(fi->te->type) {
diff --git a/lib/psm.h b/lib/psm.h
index 9ef9cfa29..5d497cc23 100644
--- a/lib/psm.h
+++ b/lib/psm.h
@@ -8,7 +8,6 @@
 
 #include "fsm.h"
 #include "depends.h"
-#include "rpmds.h"
 
 /**
  */
@@ -101,27 +100,6 @@ extern "C" {
 #endif
 
 /**
- * Return file type from mode_t.
- * @param mode		file mode bits (from header)
- * @return		file type
- */
-fileTypes whatis(uint_16 mode)
-	/*@*/;
-
-/**
- * Relocate files in header.
- * @todo multilib file dispositions need to be checked.
- * @param ts		transaction set
- * @param fi		transaction element file info
- * @param origH		package header
- * @param actions	file dispositions
- * @return		header with relocated files
- */
-Header relocateFileList(const rpmTransactionSet ts, TFI_t fi,
-		Header origH, fileAction * actions)
-	/*@modifies ts, fi, origH, actions @*/;
-
-/**
  * Return formatted string representation of package disposition.
  * @param a		package dispostion
  * @return		formatted string
@@ -138,7 +116,8 @@ Header relocateFileList(const rpmTransactionSet ts, TFI_t fi,
 int psmStage(PSM_t psm, pkgStage stage)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem, internalState @*/
-	/*@modifies psm, rpmGlobalMacroContext, fileSystem, internalState @*/;
+	/*@modifies psm, rpmGlobalMacroContext,
+		fileSystem, internalState @*/;
 
 #ifdef __cplusplus
 }
diff --git a/lib/rpmal.c b/lib/rpmal.c
index 2fc1125fe..2987bcca2 100644
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -389,30 +389,38 @@ fprintf(stderr, "*** add %p[%d]\n", al->list, pkgNum);
     alp->provides = rpmdsLink(provides, "Provides (alAddPackage)");
     alp->fi = rpmfiLink(fi, "Files (alAddPackage)");
 
-    if (alp->fi && alp->fi->fc > 0) {
+    fi = rpmfiLink(alp->fi, "Files index (alAddPackage)");
+    if ((fi = tfiInit(fi, 0)) != NULL)
+    if (fi->bnl != NULL)	/* XXX can't happen */
+    if (fi->dil != NULL)	/* XXX can't happen */
+    if (fi->dnl != NULL)	/* XXX can't happen */
+    if (fi->fflags != NULL)	/* XXX can't happen */
+    if (fi->fc > 0) {
 	int * dirMapping;
 	dirInfo dieNeedle =
 		memset(alloca(sizeof(*dieNeedle)), 0, sizeof(*dieNeedle));
 	dirInfo die;
-	int first, last, dirNum;
+	int first, dirNum;
 	int origNumDirs;
 
 	/* XXX FIXME: We ought to relocate the directory list here */
 
-	dirMapping = alloca(sizeof(*dirMapping) * alp->fi->dc);
+	dirMapping = alloca(sizeof(*dirMapping) * fi->dc);
 
-	/* allocated enough space for all the directories we could possible
-	   need to add */
+	/*
+	 * Allocated enough space for all the directories we could possible
+	 * need to add
+	 */
 	al->dirs = xrealloc(al->dirs,
-			(al->numDirs + alp->fi->dc) * sizeof(*al->dirs));
+			(al->numDirs + fi->dc) * sizeof(*al->dirs));
 	origNumDirs = al->numDirs;
 
-	if (alp->fi->dnl != NULL)
-	for (dirNum = 0; dirNum < alp->fi->dc; dirNum++) {
+	if (fi->dnl != NULL)
+	for (dirNum = 0; dirNum < fi->dc; dirNum++) {
 	    /*@-assignexpose@*/
-	    dieNeedle->dirName = (char *) alp->fi->dnl[dirNum];
+	    dieNeedle->dirName = (char *) fi->dnl[dirNum];
 	    /*@=assignexpose@*/
-	    dieNeedle->dirNameLen = strlen(alp->fi->dnl[dirNum]);
+	    dieNeedle->dirNameLen = strlen(fi->dnl[dirNum]);
 	    die = bsearch(dieNeedle, al->dirs, origNumDirs,
 			       sizeof(*dieNeedle), dieCompare);
 	    if (die) {
@@ -420,7 +428,7 @@ fprintf(stderr, "*** add %p[%d]\n", al->list, pkgNum);
 	    } else {
 		dirMapping[dirNum] = al->numDirs;
 		die = al->dirs + al->numDirs;
-		die->dirName = xstrdup(alp->fi->dnl[dirNum]);
+		die->dirName = xstrdup(fi->dnl[dirNum]);
 		die->dirNameLen = strlen(die->dirName);
 		die->files = NULL;
 		die->numFiles = 0;
@@ -428,48 +436,44 @@ fprintf(stderr, "*** add %p[%d]\n", al->list, pkgNum);
 	    }
 	}
 
-	last = 0;
-	for (first = 0; first < alp->fi->fc; first = last + 1) {
+	for (first = tfiNext(fi); first >= 0;) {
 	    fileIndexEntry fie;
+	    int next;
 
-	    if (alp->fi->dil == NULL)	/* XXX can't happen */
-		continue;
-
-	    for (last = first; (last + 1) < alp->fi->fc; last++) {
-		if (alp->fi->dil[first] != alp->fi->dil[last + 1])
+	    /* Find the first file of the next directory. */
+	    while ((next = tfiNext(fi)) >= 0) {
+		if (fi->dil[first] != fi->dil[next])
 		    /*@innerbreak@*/ break;
 	    }
+	    if (next < 0) next = fi->fc;	/* XXX reset end-of-list */
 
-	    die = al->dirs + dirMapping[alp->fi->dil[first]];
+	    die = al->dirs + dirMapping[fi->dil[first]];
 	    die->files = xrealloc(die->files,
-		    (die->numFiles + last - first + 1) *
-			sizeof(*die->files));
-
+			(die->numFiles + next - first) * sizeof(*die->files));
 	    fie = die->files + die->numFiles;
-	    for (alp->fi->i = first; alp->fi->i <= last; alp->fi->i++) {
-		if (alp->fi->bnl == NULL)	/* XXX can't happen */
-		    /*@innercontinue@*/ continue;
-		if (alp->fi->fflags == NULL)	/* XXX can't happen */
-		    /*@innercontinue@*/ continue;
+
+	    /* Rewind to first file, generate file index entry for each file. */
+	    fi = tfiInit(fi, first);
+	    if (fi != NULL)
+	    while ((first = tfiNext(fi)) >= 0 && first < next) {
 		/*@-assignexpose@*/
-		fie->baseName = alp->fi->bnl[alp->fi->i];
-		fie->baseNameLen = strlen(alp->fi->bnl[alp->fi->i]);
+		fie->baseName = fi->bnl[fi->i];
+		fie->baseNameLen = strlen(fi->bnl[fi->i]);
 		/*@=assignexpose@*/
 		fie->pkgNum = pkgNum;
-		fie->fileFlags = alp->fi->fflags[alp->fi->i];
+		fie->fileFlags = fi->fflags[fi->i];
 		die->numFiles++;
 		fie++;
 	    }
 	    qsort(die->files, die->numFiles, sizeof(*die->files), fieCompare);
 	}
 
-	/* XXX should we realloc al->dirs to actual size? */
-
-	/* If any directories were added, resort the directory list. */
+	/* Resize the directory list. If any directories were added, resort. */
+	al->dirs = xrealloc(al->dirs, al->numDirs * sizeof(*al->dirs));
 	if (origNumDirs != al->numDirs)
 	    qsort(al->dirs, al->numDirs, sizeof(*al->dirs), dieCompare);
-
     }
+    fi = rpmfiUnlink(fi, "Files index (alAddPackage)");
 
     alFreeIndex(al);
 
@@ -688,9 +692,10 @@ alAllSatisfiesDepend(const availableList al, const rpmDepSet ds, alKey * keyp)
 		memset(alloca(sizeof(*needle)), 0, sizeof(*needle));
     availableIndexEntry match;
     fnpyKey * ret = NULL;
+    int found = 0;
     const char * KName;
     availablePackage alp;
-    int rc, found;
+    int rc;
 
     if (keyp) *keyp = RPMAL_NOMATCH;
     if ((KName = dsiGetN(ds)) == NULL)
diff --git a/lib/rpmds.c b/lib/rpmds.c
index 57845e00d..d04a9da75 100644
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -3,22 +3,12 @@
  */
 #include "system.h"
 
-#ifdef	DYING
 #include <rpmlib.h>
 #include "rpmds.h"
-#else
-#include "psm.h"		/* XXX rpmTransactionType */
-#endif
 
 #include "debug.h"
 
-/*@access alKey@*/
-
-/*@access TFI_t @*/
-/*@access transactionElement @*/
-
-/*@unchecked@*/
-static int _fi_debug = 0;
+/*@access rpmDepSet @*/
 
 /**
  * Enable noisy range comparison debugging message?
@@ -26,253 +16,6 @@ static int _fi_debug = 0;
 /*@unchecked@*/
 static int _noisy_range_comparison_debug_message = 0;
 
-TFI_t XrpmfiUnlink(TFI_t fi, const char * msg, const char * fn, unsigned ln)
-{
-    if (fi == NULL) return NULL;
-/*@-modfilesystem@*/
-if (_fi_debug && msg != NULL)
-fprintf(stderr, "--> fi %p -- %d %s at %s:%u\n", fi, fi->nrefs, msg, fn, ln);
-/*@=modfilesystem@*/
-    fi->nrefs--;
-    return NULL;
-}
-
-TFI_t XrpmfiLink(TFI_t fi, const char * msg, const char * fn, unsigned ln)
-{
-    if (fi == NULL) return NULL;
-    fi->nrefs++;
-/*@-modfilesystem@*/
-if (_fi_debug && msg != NULL)
-fprintf(stderr, "--> fi %p ++ %d %s at %s:%u\n", fi, fi->nrefs, msg, fn, ln);
-/*@=modfilesystem@*/
-    /*@-refcounttrans@*/ return fi; /*@=refcounttrans@*/
-}
-
-fnpyKey rpmfiGetKey(TFI_t fi)
-{
-    return fi->te->key;
-}
-
-TFI_t fiFree(TFI_t fi, int freefimem)
-{
-    HFD_t hfd = headerFreeData;
-
-    if (fi == NULL) return NULL;
-
-    if (fi->nrefs > 1)
-	return rpmfiUnlink(fi, fi->Type);
-
-/*@-modfilesystem@*/
-if (_fi_debug < 0)
-fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, fi->Type, fi->fc);
-/*@=modfilesystem@*/
-
-    /*@-branchstate@*/
-    if (fi->fc > 0) {
-	fi->bnl = hfd(fi->bnl, -1);
-	fi->dnl = hfd(fi->dnl, -1);
-
-	fi->flinks = hfd(fi->flinks, -1);
-	fi->flangs = hfd(fi->flangs, -1);
-	fi->fmd5s = hfd(fi->fmd5s, -1);
-
-	fi->fuser = hfd(fi->fuser, -1);
-	fi->fuids = _free(fi->fuids);
-	fi->fgroup = hfd(fi->fgroup, -1);
-	fi->fgids = _free(fi->fgids);
-
-	fi->fstates = _free(fi->fstates);
-
-	/*@-evalorder@*/
-	if (!fi->keep_header && fi->h == NULL) {
-	    fi->fmtimes = _free(fi->fmtimes);
-	    fi->fmodes = _free(fi->fmodes);
-	    fi->fflags = _free(fi->fflags);
-	    fi->fsizes = _free(fi->fsizes);
-	    fi->frdevs = _free(fi->frdevs);
-	    fi->dil = _free(fi->dil);
-	}
-	/*@=evalorder@*/
-    }
-    /*@=branchstate@*/
-
-    fi->fsm = freeFSM(fi->fsm);
-
-    fi->apath = _free(fi->apath);
-    fi->fmapflags = _free(fi->fmapflags);
-
-    fi->obnl = hfd(fi->obnl, -1);
-    fi->odnl = hfd(fi->odnl, -1);
-
-    fi->actions = _free(fi->actions);
-    fi->replacedSizes = _free(fi->replacedSizes);
-    fi->replaced = _free(fi->replaced);
-
-    fi->h = headerFree(fi->h, fi->Type);
-
-    /*@-nullstate -refcounttrans -usereleased@*/
-    (void) rpmfiUnlink(fi, fi->Type);
-    /*@-branchstate@*/
-    if (freefimem) {
-	memset(fi, 0, sizeof(*fi));		/* XXX trash and burn */
-	fi = _free(fi);
-    }
-    /*@=branchstate@*/
-    /*@=nullstate =refcounttrans =usereleased@*/
-
-    return NULL;
-}
-
-#define	_fdupe(_fi, _data)	\
-    if ((_fi)->_data != NULL)	\
-	(_fi)->_data = memcpy(xmalloc((_fi)->fc * sizeof(*(_fi)->_data)), \
-			(_fi)->_data, (_fi)->fc * sizeof(*(_fi)->_data))
-
-TFI_t fiNew(rpmTransactionSet ts, TFI_t fi,
-		Header h, rpmTag tagN, int scareMem)
-{
-    HGE_t hge =
-	(scareMem ? (HGE_t) headerGetEntryMinMemory : (HGE_t) headerGetEntry);
-    const char * Type;
-    uint_32 * uip;
-    int malloced = 0;
-    int len;
-    int xx;
-    int i;
-
-    if (tagN == RPMTAG_BASENAMES) {
-	Type = "Files";
-    } else {
-	Type = "?Type?";
-	goto exit;
-    }
-
-    /*@-branchstate@*/
-    if (fi == NULL) {
-	fi = xcalloc(1, sizeof(*fi));
-	malloced = 0;	/* XXX always return with memory alloced. */
-    }
-    /*@=branchstate@*/
-
-    fi->magic = TFIMAGIC;
-    fi->Type = Type;
-    fi->i = -1;
-    fi->tagN = tagN;
-
-    fi->hge = hge;
-    fi->hae = (HAE_t) headerAddEntry;
-    fi->hme = (HME_t) headerModifyEntry;
-    fi->hre = (HRE_t) headerRemoveEntry;
-    fi->hfd = headerFreeData;
-
-    fi->h = (scareMem ? headerLink(h, fi->Type) : NULL);
-
-    if (fi->fsm == NULL)
-	fi->fsm = newFSM();
-
-    /* 0 means unknown */
-    xx = hge(h, RPMTAG_ARCHIVESIZE, NULL, (void **) &uip, NULL);
-    fi->archiveSize = (xx ? *uip : 0);
-
-    if (!hge(h, RPMTAG_BASENAMES, NULL, (void **) &fi->bnl, &fi->fc)) {
-	/*@-branchstate@*/
-	if (malloced) {
-	    if (scareMem && fi->h)
-		fi->h = headerFree(fi->h, fi->Type);
-	    fi->fsm = freeFSM(fi->fsm);
-	    /*@-refcounttrans@*/
-	    fi = _free(fi);
-	    /*@=refcounttrans@*/
-	} else {
-	    fi->fc = 0;
-	    fi->dc = 0;
-	}
-	/*@=branchstate@*/
-	goto exit;
-    }
-    xx = hge(h, RPMTAG_DIRNAMES, NULL, (void **) &fi->dnl, &fi->dc);
-    xx = hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &fi->dil, NULL);
-    xx = hge(h, RPMTAG_FILEMODES, NULL, (void **) &fi->fmodes, NULL);
-    xx = hge(h, RPMTAG_FILEFLAGS, NULL, (void **) &fi->fflags, NULL);
-    xx = hge(h, RPMTAG_FILESIZES, NULL, (void **) &fi->fsizes, NULL);
-    xx = hge(h, RPMTAG_FILESTATES, NULL, (void **) &fi->fstates, NULL);
-    if (xx == 0 || fi->fstates == NULL)
-	fi->fstates = xcalloc(fi->fc, sizeof(*fi->fstates));
-    else if (!scareMem)
-	_fdupe(fi, fstates);
-
-    fi->action = FA_UNKNOWN;
-    fi->flags = 0;
-    if (fi->actions == NULL)
-	fi->actions = xcalloc(fi->fc, sizeof(*fi->actions));
-    fi->keep_header = (scareMem ? 1 : 0);
-
-    /* XXX TR_REMOVED needs CPIO_MAP_{ABSOLUTE,ADDDOT} CPIO_ALL_HARDLINKS */
-    fi->mapflags =
-		CPIO_MAP_PATH | CPIO_MAP_MODE | CPIO_MAP_UID | CPIO_MAP_GID;
-
-    xx = hge(h, RPMTAG_FILELINKTOS, NULL, (void **) &fi->flinks, NULL);
-    xx = hge(h, RPMTAG_FILELANGS, NULL, (void **) &fi->flangs, NULL);
-
-    xx = hge(h, RPMTAG_FILEMD5S, NULL, (void **) &fi->fmd5s, NULL);
-
-    /* XXX TR_REMOVED doesn;t need fmtimes or frdevs */
-    xx = hge(h, RPMTAG_FILEMTIMES, NULL, (void **) &fi->fmtimes, NULL);
-    xx = hge(h, RPMTAG_FILERDEVS, NULL, (void **) &fi->frdevs, NULL);
-    fi->replacedSizes = xcalloc(fi->fc, sizeof(*fi->replacedSizes));
-
-    xx = hge(h, RPMTAG_FILEUSERNAME, NULL, (void **) &fi->fuser, NULL);
-    fi->fuids = NULL;
-    xx = hge(h, RPMTAG_FILEGROUPNAME, NULL, (void **) &fi->fgroup, NULL);
-    fi->fgids = NULL;
-
-    if (ts != NULL)
-    if (fi != NULL)
-    if (fi->te != NULL && fi->te->type == TR_ADDED) {
-	Header foo;
-	fi->actions = xcalloc(fi->fc, sizeof(*fi->actions));
-	foo = relocateFileList(ts, fi, h, fi->actions);
-	fi->h = headerFree(fi->h, "fiNew fi->h");
-	fi->h = headerLink(foo, "fiNew fi->h = foo");
-	foo = headerFree(foo, "fiNew foo");
-    }
-
-    if (!scareMem) {
-	_fdupe(fi, fmtimes);
-	_fdupe(fi, frdevs);
-	_fdupe(fi, fsizes);
-	_fdupe(fi, fflags);
-	_fdupe(fi, fmodes);
-	_fdupe(fi, dil);
-	fi->h = headerFree(fi->h, fi->Type);
-    }
-
-    fi->dnlmax = -1;
-    for (i = 0; i < fi->dc; i++) {
-	if ((len = strlen(fi->dnl[i])) > fi->dnlmax)
-	    fi->dnlmax = len;
-    }
-    fi->bnlmax = -1;
-    for (i = 0; i < fi->fc; i++) {
-	if ((len = strlen(fi->bnl[i])) > fi->bnlmax)
-	    fi->bnlmax = len;
-    }
-    fi->dperms = 0755;
-    fi->fperms = 0644;
-
-exit:
-/*@-modfilesystem@*/
-if (_fi_debug < 0)
-fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, Type, (fi ? fi->fc : 0));
-/*@=modfilesystem@*/
-
-    /*@-nullstate@*/ /* FIX: TFI null annotations */
-    return rpmfiLink(fi, (fi ? fi->Type : NULL));
-    /*@=nullstate@*/
-}
-
-/*@access rpmDepSet @*/
-
 /*@unchecked@*/
 static int _ds_debug = 0;
 
@@ -291,10 +34,12 @@ rpmDepSet XrpmdsLink(rpmDepSet ds, const char * msg, const char * fn, unsigned l
 {
     if (ds == NULL) return NULL;
     ds->nrefs++;
+
 /*@-modfilesystem@*/
 if (_ds_debug && msg != NULL)
 fprintf(stderr, "--> ds %p ++ %d %s at %s:%u\n", ds, ds->nrefs, msg, fn, ln);
 /*@=modfilesystem@*/
+
     /*@-refcounttrans@*/ return ds; /*@=refcounttrans@*/
 }
 
diff --git a/lib/rpmds.h b/lib/rpmds.h
index 8b0cb02ac..eb01fe628 100644
--- a/lib/rpmds.h
+++ b/lib/rpmds.h
@@ -3,127 +3,10 @@
 
 /** \ingroup rpmdep rpmtrans
  * \file lib/rpmds.h
- * Structure used for handling a dependency set.
+ * Structure(s) used for dependency tag sets.
  */
 
 /**
- */
-typedef struct sharedFileInfo_s *		sharedFileInfo;
-
-/**
- */
-struct sharedFileInfo_s {
-    int pkgFileNum;
-    int otherFileNum;
-    int otherPkg;
-    int isRemoved;
-};
-
-/**
- * A package filename set.
- */
-struct TFI_s {
-    int i;			/*!< File index. */
-
-/*@observer@*/
-    const char * Type;		/*!< Tag name. */
-
-    rpmTag tagN;		/*!< Header tag. */
-/*@refcounted@*/ /*@null@*/
-    Header h;			/*!< Header for file set (or NULL) */
-
-/*@only@*/ /*?null?*/
-    const char ** bnl;		/*!< Base name(s) (from header) */
-/*@only@*/ /*?null?*/
-    const char ** dnl;		/*!< Directory name(s) (from header) */
-
-/*@only@*/ /*?null?*/
-    const char ** fmd5s;	/*!< File MD5 sum(s) (from header) */
-/*@only@*/ /*?null?*/
-    const char ** flinks;	/*!< File link(s) (from header) */
-/*@only@*/ /*?null?*/
-    const char ** flangs;	/*!< File lang(s) */
-
-/*@only@*/ /*?null?*/
-          uint_32 * dil;	/*!< Directory indice(s) (from header) */
-/*@only@*/ /*?null?*/
-    const uint_32 * fflags;	/*!< File flag(s) (from header) */
-/*@only@*/ /*?null?*/
-    const uint_32 * fsizes;	/*!< File size(s) (from header) */
-/*@only@*/ /*?null?*/
-    const uint_32 * fmtimes;	/*!< File modification time(s) (from header) */
-/*@only@*/ /*?null?*/
-          uint_16 * fmodes;	/*!< File mode(s) (from header) */
-/*@only@*/ /*?null?*/
-    const uint_16 * frdevs;	/*!< File rdev(s) (from header) */
-
-/*@only@*/ /*@null@*/
-    const char ** fuser;	/*!< File owner(s) */
-/*@only@*/ /*@null@*/
-    const char ** fgroup;	/*!< File group(s) */
-/*@only@*/ /*@null@*/
-    uid_t * fuids;		/*!< File uid(s) */
-/*@only@*/ /*@null@*/
-    gid_t * fgids;		/*!< File gid(s) */
-
-/*@only@*/ /*@null@*/
-    char * fstates;		/*!< File state(s) (from header) */
-
-    int_32 dc;			/*!< No. of directories. */
-    int_32 fc;			/*!< No. of files. */
-
-/*=============================*/
-/*@dependent@*/
-    transactionElement te;
-
-    HGE_t hge;			/*!< Vector to headerGetEntry() */
-    HAE_t hae;			/*!< Vector to headerAddEntry() */
-    HME_t hme;			/*!< Vector to headerModifyEntry() */
-    HRE_t hre;			/*!< Vector to headerRemoveEntry() */
-    HFD_t hfd;			/*!< Vector to headerFreeData() */
-/*-----------------------------*/
-    uid_t uid;			/*!< File uid (default). */
-    gid_t gid;			/*!< File gid (default). */
-    uint_32 flags;		/*!< File flags (default). */
-    fileAction action;		/*!< File disposition (default). */
-/*@owned@*/
-    fileAction * actions;	/*!< File disposition(s). */
-/*@owned@*/
-    struct fingerPrint_s * fps;	/*!< File fingerprint(s). */
-/*@owned@*/
-    const char ** obnl;		/*!< Original basename(s) (from header) */
-/*@owned@*/
-    const char ** odnl;		/*!< Original dirname(s) (from header) */
-/*@unused@*/
-    int_32 * odil;		/*!< Original dirindex(s) (from header) */
-    int bnlmax;			/*!< Length (in bytes) of longest basename. */
-    int dnlmax;			/*!< Length (in bytes) of longest dirname. */
-    int astriplen;
-    int striplen;
-    unsigned int archiveSize;
-    mode_t dperms;		/*!< Directory perms (0755) if not mapped. */
-    mode_t fperms;		/*!< File perms (0644) if not mapped. */
-/*@only@*/ /*@null@*/
-    const char ** apath;
-    int mapflags;
-/*@owned@*/ /*@null@*/
-    int * fmapflags;
-/*@owned@*/
-    FSM_t fsm;			/*!< File state machine data. */
-    int keep_header;		/*!< Keep header? */
-/*@owned@*/
-    sharedFileInfo replaced;	/*!< (TR_ADDED) */
-/*@owned@*/
-    uint_32 * replacedSizes;	/*!< (TR_ADDED) */
-    unsigned int record;	/*!< (TR_REMOVED) */
-    int magic;
-#define	TFIMAGIC	0x09697923
-/*=============================*/
-
-/*@refs@*/ int nrefs;		/*!< Reference count. */
-};
-
-/**
  * A package dependency set.
  */
 struct rpmDepSet_s {
@@ -154,73 +37,6 @@ extern "C" {
 #endif
 
 /**
- * Unreference a file info set instance.
- * @param fi		file info set
- * @return		NULL always
- */
-/*@unused@*/ /*@null@*/
-TFI_t rpmfiUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ TFI_t fi,
-		/*@null@*/ const char * msg)
-	/*@modifies fi @*/;
-
-/** @todo Remove debugging entry from the ABI. */
-/*@-exportlocal@*/
-/*@null@*/
-TFI_t XrpmfiUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ TFI_t fi,
-		/*@null@*/ const char * msg, const char * fn, unsigned ln)
-	/*@modifies fi @*/;
-/*@=exportlocal@*/
-#define	rpmfiUnlink(_fi, _msg) XrpmfiUnlink(_fi, _msg, __FILE__, __LINE__)
-
-/**
- * Reference a file info set instance.
- * @param fi		file info set
- * @return		new file info set reference
- */
-/*@unused@*/
-TFI_t rpmfiLink (/*@null@*/ TFI_t fi, /*@null@*/ const char * msg)
-	/*@modifies fi @*/;
-
-/** @todo Remove debugging entry from the ABI. */
-TFI_t XrpmfiLink (/*@null@*/ TFI_t fi, /*@null@*/ const char * msg,
-		const char * fn, unsigned ln)
-        /*@modifies fi @*/;
-#define	rpmfiLink(_fi, _msg)	XrpmfiLink(_fi, _msg, __FILE__, __LINE__)
-
-/**
- * Retrieve key from transaction element file info
- * @param fi		transaction element file info
- * @return		transaction element file info key
- */
-/*@exposed@*/ /*@dependent@*/ /*@null@*/
-fnpyKey rpmfiGetKey(TFI_t fi)
-	/*@*/;
-
-/**
- * Destroy a file set.
- * @param fi		file set
- * @param freefimem	free fi memory too?
- * @return		NULL always
- */
-/*@null@*/
-TFI_t fiFree(/*@killref@*/ /*@only@*/ /*@null@*/ TFI_t fi, int freefimem)
-	/*@modifies fi@*/;
-
-/**
- * Create and load a file set.
- * @param ts		transaction set
- * @param fi		file set (NULL if creating)
- * @param h		header
- * @param tagN		RPMTAG_BASENAMES
- * @param scareMem	Use pointers to refcounted header memory?
- * @return		new file set
- */
-/*@null@*/
-TFI_t fiNew(rpmTransactionSet ts, /*@null@*/ TFI_t fi,
-		Header h, rpmTag tagN, int scareMem)
-	/*@modifies ts, fi, h @*/;
-
-/**
  * Unreference a dependency set instance.
  * @param ds		dependency set
  * @return		NULL always
diff --git a/lib/rpmfi.c b/lib/rpmfi.c
new file mode 100644
index 000000000..000795d62
--- /dev/null
+++ b/lib/rpmfi.c
@@ -0,0 +1,770 @@
+/** \ingroup rpmdep
+ * \file lib/rpmfi.c
+ * Routines to handle file info tag sets.
+ */
+
+#include "system.h"
+
+#include "fsm.h"	/* XXX newFSM and CPIO_MAP_* */
+
+#include "depends.h"
+#include "misc.h"	/* XXX stripTrailingChar */
+
+#include "debug.h"
+
+/*@access TFI_t @*/
+/*@access transactionElement @*/
+/*@access rpmTransactionSet @*/	/* XXX for ts->ignoreSet and ts->probs */
+
+/*@unchecked@*/
+static int _fi_debug = 0;
+
+TFI_t XrpmfiUnlink(TFI_t fi, const char * msg, const char * fn, unsigned ln)
+{
+    if (fi == NULL) return NULL;
+/*@-modfilesystem@*/
+if (_fi_debug && msg != NULL)
+fprintf(stderr, "--> fi %p -- %d %s at %s:%u\n", fi, fi->nrefs, msg, fn, ln);
+/*@=modfilesystem@*/
+    fi->nrefs--;
+    return NULL;
+}
+
+TFI_t XrpmfiLink(TFI_t fi, const char * msg, const char * fn, unsigned ln)
+{
+    if (fi == NULL) return NULL;
+    fi->nrefs++;
+/*@-modfilesystem@*/
+if (_fi_debug && msg != NULL)
+fprintf(stderr, "--> fi %p ++ %d %s at %s:%u\n", fi, fi->nrefs, msg, fn, ln);
+/*@=modfilesystem@*/
+    /*@-refcounttrans@*/ return fi; /*@=refcounttrans@*/
+}
+
+fnpyKey rpmfiGetKey(TFI_t fi)
+{
+    return fi->te->key;
+}
+
+
+int tfiNext(/*@null@*/ TFI_t fi)
+	/*@modifies fi @*/
+{
+    int i = -1;
+
+    if (fi != NULL && ++fi->i >= 0) {
+	if (fi->i < fi->fc)
+	    i = fi->i;
+	else
+	    fi->i = -1;
+
+/*@-modfilesystem @*/
+if (_fi_debug  < 0 && i != -1)
+fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, (fi->Type ? fi->Type : "?Type?"), i);
+/*@=modfilesystem @*/
+
+    }
+
+    return i;
+}
+
+TFI_t tfiInit(/*@returned@*/ /*@null@*/ TFI_t fi, int ix)
+	/*@modifies fi @*/
+{
+    if (fi != NULL) {
+	if (ix >= 0 && ix < fi->fc)
+	    fi->i = ix - 1;
+	else
+	    fi = NULL;
+    }
+
+    /*@-refcounttrans@*/
+    return fi;
+    /*@=refcounttrans@*/
+}
+
+/**
+ * Identify a file type.
+ * @param ft		file type
+ * @return		string to identify a file type
+ */
+static /*@observer@*/
+const char *const ftstring (fileTypes ft)
+	/*@*/
+{
+    switch (ft) {
+    case XDIR:	return "directory";
+    case CDEV:	return "char dev";
+    case BDEV:	return "block dev";
+    case LINK:	return "link";
+    case SOCK:	return "sock";
+    case PIPE:	return "fifo/pipe";
+    case REG:	return "file";
+    default:	return "unknown file type";
+    }
+    /*@notreached@*/
+}
+
+fileTypes whatis(uint_16 mode)
+{
+    if (S_ISDIR(mode))	return XDIR;
+    if (S_ISCHR(mode))	return CDEV;
+    if (S_ISBLK(mode))	return BDEV;
+    if (S_ISLNK(mode))	return LINK;
+    if (S_ISSOCK(mode))	return SOCK;
+    if (S_ISFIFO(mode))	return PIPE;
+    return REG;
+}
+
+#define alloca_strdup(_s)	strcpy(alloca(strlen(_s)+1), (_s))
+
+/**
+ * Relocate files in header.
+ * @todo multilib file dispositions need to be checked.
+ * @param ts		transaction set
+ * @param fi		transaction element file info
+ * @param origH		package header
+ * @param actions	file dispositions
+ * @return		header with relocated files
+ */
+static
+Header relocateFileList(const rpmTransactionSet ts, TFI_t fi,
+		Header origH, fileAction * actions)
+	/*@modifies ts, fi, origH, actions @*/
+{
+    transactionElement p = fi->te;
+    HGE_t hge = fi->hge;
+    HAE_t hae = fi->hae;
+    HME_t hme = fi->hme;
+    HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData);
+    static int _printed = 0;
+    int allowBadRelocate = (ts->ignoreSet & RPMPROB_FILTER_FORCERELOCATE);
+    rpmRelocation * relocations = NULL;
+    int numRelocations;
+    const char ** validRelocations;
+    rpmTagType validType;
+    int numValid;
+    const char ** baseNames;
+    const char ** dirNames;
+    int_32 * dirIndexes;
+    int_32 * newDirIndexes;
+    int_32 fileCount;
+    int_32 dirCount;
+    uint_32 * fFlags = NULL;
+    uint_16 * fModes = NULL;
+    char * skipDirList;
+    Header h;
+    int nrelocated = 0;
+    int fileAlloced = 0;
+    char * fn = NULL;
+    int haveRelocatedFile = 0;
+    int reldel = 0;
+    int len;
+    int i, j, xx;
+
+    if (!hge(origH, RPMTAG_PREFIXES, &validType,
+			(void **) &validRelocations, &numValid))
+	numValid = 0;
+
+    numRelocations = 0;
+    if (p->relocs)
+	while (p->relocs[numRelocations].newPath ||
+	       p->relocs[numRelocations].oldPath)
+	    numRelocations++;
+
+    /*
+     * If no relocations are specified (usually the case), then return the
+     * original header. If there are prefixes, however, then INSTPREFIXES
+     * should be added, but, since relocateFileList() can be called more
+     * than once for the same header, don't bother if already present.
+     */
+    if (p->relocs == NULL || numRelocations == 0) {
+	if (numValid) {
+	    if (!headerIsEntry(origH, RPMTAG_INSTPREFIXES))
+		xx = hae(origH, RPMTAG_INSTPREFIXES,
+			validType, validRelocations, numValid);
+	    validRelocations = hfd(validRelocations, validType);
+	}
+	/* XXX FIXME multilib file actions need to be checked. */
+	return headerLink(origH, "relocate(return)");
+    }
+
+    h = headerLink(origH, "relocate(orig)");
+
+    relocations = alloca(sizeof(*relocations) * numRelocations);
+
+    /* Build sorted relocation list from raw relocations. */
+    for (i = 0; i < numRelocations; i++) {
+	char * t;
+
+	/*
+	 * Default relocations (oldPath == NULL) are handled in the UI,
+	 * not rpmlib.
+	 */
+	if (p->relocs[i].oldPath == NULL) continue; /* XXX can't happen */
+
+	/* FIXME: Trailing /'s will confuse us greatly. Internal ones will 
+	   too, but those are more trouble to fix up. :-( */
+	t = alloca_strdup(p->relocs[i].oldPath);
+	/*@-branchstate@*/
+	relocations[i].oldPath = (t[0] == '/' && t[1] == '\0')
+	    ? t
+	    : stripTrailingChar(t, '/');
+	/*@=branchstate@*/
+
+	/* An old path w/o a new path is valid, and indicates exclusion */
+	if (p->relocs[i].newPath) {
+	    int del;
+
+	    t = alloca_strdup(p->relocs[i].newPath);
+	    /*@-branchstate@*/
+	    relocations[i].newPath = (t[0] == '/' && t[1] == '\0')
+		? t
+		: stripTrailingChar(t, '/');
+	    /*@=branchstate@*/
+
+	    /*@-nullpass@*/	/* FIX:  relocations[i].oldPath == NULL */
+	    /* Verify that the relocation's old path is in the header. */
+	    for (j = 0; j < numValid; j++) {
+		if (!strcmp(validRelocations[j], relocations[i].oldPath))
+		    /*@innerbreak@*/ break;
+	    }
+
+	    /* XXX actions check prevents problem from being appended twice. */
+	    if (j == numValid && !allowBadRelocate && actions) {
+		rpmProblemSetAppend(ts->probs, RPMPROB_BADRELOCATE,
+			p->NEVR, p->key,
+			relocations[i].oldPath, NULL, NULL, 0);
+	    }
+	    del =
+		strlen(relocations[i].newPath) - strlen(relocations[i].oldPath);
+	    /*@=nullpass@*/
+
+	    if (del > reldel)
+		reldel = del;
+	} else {
+	    relocations[i].newPath = NULL;
+	}
+    }
+
+    /* stupid bubble sort, but it's probably faster here */
+    for (i = 0; i < numRelocations; i++) {
+	int madeSwap;
+	madeSwap = 0;
+	for (j = 1; j < numRelocations; j++) {
+	    rpmRelocation tmpReloc;
+	    if (relocations[j - 1].oldPath == NULL || /* XXX can't happen */
+		relocations[j    ].oldPath == NULL || /* XXX can't happen */
+	strcmp(relocations[j - 1].oldPath, relocations[j].oldPath) <= 0)
+		/*@innercontinue@*/ continue;
+	    /*@-usereleased@*/ /* LCL: ??? */
+	    tmpReloc = relocations[j - 1];
+	    relocations[j - 1] = relocations[j];
+	    relocations[j] = tmpReloc;
+	    /*@=usereleased@*/
+	    madeSwap = 1;
+	}
+	if (!madeSwap) break;
+    }
+
+    if (!_printed) {
+	_printed = 1;
+	rpmMessage(RPMMESS_DEBUG, _("========== relocations\n"));
+	for (i = 0; i < numRelocations; i++) {
+	    if (relocations[i].oldPath == NULL) continue; /* XXX can't happen */
+	    if (relocations[i].newPath == NULL)
+		rpmMessage(RPMMESS_DEBUG, _("%5d exclude  %s\n"),
+			i, relocations[i].oldPath);
+	    else
+		rpmMessage(RPMMESS_DEBUG, _("%5d relocate %s -> %s\n"),
+			i, relocations[i].oldPath, relocations[i].newPath);
+	}
+    }
+
+    /* Add relocation values to the header */
+    if (numValid) {
+	const char ** actualRelocations;
+	int numActual;
+
+	actualRelocations = xmalloc(numValid * sizeof(*actualRelocations));
+	numActual = 0;
+	for (i = 0; i < numValid; i++) {
+	    for (j = 0; j < numRelocations; j++) {
+		if (relocations[j].oldPath == NULL || /* XXX can't happen */
+		    strcmp(validRelocations[i], relocations[j].oldPath))
+		    /*@innercontinue@*/ continue;
+		/* On install, a relocate to NULL means skip the path. */
+		if (relocations[j].newPath) {
+		    actualRelocations[numActual] = relocations[j].newPath;
+		    numActual++;
+		}
+		/*@innerbreak@*/ break;
+	    }
+	    if (j == numRelocations) {
+		actualRelocations[numActual] = validRelocations[i];
+		numActual++;
+	    }
+	}
+
+	if (numActual)
+	    xx = hae(h, RPMTAG_INSTPREFIXES, RPM_STRING_ARRAY_TYPE,
+		       (void **) actualRelocations, numActual);
+
+	actualRelocations = _free(actualRelocations);
+	validRelocations = hfd(validRelocations, validType);
+    }
+
+    xx = hge(h, RPMTAG_BASENAMES, NULL, (void **) &baseNames, &fileCount);
+    xx = hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL);
+    xx = hge(h, RPMTAG_DIRNAMES, NULL, (void **) &dirNames, &dirCount);
+    xx = hge(h, RPMTAG_FILEFLAGS, NULL, (void **) &fFlags, NULL);
+    xx = hge(h, RPMTAG_FILEMODES, NULL, (void **) &fModes, NULL);
+
+    skipDirList = alloca(dirCount * sizeof(*skipDirList));
+    memset(skipDirList, 0, dirCount * sizeof(*skipDirList));
+
+    newDirIndexes = alloca(sizeof(*newDirIndexes) * fileCount);
+    memcpy(newDirIndexes, dirIndexes, sizeof(*newDirIndexes) * fileCount);
+    dirIndexes = newDirIndexes;
+
+    /*
+     * For all relocations, we go through sorted file/relocation lists 
+     * backwards so that /usr/local relocations take precedence over /usr 
+     * ones.
+     */
+
+    /* Relocate individual paths. */
+
+    for (i = fileCount - 1; i >= 0; i--) {
+	fileTypes ft;
+	int fnlen;
+
+	/*
+	 * If only adding libraries of different arch into an already
+	 * installed package, skip all other files.
+	 */
+	if (p->multiLib && !isFileMULTILIB((fFlags[i]))) {
+	    if (actions) {
+		actions[i] = FA_SKIPMULTILIB;
+		rpmMessage(RPMMESS_DEBUG, _("excluding multilib path %s%s\n"), 
+			dirNames[dirIndexes[i]], baseNames[i]);
+	    }
+	    continue;
+	}
+
+	len = reldel +
+		strlen(dirNames[dirIndexes[i]]) + strlen(baseNames[i]) + 1;
+	/*@-branchstate@*/
+	if (len >= fileAlloced) {
+	    fileAlloced = len * 2;
+	    fn = xrealloc(fn, fileAlloced);
+	}
+	/*@=branchstate@*/
+	*fn = '\0';
+	fnlen = stpcpy( stpcpy(fn, dirNames[dirIndexes[i]]), baseNames[i]) - fn;
+
+	/*
+	 * See if this file path needs relocating.
+	 */
+	/*
+	 * XXX FIXME: Would a bsearch of the (already sorted) 
+	 * relocation list be a good idea?
+	 */
+	for (j = numRelocations - 1; j >= 0; j--) {
+	    if (relocations[j].oldPath == NULL) /* XXX can't happen */
+		/*@innercontinue@*/ continue;
+	    len = strcmp(relocations[j].oldPath, "/")
+		? strlen(relocations[j].oldPath)
+		: 0;
+
+	    if (fnlen < len)
+		/*@innercontinue@*/ continue;
+	    /*
+	     * Only subdirectories or complete file paths may be relocated. We
+	     * don't check for '\0' as our directory names all end in '/'.
+	     */
+	    if (!(fn[len] == '/' || fnlen == len))
+		/*@innercontinue@*/ continue;
+
+	    if (strncmp(relocations[j].oldPath, fn, len))
+		/*@innercontinue@*/ continue;
+	    /*@innerbreak@*/ break;
+	}
+	if (j < 0) continue;
+
+	ft = whatis(fModes[i]);
+
+	/* On install, a relocate to NULL means skip the path. */
+	if (relocations[j].newPath == NULL) {
+	    if (ft == XDIR) {
+		/* Start with the parent, looking for directory to exclude. */
+		for (j = dirIndexes[i]; j < dirCount; j++) {
+		    len = strlen(dirNames[j]) - 1;
+		    while (len > 0 && dirNames[j][len-1] == '/') len--;
+		    if (fnlen != len)
+			/*@innercontinue@*/ continue;
+		    if (strncmp(fn, dirNames[j], fnlen))
+			/*@innercontinue@*/ continue;
+		    /*@innerbreak@*/ break;
+		}
+		if (j < dirCount)
+		    skipDirList[j] = 1;
+	    }
+	    if (actions) {
+		actions[i] = FA_SKIPNSTATE;
+		rpmMessage(RPMMESS_DEBUG, _("excluding %s %s\n"),
+			ftstring(ft), fn);
+	    }
+	    continue;
+	}
+
+	/* Relocation on full paths only, please. */
+	if (fnlen != len) continue;
+
+	if (actions)
+	    rpmMessage(RPMMESS_DEBUG, _("relocating %s to %s\n"),
+		    fn, relocations[j].newPath);
+	nrelocated++;
+
+	strcpy(fn, relocations[j].newPath);
+	{   char * te = strrchr(fn, '/');
+	    if (te) {
+		if (te > fn) te++;	/* root is special */
+		fnlen = te - fn;
+	    } else
+		te = fn + strlen(fn);
+	    /*@-nullpass -nullderef@*/	/* LCL: te != NULL here. */
+	    if (strcmp(baseNames[i], te)) /* basename changed too? */
+		baseNames[i] = alloca_strdup(te);
+	    *te = '\0';			/* terminate new directory name */
+	    /*@=nullpass =nullderef@*/
+	}
+
+	/* Does this directory already exist in the directory list? */
+	for (j = 0; j < dirCount; j++) {
+	    if (fnlen != strlen(dirNames[j]))
+		/*@innercontinue@*/ continue;
+	    if (strncmp(fn, dirNames[j], fnlen))
+		/*@innercontinue@*/ continue;
+	    /*@innerbreak@*/ break;
+	}
+	
+	if (j < dirCount) {
+	    dirIndexes[i] = j;
+	    continue;
+	}
+
+	/* Creating new paths is a pita */
+	if (!haveRelocatedFile) {
+	    const char ** newDirList;
+
+	    haveRelocatedFile = 1;
+	    newDirList = xmalloc((dirCount + 1) * sizeof(*newDirList));
+	    for (j = 0; j < dirCount; j++)
+		newDirList[j] = alloca_strdup(dirNames[j]);
+	    dirNames = hfd(dirNames, RPM_STRING_ARRAY_TYPE);
+	    dirNames = newDirList;
+	} else {
+	    dirNames = xrealloc(dirNames, 
+			       sizeof(*dirNames) * (dirCount + 1));
+	}
+
+	dirNames[dirCount] = alloca_strdup(fn);
+	dirIndexes[i] = dirCount;
+	dirCount++;
+    }
+
+    /* Finish off by relocating directories. */
+    for (i = dirCount - 1; i >= 0; i--) {
+	for (j = numRelocations - 1; j >= 0; j--) {
+
+	    if (relocations[j].oldPath == NULL) /* XXX can't happen */
+		/*@innercontinue@*/ continue;
+	    len = strcmp(relocations[j].oldPath, "/")
+		? strlen(relocations[j].oldPath)
+		: 0;
+
+	    if (len && strncmp(relocations[j].oldPath, dirNames[i], len))
+		/*@innercontinue@*/ continue;
+
+	    /*
+	     * Only subdirectories or complete file paths may be relocated. We
+	     * don't check for '\0' as our directory names all end in '/'.
+	     */
+	    if (dirNames[i][len] != '/')
+		/*@innercontinue@*/ continue;
+
+	    if (relocations[j].newPath) { /* Relocate the path */
+		const char * s = relocations[j].newPath;
+		char * t = alloca(strlen(s) + strlen(dirNames[i]) - len + 1);
+
+		(void) stpcpy( stpcpy(t, s) , dirNames[i] + len);
+		if (actions)
+		    rpmMessage(RPMMESS_DEBUG,
+			_("relocating directory %s to %s\n"), dirNames[i], t);
+		dirNames[i] = t;
+		nrelocated++;
+	    }
+	}
+    }
+
+    /* Save original filenames in header and replace (relocated) filenames. */
+    if (nrelocated) {
+	int c;
+	void * d;
+	rpmTagType t;
+
+	d = NULL;
+	xx = hge(h, RPMTAG_BASENAMES, &t, &d, &c);
+	xx = hae(h, RPMTAG_ORIGBASENAMES, t, d, c);
+	d = hfd(d, t);
+
+	d = NULL;
+	xx = hge(h, RPMTAG_DIRNAMES, &t, &d, &c);
+	xx = hae(h, RPMTAG_ORIGDIRNAMES, t, d, c);
+	d = hfd(d, t);
+
+	d = NULL;
+	xx = hge(h, RPMTAG_DIRINDEXES, &t, &d, &c);
+	xx = hae(h, RPMTAG_ORIGDIRINDEXES, t, d, c);
+	d = hfd(d, t);
+
+	xx = hme(h, RPMTAG_BASENAMES, RPM_STRING_ARRAY_TYPE,
+			  baseNames, fileCount);
+	fi->bnl = hfd(fi->bnl, RPM_STRING_ARRAY_TYPE);
+	xx = hge(h, RPMTAG_BASENAMES, NULL, (void **) &fi->bnl, &fi->fc);
+
+	xx = hme(h, RPMTAG_DIRNAMES, RPM_STRING_ARRAY_TYPE,
+			  dirNames, dirCount);
+	fi->dnl = hfd(fi->dnl, RPM_STRING_ARRAY_TYPE);
+	xx = hge(h, RPMTAG_DIRNAMES, NULL, (void **) &fi->dnl, &fi->dc);
+
+	xx = hme(h, RPMTAG_DIRINDEXES, RPM_INT32_TYPE,
+			  dirIndexes, fileCount);
+	xx = hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &fi->dil, NULL);
+    }
+
+    baseNames = hfd(baseNames, RPM_STRING_ARRAY_TYPE);
+    dirNames = hfd(dirNames, RPM_STRING_ARRAY_TYPE);
+    fn = _free(fn);
+
+    return h;
+}
+
+TFI_t fiFree(TFI_t fi, int freefimem)
+{
+    HFD_t hfd = headerFreeData;
+
+    if (fi == NULL) return NULL;
+
+    if (fi->nrefs > 1)
+	return rpmfiUnlink(fi, fi->Type);
+
+/*@-modfilesystem@*/
+if (_fi_debug < 0)
+fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, fi->Type, fi->fc);
+/*@=modfilesystem@*/
+
+    /*@-branchstate@*/
+    if (fi->fc > 0) {
+	fi->bnl = hfd(fi->bnl, -1);
+	fi->dnl = hfd(fi->dnl, -1);
+
+	fi->flinks = hfd(fi->flinks, -1);
+	fi->flangs = hfd(fi->flangs, -1);
+	fi->fmd5s = hfd(fi->fmd5s, -1);
+
+	fi->fuser = hfd(fi->fuser, -1);
+	fi->fuids = _free(fi->fuids);
+	fi->fgroup = hfd(fi->fgroup, -1);
+	fi->fgids = _free(fi->fgids);
+
+	fi->fstates = _free(fi->fstates);
+
+	/*@-evalorder@*/
+	if (!fi->keep_header && fi->h == NULL) {
+	    fi->fmtimes = _free(fi->fmtimes);
+	    fi->fmodes = _free(fi->fmodes);
+	    fi->fflags = _free(fi->fflags);
+	    fi->fsizes = _free(fi->fsizes);
+	    fi->frdevs = _free(fi->frdevs);
+	    fi->dil = _free(fi->dil);
+	}
+	/*@=evalorder@*/
+    }
+    /*@=branchstate@*/
+
+    fi->fsm = freeFSM(fi->fsm);
+
+    fi->apath = _free(fi->apath);
+    fi->fmapflags = _free(fi->fmapflags);
+
+    fi->obnl = hfd(fi->obnl, -1);
+    fi->odnl = hfd(fi->odnl, -1);
+
+    fi->actions = _free(fi->actions);
+    fi->replacedSizes = _free(fi->replacedSizes);
+    fi->replaced = _free(fi->replaced);
+
+    fi->h = headerFree(fi->h, fi->Type);
+
+    /*@-nullstate -refcounttrans -usereleased@*/
+    (void) rpmfiUnlink(fi, fi->Type);
+    /*@-branchstate@*/
+    if (freefimem) {
+	memset(fi, 0, sizeof(*fi));		/* XXX trash and burn */
+	fi = _free(fi);
+    }
+    /*@=branchstate@*/
+    /*@=nullstate =refcounttrans =usereleased@*/
+
+    return NULL;
+}
+
+#define	_fdupe(_fi, _data)	\
+    if ((_fi)->_data != NULL)	\
+	(_fi)->_data = memcpy(xmalloc((_fi)->fc * sizeof(*(_fi)->_data)), \
+			(_fi)->_data, (_fi)->fc * sizeof(*(_fi)->_data))
+
+TFI_t fiNew(rpmTransactionSet ts, TFI_t fi,
+		Header h, rpmTag tagN, int scareMem)
+{
+    HGE_t hge =
+	(scareMem ? (HGE_t) headerGetEntryMinMemory : (HGE_t) headerGetEntry);
+    const char * Type;
+    uint_32 * uip;
+    int malloced = 0;
+    int len;
+    int xx;
+    int i;
+
+    if (tagN == RPMTAG_BASENAMES) {
+	Type = "Files";
+    } else {
+	Type = "?Type?";
+	goto exit;
+    }
+
+    /*@-branchstate@*/
+    if (fi == NULL) {
+	fi = xcalloc(1, sizeof(*fi));
+	malloced = 0;	/* XXX always return with memory alloced. */
+    }
+    /*@=branchstate@*/
+
+    fi->magic = TFIMAGIC;
+    fi->Type = Type;
+    fi->i = -1;
+    fi->tagN = tagN;
+
+    fi->hge = hge;
+    fi->hae = (HAE_t) headerAddEntry;
+    fi->hme = (HME_t) headerModifyEntry;
+    fi->hre = (HRE_t) headerRemoveEntry;
+    fi->hfd = headerFreeData;
+
+    fi->h = (scareMem ? headerLink(h, fi->Type) : NULL);
+
+    if (fi->fsm == NULL)
+	fi->fsm = newFSM();
+
+    /* 0 means unknown */
+    xx = hge(h, RPMTAG_ARCHIVESIZE, NULL, (void **) &uip, NULL);
+    fi->archiveSize = (xx ? *uip : 0);
+
+    if (!hge(h, RPMTAG_BASENAMES, NULL, (void **) &fi->bnl, &fi->fc)) {
+	/*@-branchstate@*/
+	if (malloced) {
+	    if (scareMem && fi->h)
+		fi->h = headerFree(fi->h, fi->Type);
+	    fi->fsm = freeFSM(fi->fsm);
+	    /*@-refcounttrans@*/
+	    fi = _free(fi);
+	    /*@=refcounttrans@*/
+	} else {
+	    fi->fc = 0;
+	    fi->dc = 0;
+	}
+	/*@=branchstate@*/
+	goto exit;
+    }
+    xx = hge(h, RPMTAG_DIRNAMES, NULL, (void **) &fi->dnl, &fi->dc);
+    xx = hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &fi->dil, NULL);
+    xx = hge(h, RPMTAG_FILEMODES, NULL, (void **) &fi->fmodes, NULL);
+    xx = hge(h, RPMTAG_FILEFLAGS, NULL, (void **) &fi->fflags, NULL);
+    xx = hge(h, RPMTAG_FILESIZES, NULL, (void **) &fi->fsizes, NULL);
+    xx = hge(h, RPMTAG_FILESTATES, NULL, (void **) &fi->fstates, NULL);
+    if (xx == 0 || fi->fstates == NULL)
+	fi->fstates = xcalloc(fi->fc, sizeof(*fi->fstates));
+    else if (!scareMem)
+	_fdupe(fi, fstates);
+
+    fi->action = FA_UNKNOWN;
+    fi->flags = 0;
+    if (fi->actions == NULL)
+	fi->actions = xcalloc(fi->fc, sizeof(*fi->actions));
+    fi->keep_header = (scareMem ? 1 : 0);
+
+    /* XXX TR_REMOVED needs CPIO_MAP_{ABSOLUTE,ADDDOT} CPIO_ALL_HARDLINKS */
+    fi->mapflags =
+		CPIO_MAP_PATH | CPIO_MAP_MODE | CPIO_MAP_UID | CPIO_MAP_GID;
+
+    xx = hge(h, RPMTAG_FILELINKTOS, NULL, (void **) &fi->flinks, NULL);
+    xx = hge(h, RPMTAG_FILELANGS, NULL, (void **) &fi->flangs, NULL);
+
+    xx = hge(h, RPMTAG_FILEMD5S, NULL, (void **) &fi->fmd5s, NULL);
+
+    /* XXX TR_REMOVED doesn;t need fmtimes or frdevs */
+    xx = hge(h, RPMTAG_FILEMTIMES, NULL, (void **) &fi->fmtimes, NULL);
+    xx = hge(h, RPMTAG_FILERDEVS, NULL, (void **) &fi->frdevs, NULL);
+    fi->replacedSizes = xcalloc(fi->fc, sizeof(*fi->replacedSizes));
+
+    xx = hge(h, RPMTAG_FILEUSERNAME, NULL, (void **) &fi->fuser, NULL);
+    fi->fuids = NULL;
+    xx = hge(h, RPMTAG_FILEGROUPNAME, NULL, (void **) &fi->fgroup, NULL);
+    fi->fgids = NULL;
+
+    if (ts != NULL)
+    if (fi != NULL)
+    if (fi->te != NULL && fi->te->type == TR_ADDED) {
+	Header foo;
+	fi->actions = xcalloc(fi->fc, sizeof(*fi->actions));
+	foo = relocateFileList(ts, fi, h, fi->actions);
+	fi->h = headerFree(fi->h, "fiNew fi->h");
+	fi->h = headerLink(foo, "fiNew fi->h = foo");
+	foo = headerFree(foo, "fiNew foo");
+    }
+
+    if (!scareMem) {
+	_fdupe(fi, fmtimes);
+	_fdupe(fi, frdevs);
+	_fdupe(fi, fsizes);
+	_fdupe(fi, fflags);
+	_fdupe(fi, fmodes);
+	_fdupe(fi, dil);
+	fi->h = headerFree(fi->h, fi->Type);
+    }
+
+    fi->dnlmax = -1;
+    for (i = 0; i < fi->dc; i++) {
+	if ((len = strlen(fi->dnl[i])) > fi->dnlmax)
+	    fi->dnlmax = len;
+    }
+    fi->bnlmax = -1;
+    for (i = 0; i < fi->fc; i++) {
+	if ((len = strlen(fi->bnl[i])) > fi->bnlmax)
+	    fi->bnlmax = len;
+    }
+    fi->dperms = 0755;
+    fi->fperms = 0644;
+
+exit:
+/*@-modfilesystem@*/
+if (_fi_debug < 0)
+fprintf(stderr, "*** fi %p\t%s[%d]\n", fi, Type, (fi ? fi->fc : 0));
+/*@=modfilesystem@*/
+
+    /*@-nullstate@*/ /* FIX: TFI null annotations */
+    return rpmfiLink(fi, (fi ? fi->Type : NULL));
+    /*@=nullstate@*/
+}
diff --git a/lib/rpmfi.h b/lib/rpmfi.h
new file mode 100644
index 000000000..b2d4272b1
--- /dev/null
+++ b/lib/rpmfi.h
@@ -0,0 +1,227 @@
+#ifndef H_RPMFI
+#define H_RPMFI
+
+/** \ingroup rpmdep rpmtrans
+ * \file lib/rpmfi.h
+ * Structure used for file info tag sets.
+ */
+
+/**
+ */
+typedef struct sharedFileInfo_s *		sharedFileInfo;
+
+/**
+ */
+struct sharedFileInfo_s {
+    int pkgFileNum;
+    int otherFileNum;
+    int otherPkg;
+    int isRemoved;
+};
+
+/**
+ * A package filename set.
+ */
+struct TFI_s {
+    int i;			/*!< File index. */
+
+/*@observer@*/
+    const char * Type;		/*!< Tag name. */
+
+    rpmTag tagN;		/*!< Header tag. */
+/*@refcounted@*/ /*@null@*/
+    Header h;			/*!< Header for file set (or NULL) */
+
+/*@only@*/ /*?null?*/
+    const char ** bnl;		/*!< Base name(s) (from header) */
+/*@only@*/ /*?null?*/
+    const char ** dnl;		/*!< Directory name(s) (from header) */
+
+/*@only@*/ /*?null?*/
+    const char ** fmd5s;	/*!< File MD5 sum(s) (from header) */
+/*@only@*/ /*?null?*/
+    const char ** flinks;	/*!< File link(s) (from header) */
+/*@only@*/ /*?null?*/
+    const char ** flangs;	/*!< File lang(s) */
+
+/*@only@*/ /*?null?*/
+          uint_32 * dil;	/*!< Directory indice(s) (from header) */
+/*@only@*/ /*?null?*/
+    const uint_32 * fflags;	/*!< File flag(s) (from header) */
+/*@only@*/ /*?null?*/
+    const uint_32 * fsizes;	/*!< File size(s) (from header) */
+/*@only@*/ /*?null?*/
+    const uint_32 * fmtimes;	/*!< File modification time(s) (from header) */
+/*@only@*/ /*?null?*/
+          uint_16 * fmodes;	/*!< File mode(s) (from header) */
+/*@only@*/ /*?null?*/
+    const uint_16 * frdevs;	/*!< File rdev(s) (from header) */
+
+/*@only@*/ /*@null@*/
+    const char ** fuser;	/*!< File owner(s) */
+/*@only@*/ /*@null@*/
+    const char ** fgroup;	/*!< File group(s) */
+/*@only@*/ /*@null@*/
+    uid_t * fuids;		/*!< File uid(s) */
+/*@only@*/ /*@null@*/
+    gid_t * fgids;		/*!< File gid(s) */
+
+/*@only@*/ /*@null@*/
+    char * fstates;		/*!< File state(s) (from header) */
+
+    int_32 dc;			/*!< No. of directories. */
+    int_32 fc;			/*!< No. of files. */
+
+/*=============================*/
+/*@dependent@*/
+    transactionElement te;
+
+    HGE_t hge;			/*!< Vector to headerGetEntry() */
+    HAE_t hae;			/*!< Vector to headerAddEntry() */
+    HME_t hme;			/*!< Vector to headerModifyEntry() */
+    HRE_t hre;			/*!< Vector to headerRemoveEntry() */
+    HFD_t hfd;			/*!< Vector to headerFreeData() */
+/*-----------------------------*/
+    uid_t uid;			/*!< File uid (default). */
+    gid_t gid;			/*!< File gid (default). */
+    uint_32 flags;		/*!< File flags (default). */
+    fileAction action;		/*!< File disposition (default). */
+/*@owned@*/
+    fileAction * actions;	/*!< File disposition(s). */
+/*@owned@*/
+    struct fingerPrint_s * fps;	/*!< File fingerprint(s). */
+/*@owned@*/
+    const char ** obnl;		/*!< Original basename(s) (from header) */
+/*@owned@*/
+    const char ** odnl;		/*!< Original dirname(s) (from header) */
+/*@unused@*/
+    int_32 * odil;		/*!< Original dirindex(s) (from header) */
+    int bnlmax;			/*!< Length (in bytes) of longest basename. */
+    int dnlmax;			/*!< Length (in bytes) of longest dirname. */
+    int astriplen;
+    int striplen;
+    unsigned int archiveSize;
+    mode_t dperms;		/*!< Directory perms (0755) if not mapped. */
+    mode_t fperms;		/*!< File perms (0644) if not mapped. */
+/*@only@*/ /*@null@*/
+    const char ** apath;
+    int mapflags;
+/*@owned@*/ /*@null@*/
+    int * fmapflags;
+/*@owned@*/
+    FSM_t fsm;			/*!< File state machine data. */
+    int keep_header;		/*!< Keep header? */
+/*@owned@*/
+    sharedFileInfo replaced;	/*!< (TR_ADDED) */
+/*@owned@*/
+    uint_32 * replacedSizes;	/*!< (TR_ADDED) */
+    unsigned int record;	/*!< (TR_REMOVED) */
+    int magic;
+#define	TFIMAGIC	0x09697923
+/*=============================*/
+
+/*@refs@*/ int nrefs;		/*!< Reference count. */
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Unreference a file info set instance.
+ * @param fi		file info set
+ * @return		NULL always
+ */
+/*@unused@*/ /*@null@*/
+TFI_t rpmfiUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ TFI_t fi,
+		/*@null@*/ const char * msg)
+	/*@modifies fi @*/;
+
+/** @todo Remove debugging entry from the ABI. */
+/*@-exportlocal@*/
+/*@null@*/
+TFI_t XrpmfiUnlink (/*@killref@*/ /*@only@*/ /*@null@*/ TFI_t fi,
+		/*@null@*/ const char * msg, const char * fn, unsigned ln)
+	/*@modifies fi @*/;
+/*@=exportlocal@*/
+#define	rpmfiUnlink(_fi, _msg) XrpmfiUnlink(_fi, _msg, __FILE__, __LINE__)
+
+/**
+ * Reference a file info set instance.
+ * @param fi		file info set
+ * @return		new file info set reference
+ */
+/*@unused@*/
+TFI_t rpmfiLink (/*@null@*/ TFI_t fi, /*@null@*/ const char * msg)
+	/*@modifies fi @*/;
+
+/** @todo Remove debugging entry from the ABI. */
+TFI_t XrpmfiLink (/*@null@*/ TFI_t fi, /*@null@*/ const char * msg,
+		const char * fn, unsigned ln)
+        /*@modifies fi @*/;
+#define	rpmfiLink(_fi, _msg)	XrpmfiLink(_fi, _msg, __FILE__, __LINE__)
+
+/**
+ * Retrieve key from transaction element file info
+ * @param fi		transaction element file info
+ * @return		transaction element file info key
+ */
+/*@exposed@*/ /*@dependent@*/ /*@null@*/
+fnpyKey rpmfiGetKey(TFI_t fi)
+	/*@*/;
+
+/**
+ * Destroy a file info set.
+ * @param fi		file set
+ * @param freefimem	free fi memory too?
+ * @return		NULL always
+ */
+/*@null@*/
+TFI_t fiFree(/*@killref@*/ /*@only@*/ /*@null@*/ TFI_t fi, int freefimem)
+	/*@modifies fi@*/;
+
+/**
+ * Create and load a file info set.
+ * @param ts		transaction set
+ * @param fi		file set (NULL if creating)
+ * @param h		header
+ * @param tagN		RPMTAG_BASENAMES
+ * @param scareMem	Use pointers to refcounted header memory?
+ * @return		new file set
+ */
+/*@null@*/
+TFI_t fiNew(rpmTransactionSet ts, /*@null@*/ TFI_t fi,
+		Header h, rpmTag tagN, int scareMem)
+	/*@modifies ts, fi, h @*/;
+
+/**
+ * Return next file info set iterator index.
+ * @param fi		file info set
+ * @return		file info set iterator index, -1 on termination
+ */
+int tfiNext(/*@null@*/ TFI_t fi)
+	/*@modifies fi @*/;
+
+/**
+ * Initialize file info set iterator.
+ * @param fi		file info set
+ * @param ix		file info set index
+ * @return		file info set, NULL if ix is out of range
+ */
+/*@null@*/
+TFI_t tfiInit(/*@null@*/ TFI_t fi, int ix)
+	/*@modifies fi @*/;
+
+/**
+ * Return file type from mode_t.
+ * @param mode		file mode bits (from header)
+ * @return		file type
+ */
+fileTypes whatis(uint_16 mode)
+	/*@*/;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* H_RPMDS */
diff --git a/lib/trb.c b/lib/trb.c
new file mode 100644
index 000000000..c1d3f2f21
--- /dev/null
+++ b/lib/trb.c
@@ -0,0 +1,142 @@
+#include "system.h"
+#include "rpmcli.h"
+#include "misc.h"
+
+#include "debug.h"
+
+#define	UP2DATEGLOB	"/var/spool/up2date/*.rpm"
+
+static int doit = 1;
+
+static struct poptOption optionsTable[] = {
+ { "verbose", 'v', 0, 0, 'v',
+	N_("provide more detailed output"), NULL},
+   { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmInstallPoptTable, 0,
+	N_("Install/Upgrade/Erase options:"),
+	NULL },
+   POPT_AUTOHELP
+   POPT_TABLEEND
+};
+
+int
+main(int argc, const char *argv[])
+{
+    poptContext optCon;
+    struct rpmInstallArguments_s * ia = &rpmIArgs;
+    int arg;
+    int ec = 0;
+
+time_t tid;
+    rpmProblemSet probs = NULL;
+    rpmTransactionSet ts = NULL;
+    const char * globstr = UP2DATEGLOB;
+    IDTX itids = NULL;
+    IDTX rtids = NULL;
+    int rc;
+    int i;
+
+#if HAVE_MCHECK_H && HAVE_MTRACE
+    mtrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
+#endif
+    setprogname(argv[0]);       /* Retrofit glibc __progname */
+
+    /* set up the correct locale */
+    (void) setlocale(LC_ALL, "" );
+
+#ifdef  __LCLINT__
+#define LOCALEDIR       "/usr/share/locale"
+#endif
+    bindtextdomain(PACKAGE, LOCALEDIR);
+    textdomain(PACKAGE);
+
+    rpmSetVerbosity(RPMMESS_NORMAL);
+
+    optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
+    (void) poptReadConfigFile(optCon, LIBRPMALIAS_FILENAME);
+    (void) poptReadDefaultConfig(optCon, 1);
+    poptSetExecPath(optCon, RPMCONFIGDIR, 1);
+
+    while ((arg = poptGetNextOpt(optCon)) > 0) {
+	switch(arg) {
+	case 'v':
+	    rpmIncreaseVerbosity();
+	    break;
+	default:
+	    break;
+	}
+    }
+
+    if (rpmReadConfigFiles(NULL, NULL))
+	exit(1);
+
+    ts = rpmtransCreateSet(NULL, NULL);
+    if (rpmtsOpenDB(ts, O_RDWR))
+	exit(1);
+
+    itids = IDTXload(ts, RPMTAG_INSTALLTID);
+    rtids = IDTXglob(globstr, RPMTAG_REMOVETID);
+
+    packagesTotal = 0;
+
+    if (rtids != NULL && rtids->nidt > 0)
+    for (i = 0; i < rtids->nidt; i++) {
+	IDT idt = rtids->idt + i;
+
+fprintf(stderr, "*** rbtid %d rtid %d\n", ia->rbtid, idt->val.i32);
+	if (ia->rbtid != 0 && idt->val.i32 < ia->rbtid) break;
+
+tid = idt->val.i32;
+fprintf(stderr, "\t+++ %s: %s", idt->key, ctime(&tid));
+
+	rc = rpmtransAddPackage(ts, idt->h, idt->key,
+			(ia->installInterfaceFlags & INSTALL_UPGRADE) != 0,
+			ia->relocations);
+
+	packagesTotal++;
+
+	idt->h = headerFree(idt->h, "idt->h free");
+    }
+
+    if (itids != NULL && itids->nidt > 0)
+    for (i = 0; i < itids->nidt; i++) {
+	IDT idt = itids->idt + i;
+
+fprintf(stderr, "*** rbtid %d itid %d\n", ia->rbtid, idt->val.i32);
+	if (ia->rbtid != 0 && idt->val.i32 < ia->rbtid) break;
+
+tid = idt->val.i32;
+fprintf(stderr, "\t--- rpmdb instance #%u: %s", idt->instance, ctime(&tid));
+
+	rc = rpmtransRemovePackage(ts, idt->h, idt->instance);
+
+	packagesTotal++;
+
+    }
+
+    rc = rpmdepOrder(ts);
+    if (rc)
+	doit = 0;
+
+    probs = NULL;
+rc = 0;
+if (doit)
+    rc = rpmRunTransactions(ts,  rpmShowProgress,
+		(void *) ((long)ia->installInterfaceFlags),
+		NULL, &probs, ia->transFlags, ia->probFilter);
+    if (rc > 0)
+	rpmProblemSetPrint(stderr, probs);
+    if (probs != NULL) rpmProblemSetFree(probs);
+
+    itids = IDTXfree(itids);
+    rtids = IDTXfree(rtids);
+    ts = rpmtransFree(ts);
+
+    optCon = poptFreeContext(optCon);
+    rpmFreeMacros(NULL);
+
+#if HAVE_MCHECK_H && HAVE_MTRACE
+    muntrace();   /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
+#endif
+
+    return ec;
+}
diff --git a/lib/verify.c b/lib/verify.c
index 70df8b62c..3ab0c8706 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -286,7 +286,7 @@ static int rpmVerifyScript(/*@unused@*/ QVA_t qva, rpmTransactionSet ts,
 		fileSystem, internalState @*/
 {
     PSM_t psm = memset(alloca(sizeof(*psm)), 0, sizeof(*psm));
-    int rc;
+    int rc = 0;
 
     psm->ts = rpmtsLink(ts, "rpmVerifyScript");
 
diff --git a/po/cs.po b/po/cs.po
index 60a47c56f..4be6d51e6 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -831,7 +831,7 @@ msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "Nemohu otevøít %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nemohu zapsat balíèek: %s\n"
@@ -861,7 +861,7 @@ msgstr "Nemohu pøeèíst payload z %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nemohu zapsat payload do %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapsáno: %s\n"
@@ -1476,11 +1476,11 @@ msgstr "¾ádné balíèky\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr "NE "
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr "ANO"
 
@@ -1615,7 +1615,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "Poèet dataLength() RPM_STRING_TYPE musí bıt 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datovı typ %d není podporován\n"
@@ -2216,108 +2216,74 @@ msgstr " koliduje s %s-%s-%s\n"
 msgid "is needed by"
 msgstr " je nutné pro %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== relokace\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d vynechávám %s\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d pøemís»uji %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "vynechávám multilib cestu %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "vynechávám %s %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "pøemís»uji %s do %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "pøemís»uji adresáø %s do %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nemohu zapsat do %%%s %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "oèekávám balíèek se zdrojovımi kódy, nalezen v¹ak binární\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "zdrojovı balíèek neobsahuje .spec soubor\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "provedení skripletu %s z %s-%s-%s selhalo, návratovı kód byl: %s\n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratovı kód: %d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s obsahuje %d souborù, test = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n"
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "u¾ivatel %s neexistuje - pou¾it u¾ivatel root\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou¾ita skupina root\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalování archívu selhalo %s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " na souboru "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nemohu otevøít %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s selhalo\n"
@@ -2365,91 +2331,91 @@ msgstr "balíèek nemá vlastníka souboru ani seznamy id\n"
 msgid "can't query %s: %s\n"
 msgstr "nemohu provést dotaz %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otevøení %s selhalo: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "dotaz na %s se nezdaøil\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "nelze provést dotaz na zdrojové balíèky starého formátu\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "dotaz na spec soubor %s selhal, nemohu parsovat\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "¾ádné balíèky\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje ¾ádné balíèky\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "¾ádnı balíèek neaktivuje %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "¾ádnı balíèek nevy¾aduje %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "¾ádnı balíèek neposkytuje %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "soubor %s nevlastní ¾ádnı balíèek\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neplatné èíslo balíèku: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "záznam balíèku èíslo: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "záznam %d nelze pøeèíst\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balíèek %s není nainstalován\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "¹patnı db soubor %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
@@ -2518,7 +2484,7 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2527,13 +2493,13 @@ msgstr ""
 "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n"
@@ -2866,18 +2832,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Podpisu: velikost(%d)+vata(%d)\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s pøeskoèeno, proto¾e chybí pøíznak\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "vynechávám adresáø %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "získávám seznam pøipojenıch systémù souborù\n"
 
@@ -2892,17 +2858,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "balíèek neobsahuje ani jména skupin ani seznam id (nemìlo by se nikdy stát)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "chybí      %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr "%s-%s-%s: kontrola digestu v hlavièce selhala\n"
@@ -3417,6 +3383,27 @@ msgstr "url port musí bıt èíslo\n"
 msgid "failed to create %s: %s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== relokace\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d vynechávám %s\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d pøemís»uji %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "vynechávám multilib cestu %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "vynechávám %s %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "pøemís»uji %s do %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "pøemís»uji adresáø %s do %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s ANO (pøidány soubory)\n"
diff --git a/po/da.po b/po/da.po
index 1d0b419fc..0aba6a180 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -828,7 +828,7 @@ msgstr "Kunne ikke læse hoved fra %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke åbne %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
@@ -858,7 +858,7 @@ msgstr "Kunne ikke læse pakkeindhold fra %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -1477,12 +1477,12 @@ msgstr "ingen pakker\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 #, fuzzy
 msgid "NO "
 msgstr "IKKE O.K."
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1615,7 +1615,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() RPM_STRING_TYPE-antal skal være 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatype %d understøttes ikke\n"
@@ -2235,110 +2235,76 @@ msgstr " skaber konflikt med %s-%s-%s\n"
 msgid "is needed by"
 msgstr " kræves af %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== gemmer omrokeringer\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d ekskluderer %s\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d omrokerer %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "ekskluderer multilib-sti %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "ekskluderer %s %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "omrokerer %s til %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "omrokerer kataloget %s til %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kunne ikke skrive til %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, binær fundet\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke indeholder ingen .spec-fil\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "kører postinstallations-skript (hvis det findes)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "pakke: %s-%s-%s filer test = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "bruger %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "gruppe %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " for fil "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "kunne ikke åbne %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s mislykkedes\n"
@@ -2386,91 +2352,91 @@ msgstr "pakke har hverken filejerskabs- eller id-lister\n"
 msgid "can't query %s: %s\n"
 msgstr "kunne ikke forespørge %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "åbning af %s mislykkedes %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "forespørgsel af %s mislykkedes\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "pakke med gammelt kildeformat kan ikke forespørges\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: læs manifest mislykkedes: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "forespørgsel af spec-fil %s mislykkedes, kunne ikke tolkes\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "ingen pakker\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "gruppe %s indeholder ingen pakker\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ingen pakker udløser %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ingen pakker kræver %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ingen pakker tilfører %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s tilhører ingen pakke\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ugyldigt pakkenummer: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "pakkens post-nummer: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "post %d kunne ikke læses\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakken %s er ikke installeret\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "ugyldig db-fil %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s JA (db tilfører)\n"
@@ -2539,7 +2505,7 @@ msgid "OK"
 msgstr "O.K."
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2548,13 +2514,13 @@ msgstr ""
 "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
@@ -2888,18 +2854,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signaturfyld : %d\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s oversprunget grundet manglende ok-flag\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer kataloget %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "henter liste over monterede filsystemer\n"
 
@@ -2915,17 +2881,17 @@ msgstr ""
 "pakken har hverken en liste over gruppenavne eller id (det burde ikke kunne "
 "ske)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "manglende  %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3446,6 +3412,27 @@ msgstr "url-port skal være et tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke oprette %s: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== gemmer omrokeringer\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d ekskluderer %s\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d omrokerer %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "ekskluderer multilib-sti %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "ekskluderer %s %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "omrokerer %s til %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "omrokerer kataloget %s til %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s JA (tilføjede filer)\n"
diff --git a/po/de.po b/po/de.po
index 507355b10..dbc0edfb9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -921,7 +921,7 @@ msgid "Could not open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
@@ -956,7 +956,7 @@ msgstr "Nicht möglich %s zu schreiben"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1613,11 +1613,11 @@ msgstr "Anfrage an alle Pakete"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1755,7 +1755,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2407,114 +2407,77 @@ msgstr " steht im Konflikt mit %s-%s-%s\n"
 msgid "is needed by"
 msgstr " wird von %s-%s-%s gebraucht\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-# , c-format
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "Hole %s heraus\n"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "kann Datei %s nicht öffnen: "
-
-# , c-format
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "Hole %s heraus\n"
-
-# , c-format
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "Hole %s heraus\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "Keine Stufen ausführen"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "Ausführung des Skripts fehlgeschlagen"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "Ausführung des Skripts fehlgeschlagen"
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp fehlgeschlagen"
@@ -2564,95 +2527,95 @@ msgstr "Paket hat keinen Namen"
 msgid "can't query %s: %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "kein Paket triggert %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "kein Paket verlangt %s\n"
 
 # oder besser: ... listet %s auf? -ke-
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "kein Paket stellt %s bereit\n"
 
 # , c-format
-#: lib/query.c:804
+#: lib/query.c:798
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "Eintrag %d konnte nicht gelesen werden\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "Paket %s ist nicht installiert\n"
 
 # , c-format
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
@@ -2723,20 +2686,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
@@ -3086,18 +3049,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -3109,17 +3072,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "fehlende { nach %{"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3650,6 +3613,29 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
 msgid "failed to create %s: %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
+# , c-format
+#, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "Hole %s heraus\n"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "kann Datei %s nicht öffnen: "
+
+# , c-format
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "Hole %s heraus\n"
+
+# , c-format
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "Hole %s heraus\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "die Datei »%s« gehört zu keinem Paket\n"
diff --git a/po/en_RN.po b/po/en_RN.po
index 432fb27ec..3aefd71bc 100644
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 432fb27ec..3aefd71bc 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 432fb27ec..3aefd71bc 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 9dbc06048..588f7075c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -835,7 +835,7 @@ msgstr "%s:n kirjoitus ei onnistu"
 msgid "Could not open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
@@ -865,7 +865,7 @@ msgstr "%s:n kirjoitus ei onnistu"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1495,11 +1495,11 @@ msgstr "kysele kaikki paketit"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1632,7 +1632,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2269,109 +2269,75 @@ msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
 msgid "is needed by"
 msgstr "vaatii %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "Haen: %s\n"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "en voinut avata tiedostoa %s: "
-
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "Haen: %s\n"
-
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "Haen: %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "virhe luotaessa hakemistoa %s: %s"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "skriptin ajo epäonnistui"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "skriptin ajo epäonnistui"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp epäonnistui"
@@ -2421,92 +2387,92 @@ msgstr "paketilla ei ole nimeä"
 msgid "can't query %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s:n kysely ei onnistunut\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s:n kysely ei onnistunut\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "kysele kaikki paketit"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "mikään paketti ei laukaise %s:a\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "mikään pakettie ei tarvitse %s:a\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "mikään paketti ei tarjoa %s:a\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "tietuetta %d ei voitu lukea\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
@@ -2577,20 +2543,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
@@ -2935,18 +2901,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2958,17 +2924,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:"
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3491,6 +3457,26 @@ msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti epäonnistui\n"
 
 #, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "Haen: %s\n"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "en voinut avata tiedostoa %s: "
+
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "Haen: %s\n"
+
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "Haen: %s\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "virhe luotaessa hakemistoa %s: %s"
+
+#, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "tiedostoa %s ei omista mikään paketti\n"
 
diff --git a/po/fr.po b/po/fr.po
index 1d5c6bba7..83cb6d4ea 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -870,7 +870,7 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -900,7 +900,7 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1532,11 +1532,11 @@ msgstr "aucun package n'a t spcifi pour l'installation"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1667,7 +1667,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2317,110 +2317,76 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "La construction a chou.\n"
@@ -2470,92 +2436,92 @@ msgstr "aucun package n'a t spcifi pour l'installation"
 msgid "can't query %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, fuzzy, c-format
 msgid "no package triggers %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2624,20 +2590,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
@@ -2978,18 +2944,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -3001,17 +2967,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3522,6 +3488,14 @@ msgid "failed to create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "impossible d'ouvrir: %s\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "impossible d'ouvrir: %s\n"
+
+#, fuzzy
 #~ msgid "package %s conflicts: %s\n"
 #~ msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
diff --git a/po/gl.po b/po/gl.po
index 0b00b70de..e00a06e16 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -811,7 +811,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -841,7 +841,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1444,11 +1444,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1579,7 +1579,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2164,108 +2164,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2313,90 +2279,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2464,20 +2430,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2806,18 +2772,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2829,17 +2795,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 432fb27ec..3aefd71bc 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 432fb27ec..3aefd71bc 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 5cee14fb8..4ceb79ca6 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -815,7 +815,7 @@ msgstr "Get ekki lesiğ haus úr %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Get ekki ritağ í pakka: %s\n"
@@ -845,7 +845,7 @@ msgstr "Get ekki lesiğ innihald %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Get ekki ritağ innihald í %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrifaği: %s\n"
@@ -1450,11 +1450,11 @@ msgstr "uppfæra pakka"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1585,7 +1585,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2175,108 +2175,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d færa %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "gat ekki búiğ til %%%s %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "get ekki ritağ í %%%s %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "pakkinn inniheldur enga .spec skrá\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "gat ekki opnağ %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s brást\n"
@@ -2324,90 +2290,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: gat ekki lesiğ manifest: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2475,20 +2441,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2817,18 +2783,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2840,17 +2806,17 @@ msgstr "í pakkanum eru engir notandalistar (şetta ætti aldrei ağ koma fyrir)\n"
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr "í pakkanum eru engir hópalistar (şetta ætti aldrei ağ koma fyrir)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "vantar     %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Óuppfyllt pakkaskilyrği fyrir %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3358,6 +3324,9 @@ msgstr "gátt slóğar verğur ağ vera tala\n"
 msgid "failed to create %s: %s\n"
 msgstr "gat ekki búiğ til %s: %s\n"
 
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d færa %s -> %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s NO\n"
 #~ msgstr "%s: %s\n"
diff --git a/po/it.po b/po/it.po
index 432fb27ec..3aefd71bc 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index d53d9d9a8..9ac255cb7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\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"
@@ -862,7 +862,7 @@ msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
 msgid "Could not open %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
@@ -892,7 +892,7 @@ msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "½ñ¤­¹ş¤ßÃæ: %s\n"
@@ -1527,11 +1527,11 @@ msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Ş¤·¤¿\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1665,7 +1665,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó¡£\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤»¤ó\n"
@@ -2327,111 +2327,77 @@ msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Ş¤¹\n"
 msgid "is needed by"
 msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Ş¤¹\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "OS ¤Ï½ü³°¤µ¤ì¤Æ¤¤¤Ş¤¹: %s"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Ş¤¹\n"
-
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n"
-
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Ş¤¹\n"
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Ş¤¹\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Ş¤»¤ó: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%s ¤Ø½ñ¤­¹ş¤á¤Ş¤»¤ó"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Ş¤¹¡¢¥Ğ¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Ş¤·¤¿"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Ş¤ó¤Ç¤¤¤Ş¤»¤ó"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "¥İ¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ğ)¤ò¼Â¹Ô¤·¤Ş¤¹\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Ş¤»¤ó - root ¤ò»ÈÍѤ·¤Ş¤¹"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Ş¤»¤ó - root ¤ò»ÈÍѤ·¤Ş¤¹"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 #, fuzzy
 msgid " on file "
 msgstr "¥Õ¥¡¥¤¥ë¾å"
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ¼ºÇÔ"
@@ -2480,92 +2446,92 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Õ¥¡¥¤¥ë½êÍ­¼Ô¤ä id ¥ê¥¹¥È¤ò¤É¤Á¤é¤â»ı¤Ã¤Æ¤¤¤Ş¤»¤ó"
 msgid "can't query %s: %s\n"
 msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Ş¤»¤ó: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡¢¥Ñ¡¼¥¹¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Ş¤·¤¿\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "¥°¥ë¡¼¥× %s ¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s ¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â°¤·¤Æ¤¤¤Ş¤»¤ó\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "̵¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸ÈÖ¹æ: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
@@ -2636,7 +2602,7 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2645,13 +2611,13 @@ msgstr ""
 "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Ş¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëş¤¿¤µ¤ì¤Æ¤¤¤Ş¤»¤ó: %s\n"
@@ -2995,18 +2961,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "½ğ̾¥Ñ¥Ã¥É: %d\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Ş¤¹\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "¥Ş¥¦¥ó¥È¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ê¥¹¥È¤ò¼èÆÀ¤·¤Æ¤¤¤Ş¤¹\n"
 
@@ -3024,17 +2990,17 @@ msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥°¥ë¡¼¥×̾¤È id ¥ê¥¹¥È¤ÎξÊı¤¬·ç¤±¤Æ¤¤¤Ş¤¹(¤³¤ì¤Ï·è¤·¤Æµ¯¤­¤Æ¤Ï¤Ê"
 "¤é¤Ê¤¤)"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Ş¤»¤ó\n"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËş¤¿¤·¤Æ¤¤¤Ş¤»¤ó:"
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3565,6 +3531,29 @@ msgid "failed to create %s: %s\n"
 msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
 #, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "OS ¤Ï½ü³°¤µ¤ì¤Æ¤¤¤Ş¤¹: %s"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Ş¤¹\n"
+
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n"
+
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Ş¤¹\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Ş¤¹\n"
+
+#, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
diff --git a/po/ko.po b/po/ko.po
index a3fecdeaf..a796b057d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-09-07 22:03+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -822,7 +822,7 @@ msgstr "¼­¸í(signature) Çì´õ¸¦ ´Ù½Ã Àоî¿Ã ¼ö ¾ø½À´Ï´Ù.\n"
 msgid "Could not open %s: %s\n"
 msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "ÆĞÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
@@ -852,7 +852,7 @@ msgstr "%s ÀÇ payload¸¦ ÀĞÀ» ¼ö ¾øÀ½: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "ÀÛ¼º: %s\n"
@@ -1467,11 +1467,11 @@ msgstr "ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr "¾Æ´Ï¿À"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr "¿¹"
 
@@ -1606,7 +1606,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() RPM_STRING_TYPE Ä«¿îÆ®´Â ¹İµå½Ã '1' À̾î¾ß ÇÕ´Ï´Ù.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÏ½Ç ¼ö ¾ø½À´Ï´Ù\n"
@@ -2216,114 +2216,80 @@ msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n"
 msgid "is needed by"
 msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== Àç¹èÄ¡\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d Á¦¿Ü(exclude)  %s\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d Àç¹èÄ¡ %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "%s%s multilib °æ·Î¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "%s %s (À»)¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "%s ¿¡¼­ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "%s µğ·ºÅ丮¸¦ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s %s (À»)¸¦ »ı¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s %s (À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "¼Ò½º ÆĞÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "¼Ò½º ÆĞÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 "%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆĞÇß½À´Ï´Ù, waitpid°¡ %"
 "5$s (À»)¸¦ ¹İȯÇÏ¿´½À´Ï´Ù \n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 "%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆĞÇß½À´Ï´Ù, Á¾·á »óȲ %"
 "5$d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s (ÀÌ)°¡ %d ÀÇ ÆÄÀÏÀ» °®°í ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 "%s: %s ½ºÅ©¸³Æ®¸´(scriptlet)°¡ ½ÇÆĞÇß½À´Ï´Ù (%d), %s-%s-%s (À»)¸¦ »ı·«ÇÕ´Ï"
 "´Ù\n"
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆĞÇÔ%s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆĞÇÔ: %3$s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s (ÀÌ)°¡ ½ÇÆĞÇÔ: %s\n"
@@ -2371,91 +2337,91 @@ msgstr "ÆĞÅ°Áö¿¡ ÆÄÀÏ ¼ÒÀ¯ÀÚ ¶Ç´Â id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù\n"
 msgid "can't query %s: %s\n"
 msgstr "%s (À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆĞÇÔ: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s (À»)¸¦ ÁúÀÇÇϴµ¥ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆĞÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Àдµ¥ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s spec ÆÄÀÏÀ» ÁúÀÇÇϴµ¥ ½ÇÆĞÇß½À´Ï´Ù, ÆÄÀÏÀ» ºĞ¼®ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "%s ±×·ìÀº ¾î¶² ÆĞÅ°Áö¿¡µµ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s (À»)¸¦ ¹ß»ı½ÃÅ°´Â ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s (À»)¸¦ ÇÊ¿ä·Î ÇÏ´Â ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s (À»)¸¦ Á¦°øÇÏ´Â ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "%s ÆÄÀÏ: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "%s ÆÄÀÏÀº ¾î¶² ÆĞÅ°Áö¿¡µµ ¼ÓÇØ ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ºÎÀûÇÕÇÑ ÆĞÅ°Áö ¹øÈ£: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "ÆĞÅ°Áö ±â·Ï(record) ¹øÈ£: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀĞÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s ÆĞÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "À߸øµÈ db ÆÄÀÏ    %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
@@ -2524,7 +2490,7 @@ msgid "OK"
 msgstr "È®ÀÎ"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2533,13 +2499,13 @@ msgstr ""
 "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "%s-%s-%s ÆĞÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
@@ -2871,18 +2837,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "¼­¸í: size(%d)+pad(%d)\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ı·«ÇÕ´Ï´Ù\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s µğ·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "¸¶¿îÆ®µÈ ÆÄÀϽýºÅÛÀÇ ¸ñ·ÏÀ» ¼öÁıÇÏ°í ÀÖ½À´Ï´Ù\n"
 
@@ -2896,17 +2862,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "ÆĞÅ°Áö¿¡ ±×·ì À̸§°ú id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù (Àı´ë ÀÌ·¸°Ô µÇ¾î¼­´Â ¾ÈµË´Ï´Ù)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "´ÙÀ½À» ãÀ» ¼ö ¾ø½À´Ï´Ù    %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "%s-%s-%s ¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ı: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3430,6 +3396,27 @@ msgstr "URL Æ÷Æ®´Â ¹İµå½Ã ¼ıÀÚÀ̾î¾ß ÇÕ´Ï´Ù\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s (À»)¸¦ »ı¼ºÇϴµ¥ ½ÇÆĞÇÔ: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== Àç¹èÄ¡\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d Á¦¿Ü(exclude)  %s\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d Àç¹èÄ¡ %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "%s%s multilib °æ·Î¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "%s %s (À»)¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "%s ¿¡¼­ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "%s µğ·ºÅ丮¸¦ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s ¿¹ (ÆÄÀÏÀÌ Ãß°¡µÊ)\n"
diff --git a/po/no.po b/po/no.po
index 4b093e385..c9714664a 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -825,7 +825,7 @@ msgstr "Kunne ikke åpne spec fil %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke åpne %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
@@ -855,7 +855,7 @@ msgstr "Kunne ikke lese \"payload\" fra %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive \"payload\" til %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -1464,11 +1464,11 @@ msgstr "ingen pakker\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr "NEI"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr "JA"
 
@@ -1599,7 +1599,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatype %d ikke støttet\n"
@@ -2199,108 +2199,74 @@ msgstr " er i konflikt med %s-%s-%s\n"
 msgid "is needed by"
 msgstr " kreves av %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d omplasser %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "ekskluderer multilib-sti %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "eksluderer %s %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "relokerer %s til %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "relokerer katalog %s til %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke opprette %%%s %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan ikke skrive til %%%s %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, binær funnet\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke inneholder ikke en .spec-fil\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: kjører %s-skript (hvis noen)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "klarte ikke å åpne %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s feilet\n"
@@ -2348,90 +2314,90 @@ msgstr "pakken har verken fileier eller id-lister\n"
 msgid "can't query %s: %s\n"
 msgstr "kan ikke spørre på %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "feil under åpning av %s: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "spørring på %s feilet\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "kildepakker i gammelt format kan ikke spørres\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: lesing av manifest feilet: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "ingen pakker\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "gruppe %s inneholder ingen pakker\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ingen pakke utløser %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ingen pakke krever %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ingen pakke gir %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s eies ikke av noen pakke\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakke %s er ikke installert\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2499,20 +2465,20 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "pakke %s er i konflikt: %s\n"
@@ -2843,18 +2809,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer katalog %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "henter liste over monterte filsystemer\n"
 
@@ -2866,17 +2832,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "mangler    %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "feilede avhengigheter:\n"
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3384,6 +3350,21 @@ msgstr "url-port må være et tall\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d omplasser %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "ekskluderer multilib-sti %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "eksluderer %s %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "relokerer %s til %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "relokerer katalog %s til %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s NO\n"
 #~ msgstr "%s: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 09a5edcb4..b10e9b4b8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -852,7 +852,7 @@ msgstr "Nie mo¿na odczytaæ ikony: %s"
 msgid "Could not open %s: %s\n"
 msgstr "Nie mo¿na otworzyæ %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
@@ -882,7 +882,7 @@ msgstr "Nie mo¿na odczytaæ ikony: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -1509,12 +1509,12 @@ msgstr "znaleziono %d pakietów\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 #, fuzzy
 msgid "NO "
 msgstr "NIE DOBRZE"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1648,7 +1648,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE licznik musi byæ 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ danych %d nie jest obs³ugiwany\n"
@@ -2285,110 +2285,76 @@ msgstr " jest w konflikcie z %s-%s-%s\n"
 msgid "is needed by"
 msgstr " jest wymagany przez %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "Ten OS nie jest wspierany: %s"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "przesuwanie %s do %s\n"
-
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "wy³±czanie %s\n"
-
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "wy³±czanie %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "przesuwanie %s do %s\n"
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "przesuwanie %s do %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nie mo¿na utworzyæ %s"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nie mo¿na zapisaæ do %s"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "spodziewany pakiet ¼ród³owy a nie binarny"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "wykonanie skryptu nie powiod³o siê"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "wykonanie skryptu nie powiod³o siê"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "pakiet: %s-%s-%s test plików = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "u¿ytkownik %s nie istnieje - u¿yto konta root"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s nie istnieje - u¿yto grupy root"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s nie powiod³o siê"
@@ -2437,92 +2403,92 @@ msgstr "pakiet nie ma ani w³a¶ciciela pliku ani list id"
 msgid "can't query %s: %s\n"
 msgstr "nie mo¿na odwi±zaæ %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otwarcie %s nie powiod³o siê\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "odpytywanie %s nie powiod³o siê\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "odpytywanie pliku spec %s nie powiod³o siê, nie mo¿na interpretowaæ\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "znaleziono %d pakietów\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s nie zawiera ¿adnych pakietów\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "¿aden pakiet nie zahacza %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "¿aden pakiet nie wymaga %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "¿aden pakiet nie udostêpnia %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "plik %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "b³êdny numer pakietu: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "numer rekordu pakietu: %d\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "nie mo¿na odczytaæ rekordu %d\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "b³êdny status pliku: %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "Udostêpniane zasoby:"
@@ -2592,20 +2558,20 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, fuzzy, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "       rpm {--version}"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
@@ -2948,18 +2914,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Blok sygnatury: %d\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s pominiêty z powodu flagi missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2977,17 +2943,17 @@ msgstr ""
 "pakiet nie specyfikuje ani nazwy grupy ani list id (to nie powinno siê "
 "zdarzyæ)"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "brak    %s\n"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3507,6 +3473,29 @@ msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiod³o siê\n"
 
 #, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "Ten OS nie jest wspierany: %s"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "przesuwanie %s do %s\n"
+
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "wy³±czanie %s\n"
+
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "wy³±czanie %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "przesuwanie %s do %s\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "przesuwanie %s do %s\n"
+
+#, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
diff --git a/po/pt.po b/po/pt.po
index de9ad579c..c967f7f96 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2000-06-22 01:13+01:00\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires\n"
 "Language-Team: pt <kde@poli.org>\n"
@@ -823,7 +823,7 @@ msgstr "Não consegui ler o cabeçalho de %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "Não consigo aceder ao %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Não consegui gravar o pacote: %s\n"
@@ -853,7 +853,7 @@ msgstr "Não consegui ler o conteúdo de %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Não consegui escrever o conteúdo de %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Gravei: %s\n"
@@ -1464,12 +1464,12 @@ msgstr "nenhum pacote\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) adicionado à cache de dependências.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 #, fuzzy
 msgid "NO "
 msgstr "NÃO-OK"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1602,7 +1602,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "o valor RPM_STRING_TYPE do dataLength() tem de ser 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "O tipo de dados %d não é suportado\n"
@@ -2213,108 +2213,74 @@ msgstr " está em conflito com o %s-%s-%s\n"
 msgid "is needed by"
 msgstr " é necessário pelo %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== mudanças de local\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d excluir o %s\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d mudar de local %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "a exclur a directoria 'multilib' %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "a excluir o %s %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "a mudar o %s para %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "a mudar a directoria %s para %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "não consigo criar o %s: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "não consigo escrever em %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "o pacote de código-fonte não contem um ficheiro .spec\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "a correr os programas de pós-instalação (se existirem)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "pacote: teste dos ficheiros do %s-%s-%s = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "o utilizador %s não existe - a usar o root\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "o grupo %s não existe - a usar o root\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "a abertura do pacote falhou%s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " no ficheiro "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "falhei ao aceder ao %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "O %s falhou\n"
@@ -2362,91 +2328,91 @@ msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n"
 msgid "can't query %s: %s\n"
 msgstr "não consigo pesquisar o %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "o acesso ao %s falhou: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "a pesquisa do %s falhou\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "os pacotes com código-fonte no formato antigo não podem ser pesquisados\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "a pesquisa do ficheiro spec %s falhou, não consigo analisar\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "nenhum pacote\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "o grupo %s não contém nenhum pacote\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nenhum pacote activa o %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nenhum pacote precisa do %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nenhum pacote oferece o %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ficheiro %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "o ficheiro %s não pertence a nenhum pacote\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "número de pacote inválido: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "número de registo do pacote: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "o registo %d não pôde ser lido\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "o pacote %s não está instalado\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "ficheiro db inválido %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s SI (oferecidos pelo db)\n"
@@ -2515,7 +2481,7 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2524,13 +2490,13 @@ msgstr ""
 "A dependência \"B\" precisa duma época (assumindo a mesma que \"A\")\n"
 "\t %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s     A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "requisito %s-%s-%s do pacote não satisfeito: %s\n"
@@ -2862,18 +2828,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "'Pad' ou preenchimento da assinatura: %d\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ignorado devido à opção missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "a excluir a directoria %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "a obter a lista dos sistemas de ficheiros montados\n"
 
@@ -2885,17 +2851,17 @@ msgstr "o pacote não tem o nome de utilizador nem as listas de IDs (nunca deve o
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr "o pacote não tem o nome do grupo nem as listas de IDs (nunca deve ocorrer)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "falta     %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Dependências não satisfeitas para o %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3409,6 +3375,27 @@ msgstr "o porto do URL tem de ser um número\n"
 msgid "failed to create %s: %s\n"
 msgstr "não consegui criar o %s: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== mudanças de local\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d excluir o %s\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d mudar de local %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "a exclur a directoria 'multilib' %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "a excluir o %s %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "a mudar o %s para %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "a mudar a directoria %s para %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s SIM (ficheiros adicionados)\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 50baa6f6c..d71bb9d37 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 
 #: build.c:36
 #, fuzzy
@@ -911,7 +911,7 @@ msgid "Could not open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -946,7 +946,7 @@ msgstr "No consegui abrir: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1620,11 +1620,11 @@ msgstr "pesquise todos os pacotes"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1763,7 +1763,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2406,138 +2406,78 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-# "Project-Id-Version: rpm-2.5.3\n"
-# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
-# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
-# "Language-Team: Portuguese <pt@li.org>\n"
-# "MIME-Version: 1.0\n"
-# "Content-Type: text/plain; charset=ISO-8859-1\n"
-# "Content-Transfer-Encoding: 8-bit\n"
-# , c-format
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "RPM verso %s\n"
-
-# , c-format
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "No consegui abrir: %s\n"
-
-# "Project-Id-Version: rpm-2.5.3\n"
-# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
-# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
-# "Language-Team: Portuguese <pt@li.org>\n"
-# "MIME-Version: 1.0\n"
-# "Content-Type: text/plain; charset=ISO-8859-1\n"
-# "Content-Transfer-Encoding: 8-bit\n"
-# , c-format
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "RPM verso %s\n"
-
-# "Project-Id-Version: rpm-2.5.3\n"
-# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
-# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
-# "Language-Team: Portuguese <pt@li.org>\n"
-# "MIME-Version: 1.0\n"
-# "Content-Type: text/plain; charset=ISO-8859-1\n"
-# "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "RPM verso %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-# , c-format
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "No consegui abrir: %s\n"
-
-# , c-format
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "no execute nenhum estgio"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "Construo falhou.\n"
@@ -2588,94 +2528,94 @@ msgstr "no foi passado pacote para instalao"
 msgid "can't query %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
 # , c-format
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "pesquise todos os pacotes"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, fuzzy, c-format
 msgid "no package triggers %s\n"
 msgstr "no foram passados pacotes para assinatura"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "no foi passado pacote para instalao"
 
 # , c-format
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2747,20 +2687,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "no foi passado pacote para instalao"
@@ -3125,7 +3065,7 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3139,12 +3079,12 @@ msgstr ""
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "RPM verso %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -3156,17 +3096,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "lista dependncias do pacote"
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3698,6 +3638,52 @@ msgstr ""
 msgid "failed to create %s: %s\n"
 msgstr "No consegui abrir o pipe tar: %s\n"
 
+# "Project-Id-Version: rpm-2.5.3\n"
+# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
+# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+# "Language-Team: Portuguese <pt@li.org>\n"
+# "MIME-Version: 1.0\n"
+# "Content-Type: text/plain; charset=ISO-8859-1\n"
+# "Content-Transfer-Encoding: 8-bit\n"
+# , c-format
+#, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "RPM verso %s\n"
+
+# , c-format
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "No consegui abrir: %s\n"
+
+# "Project-Id-Version: rpm-2.5.3\n"
+# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
+# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+# "Language-Team: Portuguese <pt@li.org>\n"
+# "MIME-Version: 1.0\n"
+# "Content-Type: text/plain; charset=ISO-8859-1\n"
+# "Content-Transfer-Encoding: 8-bit\n"
+# , c-format
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "RPM verso %s\n"
+
+# "Project-Id-Version: rpm-2.5.3\n"
+# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
+# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+# "Language-Team: Portuguese <pt@li.org>\n"
+# "MIME-Version: 1.0\n"
+# "Content-Type: text/plain; charset=ISO-8859-1\n"
+# "Content-Transfer-Encoding: 8-bit\n"
+# , c-format
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "RPM verso %s\n"
+
+# , c-format
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "No consegui abrir: %s\n"
+
 #, fuzzy
 #~ msgid "package %s conflicts: %s\n"
 #~ msgstr "no foi passado pacote para desinstalao"
diff --git a/po/ro.po b/po/ro.po
index b32ec3d03..96cdc5090 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -811,7 +811,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -841,7 +841,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1444,11 +1444,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1579,7 +1579,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2164,108 +2164,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2313,90 +2279,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2464,20 +2430,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2806,18 +2772,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2829,17 +2795,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index a41ffae9a..93657dd3a 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-11-12 17:47-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:662 lib/rpmds.c:821
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:662 lib/rpmds.c:821
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2397,11 +2363,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:790
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:820
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:844
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index ccaaeea4f..5f93bff43 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-08-29 13:55-0400\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team:  Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -834,7 +834,7 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÅÒÅÚÁÇÒÕÚÉÔØ ÚÁÇÏÌÏ×ÏË ĞÏÄĞÉÓÉ.\n"
 msgid "Could not open %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ĞÁËÅÔ: %s\n"
@@ -864,7 +864,7 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÉÚ %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "úÁĞÉÓÁÎ: %s\n"
@@ -1485,11 +1485,11 @@ msgstr "ÎÅÔ ĞÁËÅÔÏ×\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr "îåT"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr "äá"
 
@@ -1625,7 +1625,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() ÄÏĞÕÓÔÉÍ ÔÏÌØËÏ ÏÄÉÎ ÜÌÅÍÅÎÔ ÔÉĞÁ RPM_STRING_TYPE\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ôÉĞ ÄÁÎÎÙÈ %d ÎÅ ĞÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
@@ -2229,108 +2229,74 @@ msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n"
 msgid "is needed by"
 msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== ĞÅÒÅÍÅİÅÎÉÊ\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d ÉÓËÌÀŞÅÎ %s\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d ĞÅÒÅÍÅİÅÎÉÅ %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "ÉÓËÌÀŞÁÅÔÓÑ ÍÎÏÇÏÂÉÂÌÉÏÔÅŞÎÙÊ ĞÕÔØ %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "ÉÓËÌÀŞÁÅÔÓÑ %s %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "ĞÅÒÅÍÅİÁÅÔÓÑ %s × %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "ĞÅÒÅÍÅİÁÅÔÓÑ ËÁÔÁÌÏÇ %s × %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÉÓÁÔØ × %%%s %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉŞÎÙÊ ĞÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "ÉÓÈÏÄÎÙÊ ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: ×ÙĞÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "ÏÛÉÂËÁ ×ÙĞÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, waitpid() ×ÏÚ×ÒÁÔÉÌ %s\n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "ÏÛÉÂËÁ ×ÙĞÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, ËÏÄ ×ÏÚ×ÒÁÔÁ %d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, test = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ĞÒÏĞÕÓËÁÅÔÓÑ\n"
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "ĞÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ - ÉÓĞÏÌØÚÕÅÔÓÑ root\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ÇÒÕĞĞÁ %s ÎÅ ÓÕİÅÓÔ×ÕÅÔ - ÉÓĞÏÌØÚÕÅÔÓÑ root\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "ÒÁÓĞÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " ÎÁ ÆÁÊÌÅ "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n"
@@ -2378,91 +2344,91 @@ msgstr "ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓĞÉÓËÏ× ÎÉ ÈÏÚÑÅ× ÆÁÊÌÏ×, ÎÉ ÉÈ ID\n"
 msgid "can't query %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁĞÒÏÓÉÔØ %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "ÏÛÉÂËÁ ÚÁĞÒÏÓÁ %s\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "ÚÁĞÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ĞÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ ŞÔÅÎÉÑ ÓĞÉÓËÁ ÆÁÊÌÏ×: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "ÚÁĞÒÏÓ ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ %s ÎÅ ÕÄÁÌÓÑ, ÎÅ×ÏÚÍÏÖÎÏ ÒÁÚÏÂÒÁÔØ ÆÁÊÌ\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "ÎÅÔ ĞÁËÅÔÏ×\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "ÇÒÕĞĞÁ %s ÎÅ ÓÏÄÅÒÖÉÔ ÎÉËÁËÉÈ ĞÁËÅÔÏ×\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ÔÒÅÂÕÅÔ %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ĞÒÅÄÏÓÔÁ×ÌÑÅÔ %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ÆÁÊÌ %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "ÆÁÊÌ %s ÎÅ ĞÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ĞÁËÅÔÏ×\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ĞÁËÅÔÁ: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "ÎÏÍÅÒ ÚÁĞÉÓÉ ĞÁËÅÔÁ: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÚÁĞÉÓØ %u\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "ĞÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s YES (db provides)\n"
@@ -2531,7 +2497,7 @@ msgid "OK"
 msgstr "Oë"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2540,13 +2506,13 @@ msgstr ""
 "ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "ÔÒÅÂÏ×ÁÎÉÑ ĞÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
@@ -2879,18 +2845,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "ğÏÄĞÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁĞÏÌÎÅÎÉÅ(%d)\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ĞÒÏĞÕİÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ÉÓËÌÀŞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "ĞÏÌÕŞÅÎÉÅ ÓĞÉÓËÁ ÓÍÏÎÔÉÒÏ×ÁÎÎÙÈ ÆÁÊÌÏ×ÙÈ ÓÉÓÔÅÍ\n"
 
@@ -2906,17 +2872,17 @@ msgstr ""
 "× ĞÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÇÒÕĞĞ, ÎÉ ÓĞÉÓËÁ ÉÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× (ÔÁËÏÇÏ ÎÅ ÄÏÌÖÎÏ "
 "ÂÙÔØ)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr "%s-%s-%s: ÎÅĞÒÁ×ÉÌØÎÁÑ ĞÏÄĞÉÓØ ÏÂÌÁÓÔÉ ÚÁÇÏÌÏ×ËÁ ĞÁËÅÔÁ\n"
@@ -3435,6 +3401,27 @@ msgstr "url ĞÏÒÔ ÄÏÌÖÅÎ ÂÙÔØ ŞÉÓÌÏÍ\n"
 msgid "failed to create %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== ĞÅÒÅÍÅİÅÎÉÊ\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d ÉÓËÌÀŞÅÎ %s\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d ĞÅÒÅÍÅİÅÎÉÅ %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "ÉÓËÌÀŞÁÅÔÓÑ ÍÎÏÇÏÂÉÂÌÉÏÔÅŞÎÙÊ ĞÕÔØ %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "ÉÓËÌÀŞÁÅÔÓÑ %s %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "ĞÅÒÅÍÅİÁÅÔÓÑ %s × %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "ĞÅÒÅÍÅİÁÅÔÓÑ ËÁÔÁÌÏÇ %s × %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s YES (added files)\n"
diff --git a/po/sk.po b/po/sk.po
index f95455489..63049c5a5 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -850,7 +850,7 @@ msgstr "Nie je mo¾né preèíta» ikonu: %s"
 msgid "Could not open %s: %s\n"
 msgstr "Otvorenie %s zlyhalo\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie je mo¾né zapísa» balík: %s"
@@ -880,7 +880,7 @@ msgstr "Nie je mo¾né preèíta» ikonu: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie je mo¾né zapísa» balík: %s"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapísané: %s\n"
@@ -1508,12 +1508,12 @@ msgstr "nájdenıch %d balíkov\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 #, fuzzy
 msgid "NO "
 msgstr "NIE JE V PORIADKU"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1647,7 +1647,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabData() RPM_STRING_TYPE poèet musí by» 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ údajov %d nie je podorovanı\n"
@@ -2282,110 +2282,76 @@ msgstr " koliduje s %s-%s-%s\n"
 msgid "is needed by"
 msgstr " je vy¾adované %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "OS je vynechanı: %s"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "presúva sa %s do %s\n"
-
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "vynecháva sa %s\n"
-
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "vynecháva sa %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "presúva sa %s do %s\n"
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "presúva sa %s do %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "oèakávanı zdrojovı balík, nájdenı binárny"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "zdrojovı balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "balík: %s-%s-%s test súborov = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou¾ije sa root"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalenie archívu zlyhalo%s%s: %s"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " pre súbor "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nepodarilo sa otvori» %s: %s"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s zlyhalo"
@@ -2434,92 +2400,92 @@ msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií"
 msgid "can't query %s: %s\n"
 msgstr "zmazanie %s zlyhalo: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otvorenie %s zlyhalo\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "otázka na %s zlyhala\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "nie je mo¾né pıta» sa zdrojovıch balíkov v starom formáte\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "otázka na spec-súbor %s zlyhala, nie je mo¾né analyzova»\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "nájdenıch %d balíkov\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje ¾iadne balíky\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "¾iadny z balíkov nespú¹»a %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "¾iadny z balíkov nevy¾aduje %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "¾iadny z balíkov neposkytuje %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "súbor %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "chybné èíslo balíku: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "po¾aduje sa záznam èíslo %d\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "záznam %d nie je mo¾né preèíta»\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balík %s nie je nain¹talovanı\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "chybnı stav súboru: %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "Poskytuje:"
@@ -2589,20 +2555,20 @@ msgid "OK"
 msgstr "V PORIADKU"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, fuzzy, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "          rpm {--version}"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
@@ -2945,18 +2911,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Doplnenie podpisu: %d\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s vynechané kvôli príznaku missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2974,17 +2940,17 @@ msgstr ""
 "v balíku chıba tak meno skupiny, ako aj zoznamy identifikácií (nemalo by sa "
 "nikdy sta»)"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "chıbajúce    %s\n"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3504,6 +3470,29 @@ msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvori» %s\n"
 
 #, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "OS je vynechanı: %s"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "presúva sa %s do %s\n"
+
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "vynecháva sa %s\n"
+
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "vynecháva sa %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "presúva sa %s do %s\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "presúva sa %s do %s\n"
+
+#, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "súbor %s nie je vlastnenı ¾iadnym balíkom\n"
 
diff --git a/po/sl.po b/po/sl.po
index 96d98e620..8b7d91ce8 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.202 2001/11/12 20:51:33 jbj Exp $
+# $Id: sl.po,v 1.203 2001/11/13 19:05:11 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -848,7 +848,7 @@ msgstr "Ikone %s ni mo¾no prebrati: %s"
 msgid "Could not open %s: %s\n"
 msgstr "Ni mo¾no odpreti %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ni mo¾no zapisati paketa: %s"
@@ -878,7 +878,7 @@ msgstr "Ikone %s ni mo¾no prebrati: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ni mo¾no zapisati paketa %s: %s"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -1509,12 +1509,12 @@ msgstr "ni paketov\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 #, fuzzy
 msgid "NO "
 msgstr "NI DOBRO"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1648,7 +1648,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "¹tevec grabData() RPM_STRING_TYPE mora biti 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Tip podatkov %d ni podprt\n"
@@ -2281,110 +2281,76 @@ msgstr " je v sporu z %s-%s-%s\n"
 msgid "is needed by"
 msgstr " potrebuje %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "OS je izkljuèen: %s"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "premikanje %s v %s\n"
-
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "izkljuèevanje datoteke %s%s\n"
-
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "izkljuèevanje datoteke %s%s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "premikanje %s v %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "premiokanje imenika %s v %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "ni mo¾no ustvariti %s: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "pisanje na %s ni mo¾no"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "prièakovan je bil izvorni paket, najden binarni"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "izvorni paket ne vsebuje datoteke .spec"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "skript se ni uspe¹no izvedel"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "skript se ni uspe¹no izvedel"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "paket: %s-%s-%s datoteke test = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "uporabnik %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "raz¹iritev arhiva je bilo neuspe¹no%s%s: %s"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " za datoteko "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspe¹no odpiranje %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s neuspe¹en"
@@ -2433,92 +2399,92 @@ msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
 msgid "can't query %s: %s\n"
 msgstr "ni mo¾no poizvedeti o %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "odpiranje %s je bilo neuspe¹no: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "poizvedba po %s je bila neuspe¹na\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "poizvedba po datoteki spec. %s je bila neuspe¹na, razèlemba ni mo¾na\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "ni paketov\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s ne vsebuje nobenega paketa\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "noben paket ne pro¾i %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "noben paket ne potrebuje %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "noben paket ne nudi %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "datoteka %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ni del nobenega paketa\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neveljavna ¹tevilka paketa: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "¹tevilka zapisa paketa: %d\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "zapisa %d ni mo¾no prebrati\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s ni name¹èen\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "po¹kodovana zbirka podatkov %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s DA (db ponudbe)\n"
@@ -2587,7 +2553,7 @@ msgid "OK"
 msgstr "V REDU"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2596,13 +2562,13 @@ msgstr ""
 "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
@@ -2943,18 +2909,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Dol¾. polnila : %d\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "izkljuèevanje imenika %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "zbiranje seznama priklopljenih datoteènih sistemov.\n"
 
@@ -2970,17 +2936,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "v paketu manjka tako seznam skupin kot identitet (to se ne sme zgoditi)"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "manjka     %s\n"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3507,6 +3473,28 @@ msgid "failed to create %s: %s\n"
 msgstr "neuspe¹no ustvarjanje %s: %s\n"
 
 #, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "OS je izkljuèen: %s"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "premikanje %s v %s\n"
+
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "izkljuèevanje datoteke %s%s\n"
+
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "izkljuèevanje datoteke %s%s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "premikanje %s v %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "premiokanje imenika %s v %s\n"
+
+#, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s DA (dodane datoteke)\n"
 
diff --git a/po/sr.po b/po/sr.po
index de1b78c2d..df775604b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -833,7 +833,7 @@ msgstr "Ne mogu da upi¹em %s"
 msgid "Could not open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ne mogu da upi¹em %s"
@@ -863,7 +863,7 @@ msgstr "Ne mogu da upi¹em %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1493,11 +1493,11 @@ msgstr "upit nad svim paketima"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1630,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2268,109 +2268,75 @@ msgstr " se sudara sa %s-%s-%s\n"
 msgid "is needed by"
 msgstr " je potreban paketu %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, fuzzy, c-format
-msgid "%5d exclude  %s\n"
-msgstr "Pribavljam %s\n"
-
-#: lib/psm.c:256
-#, fuzzy, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "Ne mogu da otvorim datoteku %s: "
-
-#: lib/psm.c:326
-#, fuzzy, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "Pribavljam %s\n"
-
-#: lib/psm.c:392
-#, fuzzy, c-format
-msgid "excluding %s %s\n"
-msgstr "Pribavljam %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, fuzzy, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "nemoj izvr¹iti nijednu fazu"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "neuspelo izvr¹avanje skripta"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "neuspelo izvr¹avanje skripta"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "PGP omanuo"
@@ -2420,92 +2386,92 @@ msgstr "paket nema imena"
 msgid "can't query %s: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "Upit se ne mo¾e izvesti nad izvorni paketima u starom formatu\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 #, fuzzy
 msgid "no packages\n"
 msgstr "upit nad svim paketima"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nijedan paket ne zahteva %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nijedan paket ne obezbeğuje %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "pogre¹an broj paketa: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "pogre¹an broj paketa: %s\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "ne mogu da proèitam slog %d\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
@@ -2576,20 +2542,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s nije naveden u %s"
@@ -2934,18 +2900,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2957,17 +2923,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "nedostaje { posle %"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Nezadovoljene meğuzavisnosti za %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
@@ -3490,6 +3456,26 @@ msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
 #, fuzzy
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "Pribavljam %s\n"
+
+#, fuzzy
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "Ne mogu da otvorim datoteku %s: "
+
+#, fuzzy
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "Pribavljam %s\n"
+
+#, fuzzy
+#~ msgid "excluding %s %s\n"
+#~ msgstr "Pribavljam %s\n"
+
+#, fuzzy
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
+
+#, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "datoteka %s ne pripada nijednom paketu\n"
 
diff --git a/po/sv.po b/po/sv.po
index acf043923..6eb98477a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-09-12 14:18+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -825,7 +825,7 @@ msgstr "Kan inte läsa om signaturhuvud.\n"
 msgid "Could not open %s: %s\n"
 msgstr "Kunde inte öppna %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunde inte skriva paket: %s\n"
@@ -855,7 +855,7 @@ msgstr "Kan inte läsa last från %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kan inte skriva last till %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -1470,11 +1470,11 @@ msgstr "inga paket\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr "NEJ "
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr "JA"
 
@@ -1609,7 +1609,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() RPM_STRING_TYPE antal måste vara 1.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatyp %d stöds inte\n"
@@ -2212,109 +2212,75 @@ msgstr " står i konflikt med %s-%s-%s\n"
 msgid "is needed by"
 msgstr " behövs av %s-%s-%s\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== omflyttningar\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d utesluter  %s\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d flyttar om %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "hoppar över multilib-sökväg %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "hoppar över %s %s\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "flyttar %s till %s\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "flyttar katalogen %s till %s\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan inte skapa %%%s %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan inte skriva till %%%s %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "källpaket förväntades, fann binärpaket\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "källpaket innehåller ingen .spec-fil\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: kör (eventuellt) %s-skript\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 "körning av %s-skript från %s-%s-%s misslyckades, waitpid returnerade %s\n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "körning av %s-skript från %s-%s-%s misslyckades, slutstatus %d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s har %d filer, test = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s-skript misslyckades (%d), hoppar över %s-%s-%s\n"
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "användare %s finns inte - använder root\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupp %s finns inte - använder root\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "uppackning av arkiv misslyckades%s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s misslyckades på fil %s: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s misslyckades: %s\n"
@@ -2362,91 +2328,91 @@ msgstr "paketet har varken filägare eller id-listor\n"
 msgid "can't query %s: %s\n"
 msgstr "kan inte fråga %s: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "misslyckades med att öppna %s: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "fråga av %s misslyckades\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "källpaket i gammalt format går inte att fråga om\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: läsning av paketlista misslyckades: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "fråga av specfil %s misslyckades, kan inte tolka\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "inga paket\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupp %s innehåller inga paket\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "inga paketutlösare %s\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "inget paket behöver %s\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "inget paket tillhandahåller %s\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s tillhör inget paket\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "felaktigt paketnummer: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paketpost nummer: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "post %u kunde inte läsas\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s är inte installerat\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "felaktig db-fil %s\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s JA (db-tillhandahållande)\n"
@@ -2515,7 +2481,7 @@ msgid "OK"
 msgstr "OK"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2524,13 +2490,13 @@ msgstr ""
 "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
@@ -2864,18 +2830,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s överhoppad på grund av missingok-flagga\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "hoppar över katalogen %s\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "hämtar lista över monterade filsystem\n"
 
@@ -2890,17 +2856,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "paketet saknar både gruppnamn och id-listor (detta borde aldrig inträffa)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "saknas     %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "Ouppfyllda beroenden för %s-%s-%s: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr "%s-%s-%s: kontrollsumma för oföränderlig huvudregion misslyckades\n"
@@ -3415,6 +3381,27 @@ msgstr "url-port måste vara ett tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== omflyttningar\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d utesluter  %s\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d flyttar om %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "hoppar över multilib-sökväg %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "hoppar över %s %s\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "flyttar %s till %s\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "flyttar katalogen %s till %s\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s JA (lade till filer)\n"
diff --git a/po/tr.po b/po/tr.po
index 9b93830d1..8686733f4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -836,7 +836,7 @@ msgstr "%s'den başlık okunamadı: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "paket yazılamadı: %s\n"
@@ -866,7 +866,7 @@ msgstr "%s'den payload okunamadı: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s'e payload yazılamadı: %s\n"
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Yazıldı: %s\n"
@@ -1490,11 +1490,11 @@ msgstr "paket yok\n"
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) Bağımlılar alanına eklendi.\n"
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr "HAYIR "
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr "EVET"
 
@@ -1629,7 +1629,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() RPM_STRING_TYPE sayısı 1 olmalı.\n"
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "%d veri türü desteklenmiyor\n"
@@ -2236,108 +2236,74 @@ msgstr " %s-%s-%s ile çelişiyor\n"
 msgid "is needed by"
 msgstr " %s-%s-%s için gerekli\n"
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr "========== yeniden konumlama\n"
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr "%5d %s'i dışlıyor\n"
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr "%5d yeniden konumlandırılıyor: %s -> %s\n"
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr "multilib dosya yolu dışlanıyor %s%s\n"
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr "%s %s dışlanıyor\n"
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr "%s %s'e konumlanıyor\n"
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr "%s dizini %s de yeniden konumlanıyor\n"
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s dosyası oluşturulamıyor: %s\n"
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s dosyasına yazılamaz %s\n"
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr "kaynak paketi gerekirken çalıştırılabilir paketi bulundu\n"
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr "kaynak paketi .spec dosyası içermiyor\n"
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s betiği çalıştırılıyor (varsa)\n"
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "%s betiğinin %s-%s-%s'den icrası başarısız, waitpid sonucu %s\n"
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "%s betiğinin %s-%s-%s'den icrası başarısız, çıkışta durum %d\n"
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, fuzzy, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s %d dosya içeriyor, test = %d\n"
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s betiği başarısız (%d), %s-%s-%s atlanıyor\n"
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "kullanıcı %s yok - root kullanılacak\n"
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grup %s yok - root kullanılacak\n"
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "arşiv paketi açılırken başarısız%s%s: %s\n"
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr " dosyada "
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s başarısız\n"
@@ -2385,91 +2351,91 @@ msgstr "paket ne dosya sahibi ne de kimlik listesi içeriyor\n"
 msgid "can't query %s: %s\n"
 msgstr "%s sorgulanamıyor: %s\n"
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s 'nin sorgulaması başarısızlıkla sonuçlandı\n"
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr "eski biçem kaynak paketleri sorgulanamaz\n"
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: bildirge okuma başarısız: %s\n"
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s spec dosyasının sorgulanması başarısız, çözümlenemiyor\n"
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr "paket yok\n"
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "%s grubu hiç paket içermiyor\n"
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s tetikleyen paket yok\n"
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s gerektiren paket yok\n"
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s sağlayan paket yok\n"
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr "dosya %s: %s\n"
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "%s dosyası, hiç bir pakete ait değil\n"
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "geçersiz paket numarası: %s\n"
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paket kayıt numarası: %u\n"
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "%u. kayıt okunamadı\n"
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s paketi kurulu değil\n"
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 #, fuzzy
 msgid "(added files)"
 msgstr "db dosyası %s hatalı\n"
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s EVET (db sağlar)\n"
@@ -2538,7 +2504,7 @@ msgid "OK"
 msgstr "Tamam"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, fuzzy, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -2547,13 +2513,13 @@ msgstr ""
 "\"B\" bağımlılığı bir dönemsellik gerektirir (tabii ki \"A\" da)\n"
 "\tA %s\tB %s\n"
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, fuzzy, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr "paket %s-%s-%s gereksinimi tatmin edici değil: %s\n"
@@ -2885,18 +2851,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "İmza: boyut(%d)+iz(%d)\n"
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "missingok flamasından dolayı %s atlandı\n"
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s dizini dışlanıyor\n"
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr "bağlı dosya sistemlerinin listesi alınıyor\n"
 
@@ -2911,17 +2877,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "paket hem grup ismi hem de kimlik listelerinden yoksun (bu hiç iyi değil)\n"
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr "eksik      %s"
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, fuzzy, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr "%s-%s-%s için tatmin edici olmayan bağımlılıklar: "
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr "%s-%s-%s: değişmez başlık alanı özet denetimi başarısız\n"
@@ -3439,6 +3405,27 @@ msgstr "url portu bir sayı olmalı\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s oluşturulamadı: %s\n"
 
+#~ msgid "========== relocations\n"
+#~ msgstr "========== yeniden konumlama\n"
+
+#~ msgid "%5d exclude  %s\n"
+#~ msgstr "%5d %s'i dışlıyor\n"
+
+#~ msgid "%5d relocate %s -> %s\n"
+#~ msgstr "%5d yeniden konumlandırılıyor: %s -> %s\n"
+
+#~ msgid "excluding multilib path %s%s\n"
+#~ msgstr "multilib dosya yolu dışlanıyor %s%s\n"
+
+#~ msgid "excluding %s %s\n"
+#~ msgstr "%s %s dışlanıyor\n"
+
+#~ msgid "relocating %s to %s\n"
+#~ msgstr "%s %s'e konumlanıyor\n"
+
+#~ msgid "relocating directory %s to %s\n"
+#~ msgstr "%s dizini %s de yeniden konumlanıyor\n"
+
 #, fuzzy
 #~ msgid "%9s: %-45s YES (added files)\n"
 #~ msgstr "%s: %-45s EVET (dosyalar eklendi)\n"
diff --git a/po/uk.po b/po/uk.po
index 432fb27ec..3aefd71bc 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 432fb27ec..3aefd71bc 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 432fb27ec..3aefd71bc 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 432fb27ec..3aefd71bc 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-11-12 15:50-0500\n"
+"POT-Creation-Date: 2001-11-13 13:56-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"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1876
+#: build/pack.c:603 lib/psm.c:1423
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -846,7 +846,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:2141
+#: build/pack.c:683 lib/psm.c:1688
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1449,11 +1449,11 @@ msgstr ""
 msgid "%9s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:795 lib/rpmds.c:656 lib/rpmds.c:814
+#: lib/depends.c:795 lib/rpmds.c:407 lib/rpmds.c:566
 msgid "YES"
 msgstr ""
 
@@ -1584,7 +1584,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:699
+#: lib/header.c:384 lib/header_internal.c:161 lib/psm.c:246
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2169,108 +2169,74 @@ msgstr ""
 msgid "is needed by"
 msgstr ""
 
-#: lib/psm.c:249
-msgid "========== relocations\n"
-msgstr ""
-
-#: lib/psm.c:253
-#, c-format
-msgid "%5d exclude  %s\n"
-msgstr ""
-
-#: lib/psm.c:256
-#, c-format
-msgid "%5d relocate %s -> %s\n"
-msgstr ""
-
-#: lib/psm.c:326
-#, c-format
-msgid "excluding multilib path %s%s\n"
-msgstr ""
-
-#: lib/psm.c:392
-#, c-format
-msgid "excluding %s %s\n"
-msgstr ""
-
-#: lib/psm.c:402
-#, c-format
-msgid "relocating %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:481
-#, c-format
-msgid "relocating directory %s to %s\n"
-msgstr ""
-
-#: lib/psm.c:896
+#: lib/psm.c:443
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:902
+#: lib/psm.c:449
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:943
+#: lib/psm.c:490
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1057
+#: lib/psm.c:604
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1167
+#: lib/psm.c:714
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1335
+#: lib/psm.c:882
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1342
+#: lib/psm.c:889
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1684
+#: lib/psm.c:1231
 #, c-format
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1801
+#: lib/psm.c:1348
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1912
+#: lib/psm.c:1459
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1921
+#: lib/psm.c:1468
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1962
+#: lib/psm.c:1509
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1963
+#: lib/psm.c:1510
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:1696
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2152
+#: lib/psm.c:1699
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2318,90 +2284,90 @@ msgstr ""
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:328 lib/rpminstall.c:470
+#: lib/query.c:599 lib/query.c:637 lib/rpminstall.c:328 lib/rpminstall.c:470
 #: lib/rpminstall.c:840
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:616
+#: lib/query.c:615
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:622
+#: lib/query.c:621
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:648 lib/rpminstall.c:483
+#: lib/query.c:647 lib/rpminstall.c:483
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:692
+#: lib/query.c:691
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:716
+#: lib/query.c:712
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:736
+#: lib/query.c:732
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:746
+#: lib/query.c:742
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:756
+#: lib/query.c:752
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:767
+#: lib/query.c:763
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:804
+#: lib/query.c:798
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:808
+#: lib/query.c:802
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:835
+#: lib/query.c:829
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:838
+#: lib/query.c:832
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:843
+#: lib/query.c:837
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:854 lib/rpminstall.c:628
+#: lib/query.c:848 lib/rpminstall.c:628
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:643
+#: lib/rpmal.c:647
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:739
+#: lib/rpmal.c:744
 msgid "(added provide)"
 msgstr ""
 
@@ -2469,20 +2435,20 @@ msgid "OK"
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/rpmds.c:784
+#: lib/rpmds.c:535
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/rpmds.c:813
+#: lib/rpmds.c:565
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
 #. @=branchstate@
-#: lib/rpmds.c:837
+#: lib/rpmds.c:589
 #, c-format
 msgid "package %s has unsatisfied %s: %s\n"
 msgstr ""
@@ -2811,18 +2777,18 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:187
+#: lib/transaction.c:185
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:858
+#: lib/transaction.c:850
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
 
-#: lib/transaction.c:929
+#: lib/transaction.c:918
 msgid "getting list of mounted filesystems\n"
 msgstr ""
 
@@ -2834,17 +2800,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:418
+#: lib/verify.c:408
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:515
+#: lib/verify.c:505
 #, c-format
 msgid "Unsatisifed dependencies for %s: "
 msgstr ""
 
-#: lib/verify.c:553
+#: lib/verify.c:543
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/rpm.spec b/rpm.spec
index 86a295e33..81ed4689d 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -576,3 +576,5 @@ fi
 - eliminate header reference in rpmtransAddPackage, use TFI_t data.
 - commit to using rpmDepSet and TFI_t, not header.
 - lclint rpmio fiddles.
+- split file info tag sets into rpmfi.c.
+- create toy TFI_t iterators.
diff --git a/rpm.spec.in b/rpm.spec.in
index a96f42b61..fd3d4f65a 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -576,3 +576,5 @@ fi
 - eliminate header reference in rpmtransAddPackage, use TFI_t data.
 - commit to using rpmDepSet and TFI_t, not header.
 - lclint rpmio fiddles.
+- split file info tag sets into rpmfi.c.
+- create toy TFI_t iterators.