44 files changed, 3048 insertions, 3180 deletions

diff --git a/CHANGES b/CHANGES
index b95a65868..eabbffb65 100644
--- a/CHANGES
+++ b/CHANGES
@@ -31,6 +31,7 @@
 	- memory indices for dependency check are typedef'd and abstract'd.
 	- no-brainer refcounts for fi object, debug the mess.
 	- dump the header early in transaction, recreate fi before installing.
+	- start hiding availablePackage data/methods in rpmal.c/rpmal.h.
 
 4.0.3 -> 4.0.4:
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index b0fa3a0c8..2b96f6e91 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 \
-	rpmlead.h signature.h
+	rpmal.h rpmlead.h signature.h
 
 mylibpaths = \
 	-L$(top_builddir)/lib/.libs \
@@ -37,7 +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 \
-	rpmchecksig.c rpminstall.c rpmlead.c rpmlibprov.c rpmrc.c rpmvercmp.c \
+	rpmal.c rpmchecksig.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 e4e5b4368..50b97c827 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -9,6 +9,7 @@
 #include <rpmpgp.h>		/* XXX pgpFreeDig */
 
 #include "depends.h"
+#include "rpmal.h"
 #include "rpmdb.h"		/* XXX response cache needs dbiOpen et al. */
 
 #include "debug.h"
@@ -30,9 +31,7 @@
 /*@access availableList@*/
 /*@access problemsSet@*/
 /*@access orderListIndex@*/
-
-/*@unchecked@*/
-static int _debug = 0;
+/*@access tsortInfo@*/
 
 /*@unchecked@*/
 static int _cacheDependsRC = 1;
@@ -109,486 +108,6 @@ static /*@only@*/ const char *buildEVR(int_32 *e, const char *v, const char *r)
 #endif
 
 /**
- * Destroy available item index.
- * @param al		available list
- */
-static void alFreeIndex(availableList al)
-	/*@modifies al @*/
-{
-    if (al->index.size) {
-	al->index.index = _free(al->index.index);
-	al->index.size = 0;
-    }
-}
-
-/**
- * Initialize available packckages, items, and directories list.
- * @param al		available list
- */
-static void alCreate(availableList al)
-	/*@modifies al @*/
-{
-    al->alloced = al->delta;
-    al->size = 0;
-    al->list = xcalloc(al->alloced, sizeof(*al->list));
-
-    al->index.index = NULL;
-    al->index.size = 0;
-
-    al->numDirs = 0;
-    al->dirs = NULL;
-}
-
-/**
- * Free available packages, items, and directories members.
- * @param al		available list
- */
-static void alFree(availableList al)
-	/*@modifies al @*/
-{
-    HFD_t hfd = headerFreeData;
-    availablePackage p;
-    rpmRelocation * r;
-    int i;
-
-    if ((p = al->list) != NULL)
-    for (i = 0; i < al->size; i++, p++) {
-
-	{   struct tsortInfo * tsi;
-	    while ((tsi = p->tsi.tsi_next) != NULL) {
-		p->tsi.tsi_next = tsi->tsi_next;
-		tsi->tsi_next = NULL;
-		tsi = _free(tsi);
-	    }
-	}
-
-	p->provides = hfd(p->provides, -1);
-	p->providesEVR = hfd(p->providesEVR, -1);
-	p->requires = hfd(p->requires, -1);
-	p->requiresEVR = hfd(p->requiresEVR, -1);
-	p->baseNames = hfd(p->baseNames, -1);
-	p->h = headerFree(p->h);
-
-	if (p->relocs) {
-	    for (r = p->relocs; (r->oldPath || r->newPath); r++) {
-		r->oldPath = _free(r->oldPath);
-		r->newPath = _free(r->newPath);
-	    }
-	    p->relocs = _free(p->relocs);
-	}
-	/*@-type@*/ /* FIX: cast? */
-	if (p->fd != NULL)
-	    p->fd = fdFree(p->fd, "alAddPackage (alFree)");
-	/*@=type@*/
-    }
-
-    if (al->dirs != NULL)
-    for (i = 0; i < al->numDirs; i++) {
-	al->dirs[i].dirName = _free(al->dirs[i].dirName);
-	al->dirs[i].files = _free(al->dirs[i].files);
-    }
-
-    al->dirs = _free(al->dirs);
-    al->numDirs = 0;
-    al->list = _free(al->list);
-    al->alloced = 0;
-    alFreeIndex(al);
-}
-
-/**
- * Compare two directory info entries by name (qsort/bsearch).
- * @param one		1st directory info
- * @param two		2nd directory info
- * @return		result of comparison
- */
-static int dirInfoCompare(const void * one, const void * two)	/*@*/
-{
-    /*@-castexpose@*/
-    const dirInfo a = (const dirInfo) one;
-    const dirInfo b = (const dirInfo) two;
-    /*@=castexpose@*/
-    int lenchk = a->dirNameLen - b->dirNameLen;
-
-    if (lenchk)
-	return lenchk;
-
-    /* XXX FIXME: this might do "backward" strcmp for speed */
-    return strcmp(a->dirName, b->dirName);
-}
-
-/**
- * Delete package from available list.
- * @param al		available list
- * @param pkgNnum	package index
- */
-static void
-alDelPackage(availableList al, int pkgNum)
-	/*@modifies al @*/
-{
-    HGE_t hge = (HGE_t)headerGetEntryMinMemory;
-    HFD_t hfd = headerFreeData;
-    availablePackage p;
-
-    /*@-nullptrarith@*/ /* FIX: al->list might be NULL */
-    p = al->list + pkgNum;
-    /*@=nullptrarith@*/
-
-/*@-modfilesys@*/
-if (_debug)
-fprintf(stderr, "*** del %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->version, p->release);
-/*@=modfilesys@*/
-
-    if (p->relocs) {
-	rpmRelocation * r;
-	for (r = p->relocs; r->oldPath || r->newPath; r++) {
-	    r->oldPath = _free(r->oldPath);
-	    r->newPath = _free(r->newPath);
-	}
-	p->relocs = _free(p->relocs);
-    }
-    if (p->fd) {
-	/*@-type@*/ /* FIX: cast? */
-	(void) fdFree(p->fd, "alDelPackage");
-	/*@=type@*/
-	p->fd = NULL;
-    }
-
-    if (p->baseNames != NULL && p->filesCount > 0) {
-	int origNumDirs = al->numDirs;
-	const char ** dirNames;
-	int_32 numDirs;
-	rpmTagType dnt;
-	int dirNum;
-	dirInfo dirNeedle =
-		memset(alloca(sizeof(*dirNeedle)), 0, sizeof(*dirNeedle));
-	dirInfo dirMatch;
-	int last;
-	int i, xx;
-
-	xx = hge(p->h, RPMTAG_DIRNAMES, &dnt, (void **) &dirNames, &numDirs);
-
-	/* XXX FIXME: We ought to relocate the directory list here */
-
-	if (al->dirs != NULL)
-	for (dirNum = al->numDirs - 1; dirNum >= 0; dirNum--) {
-	    dirNeedle->dirName = (char *) dirNames[dirNum];
-	    dirNeedle->dirNameLen = strlen(dirNames[dirNum]);
-	    dirMatch = bsearch(dirNeedle, al->dirs, al->numDirs,
-			       sizeof(*dirNeedle), dirInfoCompare);
-	    if (dirMatch == NULL)
-		continue;
-	    last = dirMatch->numFiles;
-	    for (i = dirMatch->numFiles - 1; i >= 0; i--) {
-		if (dirMatch->files[i].pkgNum != pkgNum)
-		    /*@innercontinue@*/ continue;
-		dirMatch->numFiles--;
-		if (i > dirMatch->numFiles)
-		    /*@innercontinue@*/ continue;
-		memmove(dirMatch->files, dirMatch->files+1,
-			(dirMatch->numFiles - i));
-	    }
-	    if (dirMatch->numFiles > 0) {
-		if (last > i)
-		    dirMatch->files = xrealloc(dirMatch->files,
-			dirMatch->numFiles * sizeof(*dirMatch->files));
-		continue;
-	    }
-	    dirMatch->files = _free(dirMatch->files);
-	    dirMatch->dirName = _free(dirMatch->dirName);
-	    al->numDirs--;
-	    if (dirNum > al->numDirs)
-		continue;
-	    memmove(dirMatch, dirMatch+1, (al->numDirs - dirNum));
-	}
-
-	if (origNumDirs > al->numDirs) {
-	    if (al->numDirs > 0)
-		al->dirs = xrealloc(al->dirs, al->numDirs * sizeof(*al->dirs));
-	    else
-		al->dirs = _free(al->dirs);
-	}
-
-	dirNames = hfd(dirNames, dnt);
-    }
-    p->h = headerFree(p->h);
-    memset(p, 0, sizeof(*p));
-    /*@-nullstate@*/ /* FIX: al->list->h may be NULL */
-    return;
-    /*@=nullstate@*/
-}
-
-/**
- * Add package to available list.
- * @param al		available list
- * @param pkgNnum	package index, < 0 to force an append
- * @param h		package header
- * @param key		package private data
- * @param fd		package file handle
- * @param relocs	package file relocations
- * @return		available package pointer
- */
-static /*@exposed@*/ availablePackage
-alAddPackage(availableList al, int pkgNum,
-		Header h, /*@null@*/ /*@dependent@*/ const void * key,
-		/*@null@*/ FD_t fd, /*@null@*/ rpmRelocation * relocs)
-	/*@modifies al, h @*/
-{
-    HGE_t hge = (HGE_t)headerGetEntryMinMemory;
-    HFD_t hfd = headerFreeData;
-    rpmTagType dnt, bnt;
-    availablePackage p;
-    int i, xx;
-    uint_32 multiLibMask = 0;
-    uint_32 * pp = NULL;
-
-    if (pkgNum >= 0 && pkgNum < al->size) {
-	alDelPackage(al, pkgNum);
-    } else {
-	if (al->size == al->alloced) {
-	    al->alloced += al->delta;
-	    al->list = xrealloc(al->list, sizeof(*al->list) * al->alloced);
-	}
-	pkgNum = al->size++;
-    }
-
-    p = al->list + pkgNum;
-
-    p->h = headerLink(h);	/* XXX reference held by transaction set */
-    p->depth = p->npreds = 0;
-    memset(&p->tsi, 0, sizeof(p->tsi));
-    p->multiLib = 0;	/* MULTILIB */
-
-    xx = headerNVR(p->h, &p->name, &p->version, &p->release);
-
-/*@-modfilesys@*/
-if (_debug)
-fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->version, p->release);
-/*@=modfilesys@*/
-
-    /* XXX This should be added always so that packages look alike.
-     * XXX However, there is logic in files.c/depends.c that checks for
-     * XXX existence (rather than value) that will need to change as well.
-     */
-    if (hge(p->h, RPMTAG_MULTILIBS, NULL, (void **) &pp, NULL))
-	multiLibMask = *pp;
-
-    if (multiLibMask) {
-	for (i = 0; i < pkgNum - 1; i++) {
-	    if (!strcmp (p->name, al->list[i].name)
-		&& hge(al->list[i].h, RPMTAG_MULTILIBS, NULL,
-				  (void **) &pp, NULL)
-		&& !rpmVersionCompare(p->h, al->list[i].h)
-		&& *pp && !(*pp & multiLibMask))
-		    p->multiLib = multiLibMask;
-	}
-    }
-
-    if (!hge(h, RPMTAG_EPOCH, NULL, (void **) &p->epoch, NULL))
-	p->epoch = NULL;
-
-    if (!hge(h, RPMTAG_PROVIDENAME, NULL, (void **) &p->provides,
-		&p->providesCount))
-    {
-	p->providesCount = 0;
-	p->provides = NULL;
-	p->providesEVR = NULL;
-	p->provideFlags = NULL;
-    } else {
-	if (!hge(h, RPMTAG_PROVIDEVERSION,
-			NULL, (void **) &p->providesEVR, NULL))
-	    p->providesEVR = NULL;
-	if (!hge(h, RPMTAG_PROVIDEFLAGS,
-			NULL, (void **) &p->provideFlags, NULL))
-	    p->provideFlags = NULL;
-    }
-
-    if (!hge(h, RPMTAG_REQUIRENAME, NULL, (void **) &p->requires,
-	&p->requiresCount)) {
-	p->requiresCount = 0;
-	p->requires = NULL;
-	p->requiresEVR = NULL;
-	p->requireFlags = NULL;
-    } else {
-	if (!hge(h, RPMTAG_REQUIREVERSION,
-			NULL, (void **) &p->requiresEVR, NULL))
-	    p->requiresEVR = NULL;
-	if (!hge(h, RPMTAG_REQUIREFLAGS,
-			NULL, (void **) &p->requireFlags, NULL))
-	    p->requireFlags = NULL;
-    }
-
-    if (!hge(h, RPMTAG_BASENAMES, &bnt, (void **)&p->baseNames, &p->filesCount))
-    {
-	p->filesCount = 0;
-	p->baseNames = NULL;
-    } else {
-	int_32 * dirIndexes;
-	const char ** dirNames;
-	int_32 numDirs;
-	uint_32 * fileFlags = NULL;
-	int * dirMapping;
-	dirInfo dirNeedle =
-		memset(alloca(sizeof(*dirNeedle)), 0, sizeof(*dirNeedle));
-	dirInfo dirMatch;
-	int first, last, fileNum, dirNum;
-	int origNumDirs;
-
-	xx = hge(h, RPMTAG_DIRNAMES, &dnt, (void **) &dirNames, &numDirs);
-	xx = hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL);
-	xx = hge(h, RPMTAG_FILEFLAGS, NULL, (void **) &fileFlags, NULL);
-
-	/* XXX FIXME: We ought to relocate the directory list here */
-
-	dirMapping = alloca(sizeof(*dirMapping) * numDirs);
-
-	/* allocated enough space for all the directories we could possible
-	   need to add */
-	al->dirs = xrealloc(al->dirs,
-			(al->numDirs + numDirs) * sizeof(*al->dirs));
-	origNumDirs = al->numDirs;
-
-	for (dirNum = 0; dirNum < numDirs; dirNum++) {
-	    dirNeedle->dirName = (char *) dirNames[dirNum];
-	    dirNeedle->dirNameLen = strlen(dirNames[dirNum]);
-	    dirMatch = bsearch(dirNeedle, al->dirs, origNumDirs,
-			       sizeof(*dirNeedle), dirInfoCompare);
-	    if (dirMatch) {
-		dirMapping[dirNum] = dirMatch - al->dirs;
-	    } else {
-		dirMapping[dirNum] = al->numDirs;
-		dirMatch = al->dirs + al->numDirs;
-		dirMatch->dirName = xstrdup(dirNames[dirNum]);
-		dirMatch->dirNameLen = strlen(dirNames[dirNum]);
-		dirMatch->files = NULL;
-		dirMatch->numFiles = 0;
-		al->numDirs++;
-	    }
-	}
-
-	dirNames = hfd(dirNames, dnt);
-
-	for (first = 0; first < p->filesCount; first = last + 1) {
-	    for (last = first; (last + 1) < p->filesCount; last++) {
-		if (dirIndexes[first] != dirIndexes[last + 1])
-		    /*@innerbreak@*/ break;
-	    }
-
-	    dirMatch = al->dirs + dirMapping[dirIndexes[first]];
-	    dirMatch->files = xrealloc(dirMatch->files,
-		    (dirMatch->numFiles + last - first + 1) *
-			sizeof(*dirMatch->files));
-	    if (p->baseNames != NULL)	/* XXX can't happen */
-	    for (fileNum = first; fileNum <= last; fileNum++) {
-		/*@-assignexpose@*/
-		dirMatch->files[dirMatch->numFiles].baseName =
-		    p->baseNames[fileNum];
-		/*@=assignexpose@*/
-		dirMatch->files[dirMatch->numFiles].pkgNum = pkgNum;
-		dirMatch->files[dirMatch->numFiles].fileFlags =
-				fileFlags[fileNum];
-		dirMatch->numFiles++;
-	    }
-	}
-
-	/* XXX should we realloc to smaller size? */
-	if (origNumDirs + al->numDirs)
-	    qsort(al->dirs, al->numDirs, sizeof(*al->dirs), dirInfoCompare);
-
-    }
-
-    /*@-assignexpose@*/
-    p->key = key;
-    /*@=assignexpose@*/
-    /*@-type@*/ /* FIX: cast? */
-    p->fd = (fd != NULL ? fdLink(fd, "alAddPackage") : NULL);
-    /*@=type@*/
-
-    if (relocs) {
-	rpmRelocation * r;
-
-	for (i = 0, r = relocs; r->oldPath || r->newPath; i++, r++)
-	    {};
-	p->relocs = xmalloc((i + 1) * sizeof(*p->relocs));
-
-	for (i = 0, r = relocs; r->oldPath || r->newPath; i++, r++) {
-	    p->relocs[i].oldPath = r->oldPath ? xstrdup(r->oldPath) : NULL;
-	    p->relocs[i].newPath = r->newPath ? xstrdup(r->newPath) : NULL;
-	}
-	p->relocs[i].oldPath = NULL;
-	p->relocs[i].newPath = NULL;
-    } else {
-	p->relocs = NULL;
-    }
-
-    alFreeIndex(al);
-
-    return p;
-}
-
-/**
- * Compare two available index entries by name (qsort/bsearch).
- * @param one		1st available index entry
- * @param two		2nd available index entry
- * @return		result of comparison
- */
-static int indexcmp(const void * one, const void * two)		/*@*/
-{
-    /*@-castexpose@*/
-    const availableIndexEntry a = (const availableIndexEntry) one;
-    const availableIndexEntry b = (const availableIndexEntry) two;
-    /*@=castexpose@*/
-    int lenchk = a->entryLen - b->entryLen;
-
-    if (lenchk)
-	return lenchk;
-
-    return strcmp(a->entry, b->entry);
-}
-
-/**
- * Generate index for available list.
- * @param al		available list
- */
-static void alMakeIndex(availableList al)
-	/*@modifies al @*/
-{
-    availableIndex ai = &al->index;
-    int i, j, k;
-
-    if (ai->size || al->list == NULL) return;
-
-    for (i = 0; i < al->size; i++)
-	ai->size += al->list[i].providesCount;
-
-    if (ai->size) {
-	ai->index = xcalloc(ai->size, sizeof(*ai->index));
-
-	k = 0;
-	for (i = 0; i < al->size; i++) {
-	    for (j = 0; j < al->list[i].providesCount; j++) {
-
-		/* If multilib install, skip non-multilib provides. */
-		if (al->list[i].multiLib &&
-		    !isDependsMULTILIB(al->list[i].provideFlags[j])) {
-			ai->size--;
-			/*@innercontinue@*/ continue;
-		}
-
-		ai->index[k].package = al->list + i;
-		/*@-assignexpose@*/
-		ai->index[k].entry = al->list[i].provides[j];
-		/*@=assignexpose@*/
-		ai->index[k].entryLen = strlen(al->list[i].provides[j]);
-		ai->index[k].type = IET_PROVIDES;
-		k++;
-	    }
-	}
-
-	qsort(ai->index, ai->size, sizeof(*ai->index), indexcmp);
-    }
-}
-
-/**
  * Split EVR into epoch, version, and release components.
  * @param evr		[epoch:]version[-release] string
  * @retval *ep		pointer to epoch
@@ -913,10 +432,9 @@ rpmTransactionSet rpmtransCreateSet(rpmdb db, const char * rootDir)
     ts->currDir = NULL;
     ts->chrootDone = 0;
 
-    ts->addedPackages.delta = ts->delta;
-    alCreate(&ts->addedPackages);
-    ts->availablePackages.delta = ts->delta;
-    alCreate(&ts->availablePackages);
+    ts->addedPackages = alCreate(ts->delta);
+
+    ts->availablePackages = alCreate(ts->delta);
 
     ts->orderAlloced = ts->delta;
     ts->orderCount = 0;
@@ -1026,9 +544,9 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
      * Check for previously added versions with the same name.
      */
     i = ts->orderCount;
-    if (ts->addedPackages.list != NULL)
+    if (ts->addedPackages->list != NULL)
     for (i = 0; i < ts->orderCount; i++) {
-	p = ts->addedPackages.list + i;
+	p = ts->addedPackages->list + i;
 	if (strcmp(p->name, name))
 	    continue;
 	rc = rpmVersionCompare(p->h, h);
@@ -1051,19 +569,21 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
 	break;
     }
 
-    /* XXX i == ts->orderCount most of the time. */
+    /* XXX Note: i == ts->orderCount here almost always. */
 
     if (i == ts->orderAlloced) {
 	ts->orderAlloced += ts->delta;
 	ts->order = xrealloc(ts->order, ts->orderAlloced * sizeof(*ts->order));
     }
     ts->order[i].type = TR_ADDED;
-    if (ts->addedPackages.list == NULL)
+    if (ts->addedPackages->list == NULL)
 	goto exit;
 
-    alNum = alAddPackage(&ts->addedPackages, i, h, key, fd, relocs) -
-    		ts->addedPackages.list;
-    ts->order[i].u.addedIndex = alNum;
+    {	availablePackage this =
+		alAddPackage(ts->addedPackages, i, h, key, fd, relocs);
+    	alNum = this - ts->addedPackages->list;
+	ts->order[i].u.addedIndex = alNum;
+    }
 
     if (i == ts->orderCount)
 	ts->orderCount++;
@@ -1075,7 +595,7 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
     if (headerIsEntry(h, RPMTAG_SOURCEPACKAGE))
 	goto exit;
 
-    /* Do lazy, readonly, open of rpm database. */
+    /* Do lazy (readonly?) open of rpm database. */
     if (ts->rpmdb == NULL) {
 	if ((ec = rpmtsOpenDB(ts, ts->dbmode)) != 0)
 	    goto exit;
@@ -1098,7 +618,7 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
 		    multiLibMask = *pp;
 		if (oldmultiLibMask && multiLibMask
 		    && !(oldmultiLibMask & multiLibMask)) {
-		    ts->addedPackages.list[alNum].multiLib = multiLibMask;
+		    ts->addedPackages->list[alNum].multiLib = multiLibMask;
 		}
 	    }
 	    /*@=branchstate@*/
@@ -1162,7 +682,7 @@ exit:
 void rpmtransAvailablePackage(rpmTransactionSet ts, Header h, const void * key)
 {
     availablePackage al;
-    al = alAddPackage(&ts->availablePackages, -1, h, key, NULL, NULL);
+    al = alAddPackage(ts->availablePackages, -1, h, key, NULL, NULL);
 }
 
 int rpmtransRemovePackage(rpmTransactionSet ts, int dboffset)
@@ -1192,8 +712,8 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts)
 	if (ts->nrefs > 0)
 	    return NULL;
 
-	alFree(&ts->addedPackages);
-	alFree(&ts->availablePackages);
+	ts->addedPackages = alFree(ts->addedPackages);
+	ts->availablePackages = alFree(ts->availablePackages);
 	ts->di = _free(ts->di);
 	ts->removedPackages = _free(ts->removedPackages);
 	ts->order = _free(ts->order);
@@ -1238,209 +758,6 @@ rpmDependencyConflict rpmdepFreeConflicts(rpmDependencyConflict conflicts,
 }
 
 /**
- * Check added package file lists for package(s) that provide a file.
- * @param al		available list
- * @param keyType	type of dependency
- * @param fileName	file name to search for
- * @return		available package pointer
- */
-static /*@only@*/ /*@null@*/ availablePackage *
-alAllFileSatisfiesDepend(const availableList al,
-		const char * keyType, const char * fileName)
-	/*@*/
-{
-    int i, found = 0;
-    const char * dirName;
-    const char * baseName;
-    dirInfo dirNeedle =
-		memset(alloca(sizeof(*dirNeedle)), 0, sizeof(*dirNeedle));
-    dirInfo dirMatch;
-    availablePackage * ret = NULL;
-
-    /* Solaris 2.6 bsearch sucks down on this. */
-    if (al->numDirs == 0 || al->dirs == NULL || al->list == NULL)
-	return NULL;
-
-    {	char * t;
-	dirName = t = xstrdup(fileName);
-	if ((t = strrchr(t, '/')) != NULL) {
-	    t++;		/* leave the trailing '/' */
-	    *t = '\0';
-	}
-    }
-
-    dirNeedle->dirName = (char *) dirName;
-    dirNeedle->dirNameLen = strlen(dirName);
-    dirMatch = bsearch(dirNeedle, al->dirs, al->numDirs,
-		       sizeof(*dirNeedle), dirInfoCompare);
-    if (dirMatch == NULL)
-	goto exit;
-
-    /* rewind to the first match */
-    while (dirMatch > al->dirs && dirInfoCompare(dirMatch-1, dirNeedle) == 0)
-	dirMatch--;
-
-    if ((baseName = strrchr(fileName, '/')) == NULL)
-	goto exit;
-    baseName++;
-
-    for (found = 0, ret = NULL;
-	 dirMatch <= al->dirs + al->numDirs &&
-		dirInfoCompare(dirMatch, dirNeedle) == 0;
-	 dirMatch++)
-    {
-	/* XXX FIXME: these file lists should be sorted and bsearched */
-	for (i = 0; i < dirMatch->numFiles; i++) {
-	    if (dirMatch->files[i].baseName == NULL ||
-			strcmp(dirMatch->files[i].baseName, baseName))
-		/*@innercontinue@*/ continue;
-
-	    /*
-	     * If a file dependency would be satisfied by a file
-	     * we are not going to install, skip it.
-	     */
-	    if (al->list[dirMatch->files[i].pkgNum].multiLib &&
-			!isFileMULTILIB(dirMatch->files[i].fileFlags))
-	        /*@innercontinue@*/ continue;
-
-	    if (keyType)
-		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added files)\n"),
-			keyType, fileName);
-
-	    ret = xrealloc(ret, (found+2) * sizeof(*ret));
-	    if (ret)	/* can't happen */
-		ret[found++] = al->list + dirMatch->files[i].pkgNum;
-	    /*@innerbreak@*/ break;
-	}
-    }
-
-exit:
-    dirName = _free(dirName);
-    /*@-mods@*/		/* AOK: al->list not modified through ret alias. */
-    if (ret)
-	ret[found] = NULL;
-    /*@=mods@*/
-    return ret;
-}
-
-#ifdef	DYING
-/**
- * Check added package file lists for first package that provides a file.
- * @param al		available list
- * @param keyType	type of dependency
- * @param fileName	file name to search for
- * @return		available package pointer
- */
-/*@unused@*/ static /*@dependent@*/ /*@null@*/ availablePackage
-alFileSatisfiesDepend(const availableList al,
-		const char * keyType, const char * fileName)
-	/*@*/
-{
-    availablePackage ret;
-    availablePackage * tmp = alAllFileSatisfiesDepend(al, keyType, fileName);
-
-    if (tmp) {
-	ret = tmp[0];
-	tmp = _free(tmp);
-	return ret;
-    }
-    return NULL;
-}
-#endif	/* DYING */
-
-/**
- * Check added package file lists for package(s) that have a provide.
- * @param al		available list
- * @param keyType	type of dependency
- * @param keyDepend	dependency string representation
- * @param keyName	dependency name string
- * @param keyEVR	dependency [epoch:]version[-release] string
- * @param keyFlags	dependency logical range qualifiers
- * @return		available package pointer
- */
-static /*@only@*/ /*@null@*/ availablePackage *
-alAllSatisfiesDepend(const availableList al,
-		const char * keyType, const char * keyDepend,
-		const char * keyName, const char * keyEVR, int keyFlags)
-	/*@*/
-{
-    availableIndexEntry needle =
-		memset(alloca(sizeof(*needle)), 0, sizeof(*needle));
-    availableIndexEntry match;
-    availablePackage p, * ret = NULL;
-    int i, rc, found;
-
-    if (*keyName == '/') {
-	ret = alAllFileSatisfiesDepend(al, keyType, keyName);
-	/* XXX Provides: /path was broken with added packages (#52183). */
-	if (ret != NULL && *ret != NULL)
-	    return ret;
-    }
-
-    if (!al->index.size || al->index.index == NULL) return NULL;
-
-    /*@-assignexpose@*/
-    /*@-temptrans@*/
-    needle->entry = keyName;
-    /*@=temptrans@*/
-    needle->entryLen = strlen(keyName);
-    match = bsearch(needle, al->index.index, al->index.size,
-		    sizeof(*al->index.index), indexcmp);
-    /*@=assignexpose@*/
-
-    if (match == NULL) return NULL;
-
-    /* rewind to the first match */
-    while (match > al->index.index && indexcmp(match-1, needle) == 0)
-	match--;
-
-    for (ret = NULL, found = 0;
-	 match <= al->index.index + al->index.size &&
-		indexcmp(match, needle) == 0;
-	 match++)
-    {
-
-	p = match->package;
-	rc = 0;
-	switch (match->type) {
-	case IET_PROVIDES:
-	    for (i = 0; i < p->providesCount; i++) {
-		const char * proEVR;
-		int proFlags;
-
-		/* Filter out provides that came along for the ride. */
-		if (strcmp(p->provides[i], keyName))
-		    /*@innercontinue@*/ continue;
-
-		proEVR = (p->providesEVR ? p->providesEVR[i] : NULL);
-		proFlags = (p->provideFlags ? p->provideFlags[i] : 0);
-		rc = rpmRangesOverlap(p->provides[i], proEVR, proFlags,
-				keyName, keyEVR, keyFlags);
-		if (rc)
-		    /*@innerbreak@*/ break;
-	    }
-	    if (keyType && keyDepend && rc)
-		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added provide)\n"),
-				keyType, keyDepend+2);
-	    /*@switchbreak@*/ break;
-	}
-
-	/*@-branchstate@*/
-	if (rc) {
-	    ret = xrealloc(ret, (found + 2) * sizeof(*ret));
-	    if (ret)	/* can't happen */
-		ret[found++] = p;
-	}
-	/*@=branchstate@*/
-    }
-
-    if (ret)
-	ret[found] = NULL;
-
-    return ret;
-}
-
-/**
  * Check added package file lists for first package that has a provide.
  * @todo Eliminate.
  * @param al		available list
@@ -1519,7 +836,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 		xx = dbiCclose(dbi, NULL, 0);
 
 		if (suggestion && rc == 1)
-		    *suggestion = alAllSatisfiesDepend(&ts->availablePackages,
+		    *suggestion = alAllSatisfiesDepend(ts->availablePackages,
 				NULL, NULL, keyName, keyEVR, keyFlags);
 
 		return rc;
@@ -1567,7 +884,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 	goto unsatisfied;
     }
 
-    if (alSatisfiesDepend(&ts->addedPackages, keyType, keyDepend,
+    if (alSatisfiesDepend(ts->addedPackages, keyType, keyDepend,
 		keyName, keyEVR, keyFlags))
     {
 	goto exit;
@@ -1623,7 +940,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
     }
 
     if (suggestion)
-	*suggestion = alAllSatisfiesDepend(&ts->availablePackages, NULL, NULL,
+	*suggestion = alAllSatisfiesDepend(ts->availablePackages, NULL, NULL,
 				keyName, keyEVR, keyFlags);
 
 unsatisfied:
@@ -1969,8 +1286,7 @@ static int ignoreDep(const availablePackage p,
  * @param tsi		successor chain
  * @param q		predecessor
  */
-static void markLoop(/*@special@*/ struct tsortInfo * tsi,
-		availablePackage q)
+static void markLoop(/*@special@*/ tsortInfo tsi, availablePackage q)
 	/*@globals internalState @*/
 	/*@uses tsi @*/
 	/*@modifies internalState @*/
@@ -2026,8 +1342,8 @@ zapRelation(availablePackage q, availablePackage p,
 		int zap, /*@in@*/ /*@out@*/ int * nzaps)
 	/*@modifies q, p, *nzaps @*/
 {
-    struct tsortInfo * tsi_prev;
-    struct tsortInfo * tsi;
+    tsortInfo tsi_prev;
+    tsortInfo tsi;
     const char *dp = NULL;
 
     for (tsi_prev = &q->tsi, tsi = q->tsi.tsi_next;
@@ -2087,13 +1403,13 @@ static inline int addRelation( const rpmTransactionSet ts,
 	/*@modifies p, *selected @*/
 {
     availablePackage q;
-    struct tsortInfo * tsi;
+    tsortInfo tsi;
     int matchNum;
 
     if (!p->requires || !p->requiresEVR || !p->requireFlags)
 	return 0;
 
-    q = alSatisfiesDepend(&ts->addedPackages, NULL, NULL,
+    q = alSatisfiesDepend(ts->addedPackages, NULL, NULL,
 		p->requires[j], p->requiresEVR[j], p->requireFlags[j]);
 
     /* Ordering depends only on added package relations. */
@@ -2112,7 +1428,7 @@ static inline int addRelation( const rpmTransactionSet ts,
 
     /* Avoid redundant relations. */
     /* XXX TODO: add control bit. */
-    matchNum = q - ts->addedPackages.list;
+    matchNum = q - ts->addedPackages->list;
     if (selected[matchNum] != 0)
 	return 0;
     selected[matchNum] = 1;
@@ -2123,7 +1439,9 @@ static inline int addRelation( const rpmTransactionSet ts,
 	p->depth = q->depth + 1;
 
     tsi = xmalloc(sizeof(*tsi));
+    /*@-assignexpose@*/
     tsi->tsi_suc = p;
+    /*@=assignexpose@*/
     tsi->tsi_reqx = j;
     tsi->tsi_next = q->tsi.tsi_next;
     q->tsi.tsi_next = tsi;
@@ -2183,18 +1501,18 @@ static void addQ(availablePackage p,
 
 int rpmdepOrder(rpmTransactionSet ts)
 {
-    int npkgs = ts->addedPackages.size;
+    int npkgs = ts->addedPackages->size;
     int chainsaw = ts->transFlags & RPMTRANS_FLAG_CHAINSAW;
     availablePackage p;
     availablePackage q;
     availablePackage r;
-    struct tsortInfo * tsi;
-    struct tsortInfo * tsi_next;
+    tsortInfo tsi;
+    tsortInfo tsi_next;
     int * ordering = alloca(sizeof(*ordering) * (npkgs + 1));
     int orderingCount = 0;
     unsigned char * selected = alloca(sizeof(*selected) * (npkgs + 1));
     int loopcheck;
-    struct transactionElement * newOrder;
+    transactionElement newOrder;
     int newOrderCount = 0;
     orderListIndex orderList;
     int nrescans = 10;
@@ -2202,15 +1520,15 @@ int rpmdepOrder(rpmTransactionSet ts)
     int qlen;
     int i, j;
 
-    alMakeIndex(&ts->addedPackages);
-    alMakeIndex(&ts->availablePackages);
+    alMakeIndex(ts->addedPackages);
+    alMakeIndex(ts->availablePackages);
 
     /* T1. Initialize. */
     loopcheck = npkgs;
 
     /* Record all relations. */
     rpmMessage(RPMMESS_DEBUG, _("========== recording tsort relations\n"));
-    if ((p = ts->addedPackages.list) != NULL)
+    if ((p = ts->addedPackages->list) != NULL)
     for (i = 0; i < npkgs; i++, p++) {
 	int matchNum;
 
@@ -2220,7 +1538,7 @@ int rpmdepOrder(rpmTransactionSet ts)
 	memset(selected, 0, sizeof(*selected) * npkgs);
 
 	/* Avoid narcisstic relations. */
-	matchNum = p - ts->addedPackages.list;
+	matchNum = p - ts->addedPackages->list;
 	selected[matchNum] = 1;
 
 	/* T2. Next "q <- p" relation. */
@@ -2263,7 +1581,7 @@ int rpmdepOrder(rpmTransactionSet ts)
     }
 
     /* Save predecessor count. */
-    if ((p = ts->addedPackages.list) != NULL)
+    if ((p = ts->addedPackages->list) != NULL)
     for (i = 0; i < npkgs; i++, p++) {
 	p->npreds = p->tsi.tsi_count;
     }
@@ -2274,7 +1592,7 @@ int rpmdepOrder(rpmTransactionSet ts)
 rescan:
     q = r = NULL;
     qlen = 0;
-    if ((p = ts->addedPackages.list) != NULL)
+    if ((p = ts->addedPackages->list) != NULL)
     for (i = 0; i < npkgs; i++, p++) {
 
 	/* Prefer packages in presentation order. */
@@ -2295,7 +1613,7 @@ rescan:
 			orderingCount, q->npreds, q->tsi.tsi_qcnt, q->depth,
 			2*q->depth, "",
 			q->name, q->version, q->release);
-	ordering[orderingCount++] = q - ts->addedPackages.list;
+	ordering[orderingCount++] = q - ts->addedPackages->list;
 	qlen--;
 	loopcheck--;
 
@@ -2329,7 +1647,7 @@ rescan:
 
 	/* T9. Initialize predecessor chain. */
 	nzaps = 0;
-	if ((q = ts->addedPackages.list) != NULL)
+	if ((q = ts->addedPackages->list) != NULL)
 	for (i = 0; i < npkgs; i++, q++) {
 	    q->tsi.tsi_pkg = NULL;
 	    q->tsi.tsi_reqx = 0;
@@ -2339,7 +1657,7 @@ rescan:
 	}
 
 	/* T10. Mark all packages with their predecessors. */
-	if ((q = ts->addedPackages.list) != NULL)
+	if ((q = ts->addedPackages->list) != NULL)
 	for (i = 0; i < npkgs; i++, q++) {
 	    if ((tsi = q->tsi.tsi_next) == NULL)
 		continue;
@@ -2349,7 +1667,7 @@ rescan:
 	}
 
 	/* T11. Print all dependency loops. */
-	if ((r = ts->addedPackages.list) != NULL)
+	if ((r = ts->addedPackages->list) != NULL)
 	/*@-branchstate@*/
 	for (i = 0; i < npkgs; i++, r++) {
 	    int printed;
@@ -2436,11 +1754,15 @@ rescan:
 	/* bsearch should never, ever fail */
 	if (needle == NULL) continue;
 
+	/*@-assignexpose@*/
 	newOrder[newOrderCount++] = ts->order[needle->orIndex];
+	/*@=assignexpose@*/
 	for (j = needle->orIndex + 1; j < ts->orderCount; j++) {
 	    if (ts->order[j].type == TR_REMOVED &&
 		ts->order[j].u.removed.dependsOnIndex == needle->alIndex) {
+		/*@-assignexpose@*/
 		newOrder[newOrderCount++] = ts->order[j];
+		/*@=assignexpose@*/
 	    } else
 		/*@innerbreak@*/ break;
 	}
@@ -2449,7 +1771,9 @@ rescan:
     for (i = 0; i < ts->orderCount; i++) {
 	if (ts->order[i].type == TR_REMOVED &&
 	    ts->order[i].u.removed.dependsOnIndex == -1)  {
+	    /*@-assignexpose@*/
 	    newOrder[newOrderCount++] = ts->order[i];
+	    /*@=assignexpose@*/
 	}
     }
     assert(newOrderCount == ts->orderCount);
@@ -2515,7 +1839,7 @@ int rpmdepCheck(rpmTransactionSet ts,
 	closeatexit = 1;
     }
 
-    npkgs = ts->addedPackages.size;
+    npkgs = ts->addedPackages->size;
 
     ps = xcalloc(1, sizeof(*ps));
     ps->alloced = 5;
@@ -2525,14 +1849,14 @@ int rpmdepCheck(rpmTransactionSet ts,
     *conflicts = NULL;
     *numConflicts = 0;
 
-    alMakeIndex(&ts->addedPackages);
-    alMakeIndex(&ts->availablePackages);
+    alMakeIndex(ts->addedPackages);
+    alMakeIndex(ts->availablePackages);
 
     /*
      * Look at all of the added packages and make sure their dependencies
      * are satisfied.
      */
-    if ((p = ts->addedPackages.list) != NULL)
+    if ((p = ts->addedPackages->list) != NULL)
     for (i = 0; i < npkgs; i++, p++)
     {
 
diff --git a/lib/depends.h b/lib/depends.h
index a9ee12658..bcdd8e627 100644
--- a/lib/depends.h
+++ b/lib/depends.h
@@ -9,117 +9,16 @@
 #include <header.h>
 #include <rpmhash.h>
 
-typedef /*@abstract@*/ struct availableIndexEntry_s *	availableIndexEntry;
-typedef /*@abstract@*/ struct availableIndex_s *	availableIndex;
-typedef /*@abstract@*/ struct fileIndexEntry_s *	fileIndexEntry;
-typedef /*@abstract@*/ struct dirInfo_s *		dirInfo;
 typedef /*@abstract@*/ struct availableList_s *		availableList;
 typedef /*@abstract@*/ struct problemsSet_s *		problemsSet;
 typedef /*@abstract@*/ struct orderListIndex_s *	orderListIndex;
+typedef /*@abstract@*/ struct transactionElement_s *	transactionElement;
 
 /*@unchecked@*/
 /*@-exportlocal@*/
 extern int _ts_debug;
 /*@=exportlocal@*/
 
-/** \ingroup rpmdep
- * Dependncy ordering information.
- */
-/*@-fielduse@*/	/* LCL: confused by union? */
-struct tsortInfo {
-    union {
-	int	count;
-	/*@kept@*/ /*@null@*/ availablePackage suc;
-    } tsi_u;
-#define	tsi_count	tsi_u.count
-#define	tsi_suc		tsi_u.suc
-/*@owned@*/ /*@null@*/ struct tsortInfo * tsi_next;
-/*@kept@*/ /*@null@*/ availablePackage tsi_pkg;
-    int		tsi_reqx;
-    int		tsi_qcnt;
-} ;
-/*@=fielduse@*/
-
-/** \ingroup rpmdep
- * Info about a single package to be installed.
- */
-struct availablePackage_s {
-    Header h;				/*!< Package header. */
-/*@dependent@*/ const char * name;	/*!< Header name. */
-/*@dependent@*/ const char * version;	/*!< Header version. */
-/*@dependent@*/ const char * release;	/*!< Header release. */
-/*@owned@*/ const char ** provides;	/*!< Provides: name strings. */
-/*@owned@*/ const char ** providesEVR;	/*!< Provides: [epoch:]version[-release] strings. */
-/*@dependent@*/ int * provideFlags;	/*!< Provides: logical range qualifiers. */
-/*@owned@*//*@null@*/ const char ** requires;	/*!< Requires: name strings. */
-/*@owned@*//*@null@*/ const char ** requiresEVR;/*!< Requires: [epoch:]version[-release] strings. */
-/*@dependent@*//*@null@*/ int * requireFlags;	/*!< Requires: logical range qualifiers. */
-/*@owned@*//*@null@*/ const char ** baseNames;	/*!< Header file basenames. */
-/*@dependent@*//*@null@*/ int_32 * epoch;	/*!< Header epoch (if any). */
-    int providesCount;			/*!< No. of Provide:'s in header. */
-    int requiresCount;			/*!< No. of Require:'s in header. */
-    int filesCount;			/*!< No. of files in header. */
-    int npreds;				/*!< No. of predecessors. */
-    int depth;				/*!< Max. depth in dependency tree. */
-    struct tsortInfo tsi;		/*!< Dependency tsort data. */
-    uint_32 multiLib;	/* MULTILIB */
-/*@kept@*//*@null@*/ const void * key;	/*!< Private data associated with a package (e.g. file name of package). */
-/*@null@*/ rpmRelocation * relocs;
-/*@null@*/ FD_t fd;
-} ;
-
-/** \ingroup rpmdep
- * A single available item (e.g. a Provides: dependency).
- */
-struct availableIndexEntry_s {
-/*@dependent@*/ availablePackage package; /*!< Containing package. */
-/*@dependent@*/ const char * entry;	/*!< Available item name. */
-    size_t entryLen;			/*!< No. of bytes in name. */
-    enum indexEntryType {
-	IET_PROVIDES=1		/*!< A Provides: dependency. */
-    } type;				/*!< Type of available item. */
-} ;
-
-/** \ingroup rpmdep
- * Index of all available items.
- */
-struct availableIndex_s {
-/*@null@*/ availableIndexEntry index;	/*!< Array of available items. */
-    int size;				/*!< No. of available items. */
-} ;
-
-/** \ingroup rpmdep
- * A file to be installed/removed.
- */
-struct fileIndexEntry_s {
-    int pkgNum;				/*!< Containing package number. */
-    int fileFlags;	/* MULTILIB */
-/*@dependent@*/ /*@null@*/ const char * baseName;	/*!< File basename. */
-} ;
-
-/** \ingroup rpmdep
- * A directory to be installed/removed.
- */
-struct dirInfo_s {
-/*@owned@*/ const char * dirName;	/*!< Directory path (+ trailing '/'). */
-    int dirNameLen;			/*!< No. bytes in directory path. */
-/*@owned@*/ fileIndexEntry files;	/*!< Array of files in directory. */
-    int numFiles;			/*!< No. files in directory. */
-} ;
-
-/** \ingroup rpmdep
- * Set of available packages, items, and directories.
- */
-struct availableList_s {
-/*@owned@*/ /*@null@*/ availablePackage list;	/*!< Set of packages. */
-    struct availableIndex_s index;	/*!< Set of available items. */
-    int delta;				/*!< Delta for pkg list reallocation. */
-    int size;				/*!< No. of pkgs in list. */
-    int alloced;			/*!< No. of pkgs allocated for list. */
-    int numDirs;			/*!< No. of directories. */
-/*@owned@*/ /*@null@*/ dirInfo dirs;	/*!< Set of directories. */
-} ;
-
 struct orderListIndex_s {
     int alIndex;
     int orIndex;
@@ -130,7 +29,7 @@ struct orderListIndex_s {
  * A single package instance to be installed/removed atomically.
  */
 /*@-fielduse@*/	/* LCL: confused by union? */
-struct transactionElement {
+struct transactionElement_s {
     enum rpmTransactionType {
 	TR_ADDED,	/*!< Package will be installed. */
 	TR_REMOVED	/*!< Package will be removed. */
@@ -171,12 +70,13 @@ struct rpmTransactionSet_s {
     int * removedPackages;	/*!< Set of packages being removed. */
     int numRemovedPackages;	/*!< No. removed rpmdb instances. */
     int allocedRemovedPackages;	/*!< Size of removed packages array. */
-    struct availableList_s addedPackages;
-				/*!< Set of packages being installed. */
-    struct availableList_s availablePackages;
+/*@only@*/
+    availableList addedPackages;/*!< Set of packages being installed. */
+/*@only@*/
+    availableList availablePackages;
 				/*!< Universe of possible packages. */
-/*@only@*/ struct transactionElement * order;
-				/*!< Packages sorted by dependencies. */
+/*@only@*/
+    transactionElement order;	/*!< Packages sorted by dependencies. */
     int orderCount;		/*!< No. of transaction elements. */
     int orderAlloced;		/*!< No. of allocated transaction elements. */
 /*@only@*/ TFI_t flList;	/*!< Transaction element(s) file info. */
diff --git a/lib/fsm.c b/lib/fsm.c
index 41408b0f4..2d96400d8 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -495,7 +495,7 @@ int fsmSetup(FSM_t fsm, fileStage goal,
 	    /*@-type@*/ /* FIX: cast? */
 	    /*@-noeffectuncon @*/ /* FIX: check rc */
 	    (void)ts->notify(fi->h, RPMCALLBACK_INST_START, 0, fi->archiveSize,
-		(fi->ap ? fi->ap->key : NULL), ts->notifyData);
+			rpmfiGetKey(fi->ap), ts->notifyData);
 	    /*@=noeffectuncon @*/
 	    /*@=type@*/
 	}
@@ -867,7 +867,7 @@ static int writeFile(/*@special@*/ FSM_t fsm, int writeData)
 	    /*@-type@*/ /* FIX: cast? */
 	    /*@-noeffectuncon @*/ /* FIX: check rc */
 	    (void)ts->notify(fi->h, RPMCALLBACK_INST_PROGRESS, size, size,
-			(fi->ap ? fi->ap->key : NULL), ts->notifyData);
+			rpmfiGetKey(fi->ap), ts->notifyData);
 	    /*@=noeffectuncon @*/
 	    /*@=type@*/
 	}
@@ -1650,7 +1650,7 @@ if (!(fsm->mapFlags & CPIO_ALL_HARDLINKS)) break;
 		/*@-noeffectuncon @*/ /* FIX: check rc */
 		(void)ts->notify(fi->h, RPMCALLBACK_INST_PROGRESS,
 			fdGetCpioPos(fsm->cfd), fi->archiveSize,
-			(fi->ap ? fi->ap->key : NULL), ts->notifyData);
+			rpmfiGetKey(fi->ap), ts->notifyData);
 		/*@=noeffectuncon @*/
 		/*@=type@*/
 	    }
diff --git a/lib/problems.c b/lib/problems.c
index ef5088af9..8ca769829 100644
--- a/lib/problems.c
+++ b/lib/problems.c
@@ -7,6 +7,7 @@
 #include <rpmlib.h>
 
 #include "depends.h"
+#include "rpmal.h"
 #include "misc.h"
 #include "debug.h"
 
diff --git a/lib/psm.c b/lib/psm.c
index f86995dd0..51f7a3986 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -6,6 +6,7 @@
 #include "system.h"
 
 #include "psm.h"
+#include "rpmal.h"
 #include <rpmmacro.h>
 #include <rpmurl.h>
 
@@ -31,6 +32,7 @@ int _fi_debug = 0;
 /*@access PSM_t @*/
 
 /*@access availablePackage@*/
+/*@access availableList@*/
 
 /*@-redecl -declundef -exportheadervar@*/
 /*@unchecked@*/
@@ -523,6 +525,13 @@ Header relocateFileList(const rpmTransactionSet ts, TFI_t fi,
     return h;
 }
 
+const void * rpmfiGetKey(TFI_t fi)
+{
+    /*@-kepttrans -retexpose -usereleased@*/
+/*@i@*/	return (fi->ap != NULL ? fi->ap->key : NULL);
+    /*@=kepttrans =retexpose =usereleased@*/
+}
+
 TFI_t XrpmfiUnlink(TFI_t fi, const char * msg, const char * fn, unsigned ln)
 {
 /*@-modfilesys@*/
@@ -1167,13 +1176,13 @@ rpmRC rpmInstallSourcePackage(rpmTransactionSet ts,
     }
 
     (void) rpmtransAddPackage(ts, h, fd, NULL, 0, NULL);
-    if (ts->addedPackages.list == NULL) {	/* XXX can't happen */
+    if (ts->addedPackages->list == NULL) {	/* XXX can't happen */
 	rc = RPMRC_FAIL;
 	goto exit;
     }
 
     fi->type = TR_ADDED;
-    fi->ap = ts->addedPackages.list;
+    fi->ap = ts->addedPackages->list;
     loadFi(ts, fi, h, 1);
     hge = fi->hge;
     hfd = (fi->hfd ? fi->hfd : headerFreeData);
diff --git a/lib/psm.h b/lib/psm.h
index 873e61a12..eebe5044d 100644
--- a/lib/psm.h
+++ b/lib/psm.h
@@ -215,6 +215,14 @@ void freeFi(TFI_t fi)
 	/*@modifies fi @*/;
 
 /**
+ * Retrieve key from transaction element file info
+ * @param fi		transaction element file info
+ * @return		transaction element file info key
+ */
+/*@null@*/ const void * rpmfiGetKey(TFI_t fi)
+	/*@*/;
+
+/**
  * Return formatted string representation of package disposition.
  * @param a		package dispostion
  * @return		formatted string
diff --git a/lib/rpmal.c b/lib/rpmal.c
new file mode 100644
index 000000000..8b727c76a
--- /dev/null
+++ b/lib/rpmal.c
@@ -0,0 +1,666 @@
+/** \ingroup rpmdep
+ * \file lib/rpmal.c
+ */
+
+#include "system.h"
+
+#include <rpmlib.h>
+
+#include "depends.h"
+#include "rpmal.h"
+
+#include "debug.h"
+
+/*@access Header@*/		/* XXX compared with NULL */
+/*@access FD_t@*/		/* XXX compared with NULL */
+/*@access rpmDependencyConflict@*/
+
+/*@access availablePackage@*/
+/*@access availableIndexEntry@*/
+/*@access availableIndex@*/
+/*@access fileIndexEntry@*/
+/*@access dirInfo@*/
+/*@access availableList@*/
+
+/*@unchecked@*/
+static int _al_debug = 0;
+
+/**
+ * Destroy available item index.
+ * @param al		available list
+ */
+static void alFreeIndex(availableList al)
+	/*@modifies al @*/
+{
+    if (al->index.size) {
+	al->index.index = _free(al->index.index);
+	al->index.size = 0;
+    }
+}
+
+availableList alCreate(int delta)
+{
+    availableList al = xcalloc(1, sizeof(*al));
+
+    al->delta = delta;
+    al->size = 0;
+    al->list = xcalloc(al->delta, sizeof(*al->list));
+    al->alloced = al->delta;
+
+    al->index.index = NULL;
+    al->index.size = 0;
+
+    al->numDirs = 0;
+    al->dirs = NULL;
+    return al;
+}
+
+availableList alFree(availableList al)
+{
+    HFD_t hfd = headerFreeData;
+    availablePackage p;
+    rpmRelocation * r;
+    int i;
+
+    if (al == NULL)
+	return NULL;
+
+    if ((p = al->list) != NULL)
+    for (i = 0; i < al->size; i++, p++) {
+
+	{   tsortInfo tsi;
+	    while ((tsi = p->tsi.tsi_next) != NULL) {
+		p->tsi.tsi_next = tsi->tsi_next;
+		tsi->tsi_next = NULL;
+		tsi = _free(tsi);
+	    }
+	}
+
+	p->provides = hfd(p->provides, -1);
+	p->providesEVR = hfd(p->providesEVR, -1);
+	p->requires = hfd(p->requires, -1);
+	p->requiresEVR = hfd(p->requiresEVR, -1);
+	p->baseNames = hfd(p->baseNames, -1);
+	p->h = headerFree(p->h);
+
+	if (p->relocs) {
+	    for (r = p->relocs; (r->oldPath || r->newPath); r++) {
+		r->oldPath = _free(r->oldPath);
+		r->newPath = _free(r->newPath);
+	    }
+	    p->relocs = _free(p->relocs);
+	}
+	/*@-type@*/ /* FIX: cast? */
+	if (p->fd != NULL)
+	    p->fd = fdFree(p->fd, "alAddPackage (alFree)");
+	/*@=type@*/
+    }
+
+    if (al->dirs != NULL)
+    for (i = 0; i < al->numDirs; i++) {
+	al->dirs[i].dirName = _free(al->dirs[i].dirName);
+	al->dirs[i].files = _free(al->dirs[i].files);
+    }
+
+    al->dirs = _free(al->dirs);
+    al->numDirs = 0;
+    al->list = _free(al->list);
+    al->alloced = 0;
+    alFreeIndex(al);
+    return NULL;
+}
+
+/**
+ * Compare two directory info entries by name (qsort/bsearch).
+ * @param one		1st directory info
+ * @param two		2nd directory info
+ * @return		result of comparison
+ */
+static int dirInfoCompare(const void * one, const void * two)	/*@*/
+{
+    /*@-castexpose@*/
+    const dirInfo a = (const dirInfo) one;
+    const dirInfo b = (const dirInfo) two;
+    /*@=castexpose@*/
+    int lenchk = a->dirNameLen - b->dirNameLen;
+
+    if (lenchk)
+	return lenchk;
+
+    /* XXX FIXME: this might do "backward" strcmp for speed */
+    return strcmp(a->dirName, b->dirName);
+}
+
+void alDelPackage(availableList al, int pkgNum)
+{
+    HGE_t hge = (HGE_t)headerGetEntryMinMemory;
+    HFD_t hfd = headerFreeData;
+    availablePackage p;
+
+    /*@-nullptrarith@*/ /* FIX: al->list might be NULL */
+    p = al->list + pkgNum;
+    /*@=nullptrarith@*/
+
+/*@-modfilesys@*/
+if (_al_debug)
+fprintf(stderr, "*** del %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->version, p->release);
+/*@=modfilesys@*/
+
+    if (p->relocs) {
+	rpmRelocation * r;
+	for (r = p->relocs; r->oldPath || r->newPath; r++) {
+	    r->oldPath = _free(r->oldPath);
+	    r->newPath = _free(r->newPath);
+	}
+	p->relocs = _free(p->relocs);
+    }
+    if (p->fd) {
+	/*@-type@*/ /* FIX: cast? */
+	(void) fdFree(p->fd, "alDelPackage");
+	/*@=type@*/
+	p->fd = NULL;
+    }
+
+    if (p->baseNames != NULL && p->filesCount > 0) {
+	int origNumDirs = al->numDirs;
+	const char ** dirNames;
+	int_32 numDirs;
+	rpmTagType dnt;
+	int dirNum;
+	dirInfo dirNeedle =
+		memset(alloca(sizeof(*dirNeedle)), 0, sizeof(*dirNeedle));
+	dirInfo dirMatch;
+	int last;
+	int i, xx;
+
+	xx = hge(p->h, RPMTAG_DIRNAMES, &dnt, (void **) &dirNames, &numDirs);
+
+	/* XXX FIXME: We ought to relocate the directory list here */
+
+	if (al->dirs != NULL)
+	for (dirNum = al->numDirs - 1; dirNum >= 0; dirNum--) {
+	    dirNeedle->dirName = (char *) dirNames[dirNum];
+	    dirNeedle->dirNameLen = strlen(dirNames[dirNum]);
+	    dirMatch = bsearch(dirNeedle, al->dirs, al->numDirs,
+			       sizeof(*dirNeedle), dirInfoCompare);
+	    if (dirMatch == NULL)
+		continue;
+	    last = dirMatch->numFiles;
+	    for (i = dirMatch->numFiles - 1; i >= 0; i--) {
+		if (dirMatch->files[i].pkgNum != pkgNum)
+		    /*@innercontinue@*/ continue;
+		dirMatch->numFiles--;
+		if (i > dirMatch->numFiles)
+		    /*@innercontinue@*/ continue;
+		memmove(dirMatch->files, dirMatch->files+1,
+			(dirMatch->numFiles - i));
+	    }
+	    if (dirMatch->numFiles > 0) {
+		if (last > i)
+		    dirMatch->files = xrealloc(dirMatch->files,
+			dirMatch->numFiles * sizeof(*dirMatch->files));
+		continue;
+	    }
+	    dirMatch->files = _free(dirMatch->files);
+	    dirMatch->dirName = _free(dirMatch->dirName);
+	    al->numDirs--;
+	    if (dirNum > al->numDirs)
+		continue;
+	    memmove(dirMatch, dirMatch+1, (al->numDirs - dirNum));
+	}
+
+	if (origNumDirs > al->numDirs) {
+	    if (al->numDirs > 0)
+		al->dirs = xrealloc(al->dirs, al->numDirs * sizeof(*al->dirs));
+	    else
+		al->dirs = _free(al->dirs);
+	}
+
+	dirNames = hfd(dirNames, dnt);
+    }
+    p->h = headerFree(p->h);
+    memset(p, 0, sizeof(*p));
+    /*@-nullstate@*/ /* FIX: al->list->h may be NULL */
+    return;
+    /*@=nullstate@*/
+}
+
+availablePackage
+alAddPackage(availableList al, int pkgNum,
+		Header h, /*@null@*/ /*@dependent@*/ const void * key,
+		/*@null@*/ FD_t fd, /*@null@*/ rpmRelocation * relocs)
+	/*@modifies al, h @*/
+{
+    HGE_t hge = (HGE_t)headerGetEntryMinMemory;
+    HFD_t hfd = headerFreeData;
+    rpmTagType dnt, bnt;
+    availablePackage p;
+    int i, xx;
+    uint_32 multiLibMask = 0;
+    uint_32 * pp = NULL;
+
+    if (pkgNum >= 0 && pkgNum < al->size) {
+	alDelPackage(al, pkgNum);
+    } else {
+	if (al->size == al->alloced) {
+	    al->alloced += al->delta;
+	    al->list = xrealloc(al->list, sizeof(*al->list) * al->alloced);
+	}
+	pkgNum = al->size++;
+    }
+
+    p = al->list + pkgNum;
+
+    p->h = headerLink(h);	/* XXX reference held by transaction set */
+    p->depth = p->npreds = 0;
+    memset(&p->tsi, 0, sizeof(p->tsi));
+    p->multiLib = 0;	/* MULTILIB */
+
+    xx = headerNVR(p->h, &p->name, &p->version, &p->release);
+
+/*@-modfilesys@*/
+if (_al_debug)
+fprintf(stderr, "*** add %p[%d] %s-%s-%s\n", al->list, pkgNum, p->name, p->version, p->release);
+/*@=modfilesys@*/
+
+    /* XXX This should be added always so that packages look alike.
+     * XXX However, there is logic in files.c/depends.c that checks for
+     * XXX existence (rather than value) that will need to change as well.
+     */
+    if (hge(p->h, RPMTAG_MULTILIBS, NULL, (void **) &pp, NULL))
+	multiLibMask = *pp;
+
+    if (multiLibMask) {
+	for (i = 0; i < pkgNum - 1; i++) {
+	    if (!strcmp (p->name, al->list[i].name)
+		&& hge(al->list[i].h, RPMTAG_MULTILIBS, NULL,
+				  (void **) &pp, NULL)
+		&& !rpmVersionCompare(p->h, al->list[i].h)
+		&& *pp && !(*pp & multiLibMask))
+		    p->multiLib = multiLibMask;
+	}
+    }
+
+    if (!hge(h, RPMTAG_EPOCH, NULL, (void **) &p->epoch, NULL))
+	p->epoch = NULL;
+
+    if (!hge(h, RPMTAG_PROVIDENAME, NULL, (void **) &p->provides,
+		&p->providesCount))
+    {
+	p->providesCount = 0;
+	p->provides = NULL;
+	p->providesEVR = NULL;
+	p->provideFlags = NULL;
+    } else {
+	if (!hge(h, RPMTAG_PROVIDEVERSION,
+			NULL, (void **) &p->providesEVR, NULL))
+	    p->providesEVR = NULL;
+	if (!hge(h, RPMTAG_PROVIDEFLAGS,
+			NULL, (void **) &p->provideFlags, NULL))
+	    p->provideFlags = NULL;
+    }
+
+    if (!hge(h, RPMTAG_REQUIRENAME, NULL, (void **) &p->requires,
+	&p->requiresCount)) {
+	p->requiresCount = 0;
+	p->requires = NULL;
+	p->requiresEVR = NULL;
+	p->requireFlags = NULL;
+    } else {
+	if (!hge(h, RPMTAG_REQUIREVERSION,
+			NULL, (void **) &p->requiresEVR, NULL))
+	    p->requiresEVR = NULL;
+	if (!hge(h, RPMTAG_REQUIREFLAGS,
+			NULL, (void **) &p->requireFlags, NULL))
+	    p->requireFlags = NULL;
+    }
+
+    if (!hge(h, RPMTAG_BASENAMES, &bnt, (void **)&p->baseNames, &p->filesCount))
+    {
+	p->filesCount = 0;
+	p->baseNames = NULL;
+    } else {
+	int_32 * dirIndexes;
+	const char ** dirNames;
+	int_32 numDirs;
+	uint_32 * fileFlags = NULL;
+	int * dirMapping;
+	dirInfo dirNeedle =
+		memset(alloca(sizeof(*dirNeedle)), 0, sizeof(*dirNeedle));
+	dirInfo dirMatch;
+	int first, last, fileNum, dirNum;
+	int origNumDirs;
+
+	xx = hge(h, RPMTAG_DIRNAMES, &dnt, (void **) &dirNames, &numDirs);
+	xx = hge(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL);
+	xx = hge(h, RPMTAG_FILEFLAGS, NULL, (void **) &fileFlags, NULL);
+
+	/* XXX FIXME: We ought to relocate the directory list here */
+
+	dirMapping = alloca(sizeof(*dirMapping) * numDirs);
+
+	/* allocated enough space for all the directories we could possible
+	   need to add */
+	al->dirs = xrealloc(al->dirs,
+			(al->numDirs + numDirs) * sizeof(*al->dirs));
+	origNumDirs = al->numDirs;
+
+	for (dirNum = 0; dirNum < numDirs; dirNum++) {
+	    dirNeedle->dirName = (char *) dirNames[dirNum];
+	    dirNeedle->dirNameLen = strlen(dirNames[dirNum]);
+	    dirMatch = bsearch(dirNeedle, al->dirs, origNumDirs,
+			       sizeof(*dirNeedle), dirInfoCompare);
+	    if (dirMatch) {
+		dirMapping[dirNum] = dirMatch - al->dirs;
+	    } else {
+		dirMapping[dirNum] = al->numDirs;
+		dirMatch = al->dirs + al->numDirs;
+		dirMatch->dirName = xstrdup(dirNames[dirNum]);
+		dirMatch->dirNameLen = strlen(dirNames[dirNum]);
+		dirMatch->files = NULL;
+		dirMatch->numFiles = 0;
+		al->numDirs++;
+	    }
+	}
+
+	dirNames = hfd(dirNames, dnt);
+
+	for (first = 0; first < p->filesCount; first = last + 1) {
+	    for (last = first; (last + 1) < p->filesCount; last++) {
+		if (dirIndexes[first] != dirIndexes[last + 1])
+		    /*@innerbreak@*/ break;
+	    }
+
+	    dirMatch = al->dirs + dirMapping[dirIndexes[first]];
+	    dirMatch->files = xrealloc(dirMatch->files,
+		    (dirMatch->numFiles + last - first + 1) *
+			sizeof(*dirMatch->files));
+	    if (p->baseNames != NULL)	/* XXX can't happen */
+	    for (fileNum = first; fileNum <= last; fileNum++) {
+		/*@-assignexpose@*/
+		dirMatch->files[dirMatch->numFiles].baseName =
+		    p->baseNames[fileNum];
+		/*@=assignexpose@*/
+		dirMatch->files[dirMatch->numFiles].pkgNum = pkgNum;
+		dirMatch->files[dirMatch->numFiles].fileFlags =
+				fileFlags[fileNum];
+		dirMatch->numFiles++;
+	    }
+	}
+
+	/* XXX should we realloc to smaller size? */
+	if (origNumDirs + al->numDirs)
+	    qsort(al->dirs, al->numDirs, sizeof(*al->dirs), dirInfoCompare);
+
+    }
+
+    /*@-assignexpose@*/
+    p->key = key;
+    /*@=assignexpose@*/
+    /*@-type@*/ /* FIX: cast? */
+    p->fd = (fd != NULL ? fdLink(fd, "alAddPackage") : NULL);
+    /*@=type@*/
+
+    if (relocs) {
+	rpmRelocation * r;
+
+	for (i = 0, r = relocs; r->oldPath || r->newPath; i++, r++)
+	    {};
+	p->relocs = xmalloc((i + 1) * sizeof(*p->relocs));
+
+	for (i = 0, r = relocs; r->oldPath || r->newPath; i++, r++) {
+	    p->relocs[i].oldPath = r->oldPath ? xstrdup(r->oldPath) : NULL;
+	    p->relocs[i].newPath = r->newPath ? xstrdup(r->newPath) : NULL;
+	}
+	p->relocs[i].oldPath = NULL;
+	p->relocs[i].newPath = NULL;
+    } else {
+	p->relocs = NULL;
+    }
+
+    alFreeIndex(al);
+
+    return p;
+}
+
+/**
+ * Compare two available index entries by name (qsort/bsearch).
+ * @param one		1st available index entry
+ * @param two		2nd available index entry
+ * @return		result of comparison
+ */
+static int indexcmp(const void * one, const void * two)		/*@*/
+{
+    /*@-castexpose@*/
+    const availableIndexEntry a = (const availableIndexEntry) one;
+    const availableIndexEntry b = (const availableIndexEntry) two;
+    /*@=castexpose@*/
+    int lenchk = a->entryLen - b->entryLen;
+
+    if (lenchk)
+	return lenchk;
+
+    return strcmp(a->entry, b->entry);
+}
+
+void alMakeIndex(availableList al)
+{
+    availableIndex ai = &al->index;
+    int i, j, k;
+
+    if (ai->size || al->list == NULL) return;
+
+    for (i = 0; i < al->size; i++)
+	ai->size += al->list[i].providesCount;
+
+    if (ai->size) {
+	ai->index = xcalloc(ai->size, sizeof(*ai->index));
+
+	k = 0;
+	for (i = 0; i < al->size; i++) {
+	    for (j = 0; j < al->list[i].providesCount; j++) {
+
+		/* If multilib install, skip non-multilib provides. */
+		if (al->list[i].multiLib &&
+		    !isDependsMULTILIB(al->list[i].provideFlags[j])) {
+			ai->size--;
+			/*@innercontinue@*/ continue;
+		}
+
+		ai->index[k].package = al->list + i;
+		/*@-assignexpose@*/
+		ai->index[k].entry = al->list[i].provides[j];
+		/*@=assignexpose@*/
+		ai->index[k].entryLen = strlen(al->list[i].provides[j]);
+		ai->index[k].type = IET_PROVIDES;
+		k++;
+	    }
+	}
+
+	qsort(ai->index, ai->size, sizeof(*ai->index), indexcmp);
+    }
+}
+
+availablePackage *
+alAllFileSatisfiesDepend(const availableList al,
+		const char * keyType, const char * fileName)
+{
+    int i, found = 0;
+    const char * dirName;
+    const char * baseName;
+    dirInfo dirNeedle =
+		memset(alloca(sizeof(*dirNeedle)), 0, sizeof(*dirNeedle));
+    dirInfo dirMatch;
+    availablePackage * ret = NULL;
+
+    /* Solaris 2.6 bsearch sucks down on this. */
+    if (al->numDirs == 0 || al->dirs == NULL || al->list == NULL)
+	return NULL;
+
+    {	char * t;
+	dirName = t = xstrdup(fileName);
+	if ((t = strrchr(t, '/')) != NULL) {
+	    t++;		/* leave the trailing '/' */
+	    *t = '\0';
+	}
+    }
+
+    dirNeedle->dirName = (char *) dirName;
+    dirNeedle->dirNameLen = strlen(dirName);
+    dirMatch = bsearch(dirNeedle, al->dirs, al->numDirs,
+		       sizeof(*dirNeedle), dirInfoCompare);
+    if (dirMatch == NULL)
+	goto exit;
+
+    /* rewind to the first match */
+    while (dirMatch > al->dirs && dirInfoCompare(dirMatch-1, dirNeedle) == 0)
+	dirMatch--;
+
+    if ((baseName = strrchr(fileName, '/')) == NULL)
+	goto exit;
+    baseName++;
+
+    for (found = 0, ret = NULL;
+	 dirMatch <= al->dirs + al->numDirs &&
+		dirInfoCompare(dirMatch, dirNeedle) == 0;
+	 dirMatch++)
+    {
+	/* XXX FIXME: these file lists should be sorted and bsearched */
+	for (i = 0; i < dirMatch->numFiles; i++) {
+	    if (dirMatch->files[i].baseName == NULL ||
+			strcmp(dirMatch->files[i].baseName, baseName))
+		/*@innercontinue@*/ continue;
+
+	    /*
+	     * If a file dependency would be satisfied by a file
+	     * we are not going to install, skip it.
+	     */
+	    if (al->list[dirMatch->files[i].pkgNum].multiLib &&
+			!isFileMULTILIB(dirMatch->files[i].fileFlags))
+	        /*@innercontinue@*/ continue;
+
+	    if (keyType)
+		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added files)\n"),
+			keyType, fileName);
+
+	    ret = xrealloc(ret, (found+2) * sizeof(*ret));
+	    if (ret)	/* can't happen */
+		ret[found++] = al->list + dirMatch->files[i].pkgNum;
+	    /*@innerbreak@*/ break;
+	}
+    }
+
+exit:
+    dirName = _free(dirName);
+    /*@-mods@*/		/* AOK: al->list not modified through ret alias. */
+    if (ret)
+	ret[found] = NULL;
+    /*@=mods@*/
+    return ret;
+}
+
+#ifdef	DYING
+/**
+ * Check added package file lists for first package that provides a file.
+ * @param al		available list
+ * @param keyType	type of dependency
+ * @param fileName	file name to search for
+ * @return		available package pointer
+ */
+/*@unused@*/ static /*@dependent@*/ /*@null@*/ availablePackage
+alFileSatisfiesDepend(const availableList al,
+		const char * keyType, const char * fileName)
+	/*@*/
+{
+    availablePackage ret;
+    availablePackage * tmp = alAllFileSatisfiesDepend(al, keyType, fileName);
+
+    if (tmp) {
+	ret = tmp[0];
+	tmp = _free(tmp);
+	return ret;
+    }
+    return NULL;
+}
+#endif	/* DYING */
+
+availablePackage *
+alAllSatisfiesDepend(const availableList al,
+		const char * keyType, const char * keyDepend,
+		const char * keyName, const char * keyEVR, int keyFlags)
+{
+    availableIndexEntry needle =
+		memset(alloca(sizeof(*needle)), 0, sizeof(*needle));
+    availableIndexEntry match;
+    availablePackage p, * ret = NULL;
+    int i, rc, found;
+
+    if (*keyName == '/') {
+	ret = alAllFileSatisfiesDepend(al, keyType, keyName);
+	/* XXX Provides: /path was broken with added packages (#52183). */
+	if (ret != NULL && *ret != NULL)
+	    return ret;
+    }
+
+    if (!al->index.size || al->index.index == NULL) return NULL;
+
+    /*@-assignexpose@*/
+    /*@-temptrans@*/
+    needle->entry = keyName;
+    /*@=temptrans@*/
+    needle->entryLen = strlen(keyName);
+    match = bsearch(needle, al->index.index, al->index.size,
+		    sizeof(*al->index.index), indexcmp);
+    /*@=assignexpose@*/
+
+    if (match == NULL) return NULL;
+
+    /* rewind to the first match */
+    while (match > al->index.index && indexcmp(match-1, needle) == 0)
+	match--;
+
+    for (ret = NULL, found = 0;
+	 match <= al->index.index + al->index.size &&
+		indexcmp(match, needle) == 0;
+	 match++)
+    {
+
+	p = match->package;
+	rc = 0;
+	switch (match->type) {
+	case IET_PROVIDES:
+	    for (i = 0; i < p->providesCount; i++) {
+		const char * proEVR;
+		int proFlags;
+
+		/* Filter out provides that came along for the ride. */
+		if (strcmp(p->provides[i], keyName))
+		    /*@innercontinue@*/ continue;
+
+		proEVR = (p->providesEVR ? p->providesEVR[i] : NULL);
+		proFlags = (p->provideFlags ? p->provideFlags[i] : 0);
+		rc = rpmRangesOverlap(p->provides[i], proEVR, proFlags,
+				keyName, keyEVR, keyFlags);
+		if (rc)
+		    /*@innerbreak@*/ break;
+	    }
+	    if (keyType && keyDepend && rc)
+		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (added provide)\n"),
+				keyType, keyDepend+2);
+	    /*@switchbreak@*/ break;
+	}
+
+	/*@-branchstate@*/
+	if (rc) {
+	    ret = xrealloc(ret, (found + 2) * sizeof(*ret));
+	    if (ret)	/* can't happen */
+		ret[found++] = p;
+	}
+	/*@=branchstate@*/
+    }
+
+    if (ret)
+	ret[found] = NULL;
+
+    return ret;
+}
diff --git a/lib/rpmal.h b/lib/rpmal.h
new file mode 100644
index 000000000..3e4bb2a05
--- /dev/null
+++ b/lib/rpmal.h
@@ -0,0 +1,205 @@
+#ifndef H_RPMAL
+#define H_RPMAL
+
+/** \ingroup rpmdep rpmtrans
+ * \file lib/rpmal.h
+ * Structures used for managing added/available package lists.
+ */
+
+typedef /*@abstract@*/ struct fileIndexEntry_s *	fileIndexEntry;
+typedef /*@abstract@*/ struct dirInfo_s *		dirInfo;
+typedef /*@abstract@*/ struct availableIndexEntry_s *	availableIndexEntry;
+typedef /*@abstract@*/ struct availableIndex_s *	availableIndex;
+
+typedef /*@abstract@*/ struct tsortInfo_s *		tsortInfo;
+
+/** \ingroup rpmdep
+ * Dependncy ordering information.
+ */
+/*@-fielduse@*/	/* LCL: confused by union? */
+struct tsortInfo_s {
+    union {
+	int	count;
+	/*@kept@*/ /*@null@*/ availablePackage suc;
+    } tsi_u;
+#define	tsi_count	tsi_u.count
+#define	tsi_suc		tsi_u.suc
+/*@owned@*/ /*@null@*/
+    struct tsortInfo_s * tsi_next;
+/*@kept@*/ /*@null@*/
+    availablePackage tsi_pkg;
+    int		tsi_reqx;
+    int		tsi_qcnt;
+} ;
+/*@=fielduse@*/
+
+/** \ingroup rpmdep
+ * Info about a single package to be installed.
+ */
+struct availablePackage_s {
+    Header h;				/*!< Package header. */
+/*@dependent@*/ const char * name;	/*!< Header name. */
+/*@dependent@*/ const char * version;	/*!< Header version. */
+/*@dependent@*/ const char * release;	/*!< Header release. */
+/*@owned@*/ const char ** provides;	/*!< Provides: name strings. */
+/*@owned@*/ const char ** providesEVR;	/*!< Provides: [epoch:]version[-release] strings. */
+/*@dependent@*/ int * provideFlags;	/*!< Provides: logical range qualifiers. */
+/*@owned@*//*@null@*/ const char ** requires;	/*!< Requires: name strings. */
+/*@owned@*//*@null@*/ const char ** requiresEVR;/*!< Requires: [epoch:]version[-release] strings. */
+/*@dependent@*//*@null@*/ int * requireFlags;	/*!< Requires: logical range qualifiers. */
+/*@owned@*//*@null@*/ const char ** baseNames;	/*!< Header file basenames. */
+/*@dependent@*//*@null@*/ int_32 * epoch;	/*!< Header epoch (if any). */
+    int providesCount;			/*!< No. of Provide:'s in header. */
+    int requiresCount;			/*!< No. of Require:'s in header. */
+    int filesCount;			/*!< No. of files in header. */
+    int npreds;				/*!< No. of predecessors. */
+    int depth;				/*!< Max. depth in dependency tree. */
+    struct tsortInfo_s tsi;		/*!< Dependency tsort data. */
+    uint_32 multiLib;	/* MULTILIB */
+/*@kept@*//*@null@*/ const void * key;	/*!< Private data associated with a package (e.g. file name of package). */
+/*@null@*/ rpmRelocation * relocs;
+/*@null@*/ FD_t fd;
+} ;
+
+/** \ingroup rpmdep
+ * A single available item (e.g. a Provides: dependency).
+ */
+struct availableIndexEntry_s {
+/*@dependent@*/ availablePackage package; /*!< Containing package. */
+/*@dependent@*/ const char * entry;	/*!< Available item name. */
+    size_t entryLen;			/*!< No. of bytes in name. */
+    enum indexEntryType {
+	IET_PROVIDES=1		/*!< A Provides: dependency. */
+    } type;				/*!< Type of available item. */
+} ;
+
+/** \ingroup rpmdep
+ * Index of all available items.
+ */
+struct availableIndex_s {
+/*@null@*/ availableIndexEntry index;	/*!< Array of available items. */
+    int size;				/*!< No. of available items. */
+} ;
+
+/** \ingroup rpmdep
+ * A file to be installed/removed.
+ */
+struct fileIndexEntry_s {
+    int pkgNum;				/*!< Containing package number. */
+    int fileFlags;	/* MULTILIB */
+/*@dependent@*/ /*@null@*/ const char * baseName;	/*!< File basename. */
+} ;
+
+/** \ingroup rpmdep
+ * A directory to be installed/removed.
+ */
+struct dirInfo_s {
+/*@owned@*/ const char * dirName;	/*!< Directory path (+ trailing '/'). */
+    int dirNameLen;			/*!< No. bytes in directory path. */
+/*@owned@*/ fileIndexEntry files;	/*!< Array of files in directory. */
+    int numFiles;			/*!< No. files in directory. */
+} ;
+
+/** \ingroup rpmdep
+ * Set of available packages, items, and directories.
+ */
+struct availableList_s {
+/*@owned@*/ /*@null@*/ availablePackage list;	/*!< Set of packages. */
+    struct availableIndex_s index;	/*!< Set of available items. */
+    int delta;				/*!< Delta for pkg list reallocation. */
+    int size;				/*!< No. of pkgs in list. */
+    int alloced;			/*!< No. of pkgs allocated for list. */
+    int numDirs;			/*!< No. of directories. */
+/*@owned@*/ /*@null@*/ dirInfo dirs;	/*!< Set of directories. */
+} ;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Initialize available packckages, items, and directory list.
+ * @param delta		no. of entries to add on each realloc
+ * @return al		new available list
+ */
+/*@only@*/
+availableList alCreate(int delta)
+	/*@*/;
+
+/**
+ * Free available packages, items, and directory members.
+ * @param al		available list
+ * @return		NULL always
+ */
+/*@null@*/
+availableList alFree(/*@only@*/ /*@null@*/ availableList al)
+	/*@modifies al @*/;
+
+/**
+ * Delete package from available list.
+ * @param al		available list
+ * @param pkgNnum	package index
+ */
+/*@-exportlocal@*/
+void alDelPackage(availableList al, int pkgNum)
+	/*@modifies al @*/;
+/*@=exportlocal@*/
+
+/**
+ * Add package to available list.
+ * @param al		available list
+ * @param pkgNnum	package index, < 0 to force an append
+ * @param h		package header
+ * @param key		package private data
+ * @param fd		package file handle
+ * @param relocs	package file relocations
+ * @return		available package pointer
+ */
+/*@exposed@*/
+availablePackage alAddPackage(availableList al, int pkgNum,
+		Header h, /*@null@*/ /*@dependent@*/ const void * key,
+		/*@null@*/ FD_t fd, /*@null@*/ rpmRelocation * relocs)
+	/*@modifies al, h @*/;
+
+/**
+ * Generate index for available list.
+ * @param al		available list
+ */
+void alMakeIndex(availableList al)
+	/*@modifies al @*/;
+
+/**
+ * Check added package file lists for package(s) that provide a file.
+ * @param al		available list
+ * @param keyType	type of dependency
+ * @param fileName	file name to search for
+ * @return		available package pointer
+ */
+/*@-exportlocal@*/
+/*@only@*/ /*@null@*/
+availablePackage * alAllFileSatisfiesDepend(const availableList al,
+		const char * keyType, const char * fileName)
+	/*@*/;
+/*@=exportlocal@*/
+
+/**
+ * Check added package file lists for package(s) that have a provide.
+ * @param al		available list
+ * @param keyType	type of dependency
+ * @param keyDepend	dependency string representation
+ * @param keyName	dependency name string
+ * @param keyEVR	dependency [epoch:]version[-release] string
+ * @param keyFlags	dependency logical range qualifiers
+ * @return		available package pointer
+ */
+/*@only@*/ /*@null@*/
+availablePackage * alAllSatisfiesDepend(const availableList al,
+		const char * keyType, const char * keyDepend,
+		const char * keyName, const char * keyEVR, int keyFlags)
+	/*@*/;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* H_RPMAL */
diff --git a/lib/transaction.c b/lib/transaction.c
index f33b1c4be..647ad5b7d 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -5,6 +5,7 @@
 #include "system.h"
 
 #include "psm.h"
+#include "rpmal.h"
 #include <rpmmacro.h>	/* XXX for rpmExpand */
 
 #include "fprint.h"
@@ -56,6 +57,8 @@ extern int statvfs (const char * file, /*@out@*/ struct statvfs * buf)
 /*@access PSM_t@*/
 
 /*@access availablePackage@*/
+/*@access availableList@*/
+/*@access transactionElement@*/
 
 /**
  */
@@ -116,9 +119,9 @@ int rpmtransGetKeys(const rpmTransactionSet ts, const void *** ep, int * nep)
 	for (oc = 0; oc < ts->orderCount; oc++, e++) {
 	    switch (ts->order[oc].type) {
 	    case TR_ADDED:
-		if (ts->addedPackages.list) {
+		if (ts->addedPackages->list) {
 		    availablePackage alp;
-		    alp = ts->addedPackages.list + ts->order[oc].u.addedIndex;
+		    alp = ts->addedPackages->list + ts->order[oc].u.addedIndex;
 		    *e = alp->key;
 		    /*@switchbreak@*/ break;
 		}
@@ -913,8 +916,8 @@ static /*@dependent@*/ availablePackage tsGetAlp(void * a)
     if (oc != -1) {
 	rpmTransactionSet ts = iter->ts;
 	TFI_t fi = ts->flList + oc;
-	if (ts->addedPackages.list && fi->type == TR_ADDED)
-	    alp = ts->addedPackages.list + ts->order[oc].u.addedIndex;
+	if (ts->addedPackages->list && fi->type == TR_ADDED)
+	    alp = ts->addedPackages->list + ts->order[oc].u.addedIndex;
     }
     /*@=branchstate@*/
     return alp;
@@ -1093,9 +1096,9 @@ int keep_header = 1;	/* XXX rpmProblemSetAppend prevents dumping headers. */
      * - count files.
      */
     /* The ordering doesn't matter here */
-    if (ts->addedPackages.list != NULL)
-    for (alp = ts->addedPackages.list;
-	(alp - ts->addedPackages.list) < ts->addedPackages.size;
+    if (ts->addedPackages->list != NULL)
+    for (alp = ts->addedPackages->list;
+	(alp - ts->addedPackages->list) < ts->addedPackages->size;
 	alp++)
     {
 	if (!archOkay(alp->h) && !(ts->ignoreSet & RPMPROB_FILTER_IGNOREARCH))
@@ -1155,7 +1158,7 @@ int keep_header = 1;	/* XXX rpmProblemSetAppend prevents dumping headers. */
     /* ===============================================
      * Initialize file list:
      */
-    ts->flEntries = ts->addedPackages.size + ts->numRemovedPackages;
+    ts->flEntries = ts->addedPackages->size + ts->numRemovedPackages;
     ts->flList = xcalloc(ts->flEntries, sizeof(*ts->flList));
 
     /*
@@ -1471,7 +1474,7 @@ int keep_header = 1;	/* XXX rpmProblemSetAppend prevents dumping headers. */
 	case TR_ADDED:
 	    alp = tsGetAlp(tsi);
 assert(alp == fi->ap);
-	    i = alp - ts->addedPackages.list;
+	    i = alp - ts->addedPackages->list;
 
 	    rpmMessage(RPMMESS_DEBUG, "========== +++ %s-%s-%s\n",
 			fi->name, fi->version, fi->release);
diff --git a/po/cs.po b/po/cs.po
index 7f23a06b6..a4cde27e3 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapsáno: %s\n"
@@ -1433,7 +1433,7 @@ msgid " failed - "
 msgstr "selhal - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1442,85 +1442,75 @@ msgstr ""
 "Závislost \"B\" potøebuje období (pøedpokládáno stejné jako \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr "ANO"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr "NE "
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nemohu otevøít databázi balíèkù v %s\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "balíèek %s je ji¾ nainstalován"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr "%s: %-45s ANO (pøidány soubory)\n"
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr "%s: %-45s ANO (pøidáno poskytuje)\n"
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (ke¹ováno)\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s ANO (rpmrc poskytuje)\n"
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s ANO (db soubory)\n"
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s ANO (db balíèek)\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n"
@@ -1528,43 +1518,43 @@ msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "balíèek %s-%s-%s má nesplnìné po¾adavky: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balíèek %s koliduje: %s\n"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr "========== ukládání tsort relací\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n"
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n"
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr "SMYÈKA:\n"
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr "========== pokraèuje tsort ...\n"
 
@@ -1668,7 +1658,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:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datový typ %d není podporován\n"
@@ -2189,173 +2179,173 @@ msgstr "podepsat balíèek (zahodit aktuální podpis)"
 msgid "generate signature"
 msgstr "generovat PGP/GPG podpis"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " je nutné pro %s-%s-%s\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " koliduje s %s-%s-%s\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "balíèek %s je pro jinou architekturu"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "balíèek %s je pro jiný operaèní systém"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr "balíèek %s je ji¾ nainstalován"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "cesta %s v balíèku %s není pøemístitelná"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "soubor %s zpùsobuje konflikt mezi instalovaným %s a %s"
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "soubor %s z instalace %s koliduje se souborem z balíèku %s"
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "balíèek %s (který je novìj¹í, ne¾ %s) je ji¾ nainstalován"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "instalace balíèku %s potøebuje %ld%cB na systému souborù %s"
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "instalace balíèku %s potøebuje %ld inodù na systému souborù %s"
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "pøedtransakèní syscall v balíèku %s: %s selhalo: %s"
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "neznámá chyba %d vznikla pøi manipulaci s balíèkem %s"
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr "========== relokace\n"
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d vynechávám %s\n"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d pøemís»uji %s -> %s\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "vynechávám multilib cestu %s%s\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "vynechávám %s %s\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "pøemís»uji %s do %s\n"
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "pøemís»uji adresáø %s do %s\n"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nemohu zapsat do %%%s %s\n"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 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:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr "zdrojový balíèek neobsahuje .spec soubor\n"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, 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:1638
+#: lib/psm.c:1571
 #, 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:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s obsahuje %d souborù, test = %d\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n"
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, 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:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou¾ita skupina root\n"
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalování archívu selhalo %s%s: %s\n"
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr " na souboru "
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nemohu otevøít %s: %s\n"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s selhalo\n"
@@ -2873,13 +2863,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Podpisu: velikost(%d)+vata(%d)\n"
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, 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:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "vynechávám adresáø %s\n"
@@ -3420,6 +3410,12 @@ msgstr "url port musí být èíslo\n"
 msgid "failed to create %s: %s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
 
+#~ msgid "%s: %-45s YES (added files)\n"
+#~ msgstr "%s: %-45s ANO (pøidány soubory)\n"
+
+#~ msgid "%s: %-45s YES (added provide)\n"
+#~ msgstr "%s: %-45s ANO (pøidáno poskytuje)\n"
+
 #~ msgid "cannot open rpm database in %s\n"
 #~ msgstr "nemohu otevøít RPM databázi v %s\n"
 
diff --git a/po/da.po b/po/da.po
index b2ba61d5a..992dff51b 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -1434,7 +1434,7 @@ msgid " failed - "
 msgstr " mislykkedes - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1443,86 +1443,76 @@ msgstr ""
 "\"B\"-afhængighed kræver en epoke (antager samme som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 #, fuzzy
 msgid "NO "
 msgstr "IKKE O.K."
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kunne ikke åbne Packages-database i %s\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "pakken %s er allerede installeret"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr "%s: %-45s JA (tilføjede filer)\n"
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr "%s: %-45s JA (tilføjede 'provide')\n"
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (husket)\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s JA (rpmrc tilfører)\n"
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s JA (rpmlib tilfører)\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db tilfører)\n"
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s JA (db-pakke)\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n"
@@ -1530,42 +1520,42 @@ msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakke %s skaber konflikt: %s\n"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr "========== gemmer tsort-relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n"
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr "LØKKE:\n"
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr "========== fortsætter tsort ...\n"
 
@@ -1668,7 +1658,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:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatype %d understøttes ikke\n"
@@ -2207,176 +2197,176 @@ msgstr "underskriv en pakke (slet nuværende signatur)"
 msgid "generate signature"
 msgstr "generér PGP/GPG-signatur"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " kræves af %s-%s-%s\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " skaber konflikt med %s-%s-%s\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "pakken %s hører til en anden arkitektur"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "pakken %s hører til et andet operativsystem"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr "pakken %s er allerede installeret"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "sti %s i pakke %s kan ikke omrokeres"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "filen %s skaber konflikt mellem den forsøgte installation af %s og %s"
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "filen %s fra installationen af %s skaber konflikt med fil fra pakken %s"
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "pakke %s (som er nyere end %s) er allerede installeret"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "installation af pakke %s kræver %ld%cb på %s-filsystemet"
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "installation af pakken %s kræver %ld inode'r på %s-filsystemet"
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "pakke %s prætransaktion-systemkald: %s mislykkedes: %s"
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ukendt fejl %d under arbejdet med pakken %s"
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr "========== gemmer omrokeringer\n"
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ekskluderer %s\n"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d omrokerer %s -> %s\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ekskluderer multilib-sti %s%s\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "ekskluderer %s %s\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "omrokerer %s til %s\n"
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "omrokerer kataloget %s til %s\n"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kunne ikke skrive til %s\n"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, binær fundet\n"
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke indeholder ingen .spec-fil\n"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "kører postinstallations-skript (hvis det findes)\n"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, 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:1638
+#: lib/psm.c:1571
 #, 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:1985
+#: lib/psm.c:1918
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "pakke: %s-%s-%s filer test = %d\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "bruger %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "gruppe %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr " for fil "
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "kunne ikke åbne %s: %s\n"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s mislykkedes\n"
@@ -2895,13 +2885,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signaturfyld : %d\n"
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s oversprunget grundet manglende ok-flag\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer kataloget %s\n"
@@ -3449,6 +3439,12 @@ msgstr "url-port skal være et tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke oprette %s: %s\n"
 
+#~ msgid "%s: %-45s YES (added files)\n"
+#~ msgstr "%s: %-45s JA (tilføjede filer)\n"
+
+#~ msgid "%s: %-45s YES (added provide)\n"
+#~ msgstr "%s: %-45s JA (tilføjede 'provide')\n"
+
 #~ msgid "cannot open rpm database in %s\n"
 #~ msgstr "kan ikke åbne rpm-database i %s\n"
 
diff --git a/po/de.po b/po/de.po
index 306ba09d3..40af7b358 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1569,92 +1569,82 @@ msgid " failed - "
 msgstr "pgp fehlgeschlagen"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
@@ -1662,43 +1652,43 @@ msgstr "die Datei »%s« gehört zu keinem Paket\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 # FIXME
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1805,7 +1795,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2373,183 +2363,183 @@ msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
 msgid "generate signature"
 msgstr "PGP-Signatur generieren"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " wird von %s-%s-%s gebraucht\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " steht im Konflikt mit %s-%s-%s\n"
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr " steht im Konflikt mit %s-%s-%s\n"
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, fuzzy, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
 # , c-format
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
 # , c-format
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Hole %s heraus\n"
 
 # , c-format
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "Keine Stufen ausführen"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, 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:1638
+#: lib/psm.c:1571
 #, 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:1985
+#: lib/psm.c:1918
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp fehlgeschlagen"
@@ -3091,13 +3081,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
diff --git a/po/en_RN.po b/po/en_RN.po
index d8d93b7f5..cd1416c42 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,92 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1504,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1640,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2147,173 +2137,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2827,13 +2817,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index d8d93b7f5..cd1416c42 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,92 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1504,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1640,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2147,173 +2137,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2827,13 +2817,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index d8d93b7f5..cd1416c42 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,92 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1504,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1640,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2147,173 +2137,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2827,13 +2817,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index a3800339a..a4715ae6b 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1452,92 +1452,82 @@ msgid " failed - "
 msgstr "pgp epäonnistui"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
@@ -1545,42 +1535,42 @@ msgstr "tiedostoa %s ei omista mikään paketti\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1683,7 +1673,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2240,174 +2230,174 @@ msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
 msgid "generate signature"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr "vaatii %s-%s-%s\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr " on ristiriidassa %s-%s-%s:n kanssa\n"
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, fuzzy, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Haen: %s\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, 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:1638
+#: lib/psm.c:1571
 #, 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:1985
+#: lib/psm.c:1918
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp epäonnistui"
@@ -2942,13 +2932,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
diff --git a/po/fr.po b/po/fr.po
index 0baba035e..ffe416679 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1492,92 +1492,82 @@ msgid " failed - "
 msgstr "La construction a chou.\n"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1585,42 +1575,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1721,7 +1711,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2293,175 +2283,175 @@ msgstr ""
 msgid "generate signature"
 msgstr "      --sign            - genre une signature PGP"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "La construction a chou.\n"
@@ -2991,13 +2981,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 972fe6230..742117ec1 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1406,92 +1406,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1499,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1635,7 +1625,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2142,173 +2132,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2822,13 +2812,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index d8d93b7f5..cd1416c42 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,92 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1504,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1640,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2147,173 +2137,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2827,13 +2817,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index d8d93b7f5..cd1416c42 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,92 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1504,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1640,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2147,173 +2137,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2827,13 +2817,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index e53387ecc..342b7db12 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrifaði: %s\n"
@@ -1411,92 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "get ekki opnað pakka gagnagrunn í\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1504,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1640,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2152,173 +2142,173 @@ msgstr ""
 msgid "generate signature"
 msgstr "búa til undirskrift"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d færa %s -> %s\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "gat ekki búið til %%%s %s\n"
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "get ekki ritað í %%%s %s\n"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr "pakkinn inniheldur enga .spec skrá\n"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "gat ekki opnað %s: %s\n"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s brást\n"
@@ -2832,13 +2822,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index d8d93b7f5..cd1416c42 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,92 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1504,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1640,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2147,173 +2137,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2827,13 +2817,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index b5355762f..42aa8b499 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "½ñ¤­¹þ¤ßÃæ: %s\n"
@@ -1484,7 +1484,7 @@ msgid " failed - "
 msgstr "¼ºÇÔ - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1493,85 +1493,75 @@ msgstr ""
 "\"B\" ¤Î°Í¸À­¤Ï epoch ¤òɬÍפȤ·¤Þ¤¹(\"A\"¤ÈƱ¤¸¤Ç¤¢¤ë¤È²¾Äꤷ¤Æ)\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, fuzzy, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-
-#: lib/depends.c:1423
-#, fuzzy, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr "%s: %s ¤Ï provide ¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
@@ -1579,42 +1569,42 @@ msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1718,7 +1708,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "grabDate() RPM_STRING_TYPE ¥«¥¦¥ó¥È¤Ï 1 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "¥Ç¡¼¥¿¥¿¥¤¥× %d ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
@@ -2291,185 +2281,185 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ð̾¤·¤Þ¤¹(¸½ºß¤Î½ð̾¤Ï¼Î¤Æ¤é¤ì¤Þ¤¹)"
 msgid "generate signature"
 msgstr "PGP/GPG ½ð̾¤òÀ¸À®¤·¤Þ¤¹"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr "¤Ï %s-%s-%s ¤ËɬÍפȤµ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " %s-%s-%s ¤È¶¥¹ç¤·¤Þ¤¹\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë¥¢¡¼¥­¥Æ¥¯¥Á¥ã¸þ¤±¤Ç¤¹"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï°Û¤Ê¤ë OS ¸þ¤±¤Ç¤¹"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, fuzzy, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 "¥Õ¥¡¥¤¥ë %s ¤Ï %s-%s-%s ¤È %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Î¥Õ¥¡¥¤¥ë¤È¶¥¹ç¤·¤Æ¤¤¤Þ¤¹"
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "%s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤«¤é¤Î¥Õ¥¡¥¤¥ë %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤«¤é¤Î¥Õ¥¡¥¤¥ë"
 "¤È¶¥¹ç¤·¤Æ¤¤¤Þ¤¹"
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s (%s-%s-%s¤è¤ê¤â¿·¤·¤¤¤â¤Î) ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ"
 "¤¹"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, fuzzy, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å"
 "¤Ç)"
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, fuzzy, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Î¥¤¥ó¥¹¥È¡¼¥ë¤Ï %ld%cb ¤¬É¬ÍפǤ¹(%s ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å"
 "¤Ç)"
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, fuzzy, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ÉÔÌÀ¤Ê¥¨¥é¡¼ %d ¤¬¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ÎÁàºîÃæ¤Ë¤ª¤­¤Þ¤·¤¿"
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS ¤Ï½ü³°¤µ¤ì¤Æ¤¤¤Þ¤¹: %s"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%s ¤Ø½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s"
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 #, fuzzy
 msgid " on file "
 msgstr "¥Õ¥¡¥¤¥ë¾å"
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ¼ºÇÔ"
@@ -3002,13 +2992,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "½ð̾¥Ñ¥Ã¥É: %d\n"
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n"
@@ -3568,6 +3558,14 @@ msgid "failed to create %s: %s\n"
 msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
 #, fuzzy
+#~ msgid "%s: %-45s YES (added files)\n"
+#~ msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
+
+#, fuzzy
+#~ msgid "%s: %-45s YES (added provide)\n"
+#~ msgstr "%s: %s ¤Ï provide ¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
+
+#, fuzzy
 #~ msgid "cannot open rpm database in %s\n"
 #~ msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
diff --git a/po/ko.po b/po/ko.po
index f04d331b7..70ff5ac8a 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "ÀÛ¼º: %s\n"
@@ -1424,7 +1424,7 @@ msgid " failed - "
 msgstr " ½ÇÆÐÇÔ - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1433,85 +1433,75 @@ msgstr ""
 "\"B\" ÀÇÁ¸¼ºÀº Áß¿ä½Ã µÇ´Â °Í(epoch)À» ÇÊ¿ä·Î ÇÕ´Ï´Ù (\"A\" ·Î °¡Á¤ÇÕ´Ï´Ù)\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr "¿¹"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr "¾Æ´Ï¿À"
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr "%s: %-45s ¿¹ (ÆÄÀÏÀÌ Ãß°¡µÊ)\n"
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr "%s: %-45s ¿¹ (Á¦°øÀÌ Ãß°¡µÊ)\n"
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (ij½ÃµÊ)\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s ¿¹ (db ÆÄÀÏ)\n"
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s ¿¹ (db ÆÐÅ°Áö)\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s ¾Æ´Ï¿À\n"
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n"
@@ -1519,43 +1509,43 @@ msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "ÆÐÅ°Áö %s (ÀÌ)°¡ Ãæµ¹ÇÔ: %s\n"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n"
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n"
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr "·çÇÁ(LOOP):\n"
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n"
 
@@ -1659,7 +1649,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() RPM_STRING_TYPE Ä«¿îÆ®´Â ¹Ýµå½Ã '1' À̾î¾ß ÇÕ´Ï´Ù.\n"
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "%d µ¥ÀÌÅÍ À¯ÇüÀº »ç¿ëÇÏ½Ç ¼ö ¾ø½À´Ï´Ù\n"
@@ -2183,185 +2173,185 @@ msgstr "ÆÐÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)"
 msgid "generate signature"
 msgstr "¼­¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " (Àº)´Â %s-%s-%s ¿¡¼­ ÇÊ¿ä·Î ÇÕ´Ï´Ù\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " %s-%s-%s (¿Í)°ú Ãæµ¹ÇÕ´Ï´Ù\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "%s (Àº)´Â ´Ù¸¥ ¾ÆÅ°ÅØÃĸ¦ À§ÇÑ ÆÐÅ°ÁöÀÔ´Ï´Ù"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "%s (Àº)´Â ´Ù¸¥ ¿î¿µÃ¼Á¦¸¦ À§ÇÑ ÆÐÅ°ÁöÀÔ´Ï´Ù"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "%2$s ÆÐÅ°Áö ¾ÈÀÇ %1$s °æ·Î´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "%2$s (¿Í)°ú %3$s ÀÇ ¼³Ä¡ °úÁ¤¿¡¼­ %1$s ÆÄÀÏÀÌ ¼­·Î Ãæµ¹ÇÕ´Ï´Ù"
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "%2$s ¿¡¼­ ¼³Ä¡µÇ´Â %1$s ÆÄÀÏÀº %3$s ÆÐÅ°ÁöÀÇ ÆÄÀÏ°ú Ãæµ¹ÇÕ´Ï´Ù"
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "%s ÆÐÅ°Áö (%s º¸´Ù ÃÖ½ÅÀÇ ÆÐÅ°Áö)´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 "%4$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld%3$cb (ÀÌ)°¡ ÇÊ¿äÇÕ"
 "´Ï´Ù"
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 "%3$s ÆÄÀϽýºÅÛ »ó¿¡¼­ %1$s ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÒ °æ¿ì¿¡´Â %2$ld ÀÇ ¾ÆÀ̳ëµå(inode)"
 "°¡ ÇÊ¿äÇÕ´Ï´Ù"
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 "%s ÆÐÅ°ÁöÀÇ ¼±(pre)-Æ®·£Àè¼Ç ½Ã½ºÅÛÄÝ(syscall): %s (ÀÌ)°¡ ½ÇÆÐÇß½À´Ï´Ù: %s"
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 "%2$s ÆÐÅ°Áö¸¦ ó¸®ÇÏ´Â °úÁ¤¿¡¼­ ¾Ë ¼ö ¾ø´Â ¿À·ù %1$d (ÀÌ)°¡ ¹ß»ýÇß½À´Ï´Ù"
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr "========== Àç¹èÄ¡\n"
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d Á¦¿Ü(exclude)  %s\n"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d Àç¹èÄ¡ %s -> %s\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "%s%s multilib °æ·Î¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "%s %s (À»)¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s ¿¡¼­ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s µð·ºÅ丮¸¦ %s (À¸)·Î Àç¹èÄ¡ ÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s %s (À»)¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s %s (À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr "¼Ò½º ÆÐÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n"
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr "¼Ò½º ÆÐÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, 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:1638
+#: lib/psm.c:1571
 #, 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:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s (ÀÌ)°¡ %d ÀÇ ÆÄÀÏÀ» °®°í ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 "%s: %s ½ºÅ©¸³Æ®¸´(scriptlet)°¡ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s (À»)¸¦ »ý·«ÇÕ´Ï"
 "´Ù\n"
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n"
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ "
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n"
@@ -2878,13 +2868,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "¼­¸í: size(%d)+pad(%d)\n"
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "missingok Ç÷¡±×·Î ÀÎÇØ %s (À»)¸¦ »ý·«ÇÕ´Ï´Ù\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s µð·ºÅ丮¸¦ Á¦¿Ü½Ãŵ´Ï´Ù\n"
@@ -3433,6 +3423,12 @@ msgstr "URL Æ÷Æ®´Â ¹Ýµå½Ã ¼ýÀÚÀ̾î¾ß ÇÕ´Ï´Ù\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s (À»)¸¦ »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n"
 
+#~ msgid "%s: %-45s YES (added files)\n"
+#~ msgstr "%s: %-45s ¿¹ (ÆÄÀÏÀÌ Ãß°¡µÊ)\n"
+
+#~ msgid "%s: %-45s YES (added provide)\n"
+#~ msgstr "%s: %-45s ¿¹ (Á¦°øÀÌ Ãß°¡µÊ)\n"
+
 #~ msgid "cannot open rpm database in %s\n"
 #~ msgstr "%s ¿¡¼­ rpm µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
 
diff --git a/po/no.po b/po/no.po
index 961de7155..745c0b0d5 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -1425,92 +1425,82 @@ msgid " failed - "
 msgstr " feilet - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr "JA"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr "NEI"
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan ikke åpne pakkedatabase i %s\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "pakke %s er allerede installert"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1518,42 +1508,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakke %s er i konflikt: %s\n"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1654,7 +1644,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatype %d ikke støttet\n"
@@ -2174,173 +2164,173 @@ msgstr "signer en pakke (forkast nåværende signatur)"
 msgid "generate signature"
 msgstr "generer signatur"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " kreves av %s-%s-%s\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " er i konflikt med %s-%s-%s\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "pakke %s er for en annen arkitektur"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "pakke %s er for et annet operativsystem"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr "pakke %s er allerede installert"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "sti %s i pakke %s kan ikke relokeres"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d omplasser %s -> %s\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ekskluderer multilib-sti %s%s\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "eksluderer %s %s\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "relokerer %s til %s\n"
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "relokerer katalog %s til %s\n"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke opprette %%%s %s\n"
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan ikke skrive til %%%s %s\n"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, binær funnet\n"
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke inneholder ikke en .spec-fil\n"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: kjører %s-skript (hvis noen)\n"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "klarte ikke å åpne %s: %s\n"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s feilet\n"
@@ -2856,13 +2846,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ekskluderer katalog %s\n"
diff --git a/po/pl.po b/po/pl.po
index 6bbc8c422..a1a797eb9 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -1466,93 +1466,83 @@ msgid " failed - "
 msgstr " nie powiod³o siê -"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 #, fuzzy
 msgid "NO "
 msgstr "NIE DOBRZE"
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
@@ -1560,42 +1550,42 @@ msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakiet %s jest w konflikcie: %s\n"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "usuwanie indeksu grupy\n"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1699,7 +1689,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:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ danych %d nie jest obs³ugiwany\n"
@@ -2254,177 +2244,177 @@ msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
 msgid "generate signature"
 msgstr "generuj sygnaturê PGP/GPG"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " jest wymagany przez %s-%s-%s\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " jest w konflikcie z %s-%s-%s\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "pakiet %s-%s-%s zbudowano dla innej architektury"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "pakiet %s-%s-%s zbudowano dla innego systemu operacyjnego"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "pakiet %s nie jest przesuwalny\n"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "plik %s z pakietu %s-%s-%s jest w konflikcie z plikiem z pakietu %s-%s-%s"
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 "pakiet %s-%s-%s (który jest nowszy ni¿ %s-%s-%s) jest ju¿ zainstalowany"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, fuzzy, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s"
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, fuzzy, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "instalacja pakietu %s-%s-%s wymaga %ld%c w systemie plików %s"
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, fuzzy, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "wyst±pi³ nieznany b³±d %d w trakcie manipulowania pakietem %s-%s-%s"
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Ten OS nie jest wspierany: %s"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "wy³±czanie %s\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "wy³±czanie %s\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nie mo¿na utworzyæ %s"
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nie mo¿na zapisaæ do %s"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "spodziewany pakiet ¼ród³owy a nie binarny"
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, 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:1638
+#: lib/psm.c:1571
 #, 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:1985
+#: lib/psm.c:1918
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "pakiet: %s-%s-%s test plików = %d\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, 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:2226
+#: lib/psm.c:2159
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s nie istnieje - u¿yto grupy root"
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, 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:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s nie powiod³o siê"
@@ -2955,13 +2945,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Blok sygnatury: %d\n"
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s pominiêty z powodu flagi missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
diff --git a/po/pt.po b/po/pt.po
index bce97bfe4..f6e9ea92e 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Gravei: %s\n"
@@ -1421,7 +1421,7 @@ msgid " failed - "
 msgstr " falhou - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1430,86 +1430,76 @@ msgstr ""
 "A dependência \"B\" precisa duma época (assumindo a mesma que \"A\")\n"
 "\t %s\tB %s\n"
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s     A %s\tB %s\n"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 #, fuzzy
 msgid "NO "
 msgstr "NÃO-OK"
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "não consigo abrir a base de dados Packages em %s\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "o pacote %s já está instalado"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr "%s: %-45s SIM (ficheiros adicionados)\n"
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr "%s: %-45s SIM (oferecidos para adição)\n"
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (em cache)\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n"
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s SIM (ficheiros db)\n"
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s SI (oferecidos pelo db)\n"
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s SIM (pacote db)\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NÃO\n"
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) adicionado à cache de dependências.\n"
@@ -1517,42 +1507,42 @@ msgstr "%s: (%s, %s) adicionado à cache de dependências.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "requisito %s-%s-%s do pacote não satisfeito: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "o pacote %s está em conflito: %s\n"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "a remover o %s-%s-%s \"%s\" das relações do tsort.\n"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr "=========== a guardar as relações do tsort\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr "========== só os sucessores (ordem de apresentação)\n"
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr "CICLO:\n"
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr "========== a prosseguir o tsort ...\n"
 
@@ -1655,7 +1645,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:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "O tipo de dados %d não é suportado\n"
@@ -2186,173 +2176,173 @@ msgstr "assinar um pacote (retira a assinatura actual)"
 msgid "generate signature"
 msgstr "gerar a assinatura PGP/GPG"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " é necessário pelo %s-%s-%s\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " está em conflito com o %s-%s-%s\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "o pacote %s é para uma arquitectura diferente"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "o pacote %s é para um sistema operativo diferente"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr "o pacote %s já está instalado"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "a directoria %s no pacote %s não pode ser mudada de sítio"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "o ficheiro %s está em conflito com as tentativas de instalação do %s e %s"
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "o ficheiro %s da instalação do %s está em conflito com o ficheiro do pacote %s"
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "o pacote %s (que é mais recente que o %s) já está instalado"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "a instalação do pacote %s precisa de %ld%cb no sistema de ficheiros %s"
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "a instalação do pacote %s precisa de %ld 'inodes' no sistema de ficheiros %s"
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "a(s) chamada(s) de pré-transacção do pacote %s: %s falhou: %s"
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "encontrado o erro desconhecido %d ao manipular o pacote %s"
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr "========== mudanças de local\n"
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d excluir o %s\n"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d mudar de local %s -> %s\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "a exclur a directoria 'multilib' %s%s\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "a excluir o %s %s\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "a mudar o %s para %s\n"
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "a mudar a directoria %s para %s\n"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "não consigo criar o %s: %s\n"
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "não consigo escrever em %s\n"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 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:1353
+#: lib/psm.c:1286
 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:1463
+#: lib/psm.c:1396
 #, 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:1631
+#: lib/psm.c:1564
 #, 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:1638
+#: lib/psm.c:1571
 #, 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:1985
+#: lib/psm.c:1918
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "pacote: teste dos ficheiros do %s-%s-%s = %d\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, 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:2226
+#: lib/psm.c:2159
 #, 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:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "a abertura do pacote falhou%s%s: %s\n"
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr " no ficheiro "
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "falhei ao aceder ao %s: %s\n"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "O %s falhou\n"
@@ -2869,13 +2859,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "'Pad' ou preenchimento da assinatura: %d\n"
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ignorado devido à opção missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "a excluir a directoria %s\n"
@@ -3412,6 +3402,12 @@ 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 "%s: %-45s YES (added files)\n"
+#~ msgstr "%s: %-45s SIM (ficheiros adicionados)\n"
+
+#~ msgid "%s: %-45s YES (added provide)\n"
+#~ msgstr "%s: %-45s SIM (oferecidos para adição)\n"
+
 #~ msgid "cannot open rpm database in %s\n"
 #~ msgstr "não consigo a base de dados do RPM em %s\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6d327b064..71701ad3f 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1578,93 +1578,83 @@ msgid " failed - "
 msgstr "Construo falhou.\n"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
 # , c-format
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1672,42 +1662,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "no foi passado pacote para instalao"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1815,7 +1805,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2380,72 +2370,72 @@ msgstr "assine um pacote (descarte a assinatura corrente)"
 msgid "generate signature"
 msgstr "gere assinatura PGP"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
@@ -2457,13 +2447,13 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "RPM verso %s\n"
 
 # , c-format
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -2476,7 +2466,7 @@ msgstr "No consegui abrir: %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "RPM verso %s\n"
@@ -2489,94 +2479,94 @@ msgstr "RPM verso %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "RPM verso %s\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
 # , c-format
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "no execute nenhum estgio"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "Construo falhou.\n"
@@ -3135,7 +3125,7 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
@@ -3149,7 +3139,7 @@ msgstr ""
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "RPM verso %s\n"
diff --git a/po/ro.po b/po/ro.po
index 7682da32d..68f49e9d0 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1406,92 +1406,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1499,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1635,7 +1625,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2142,173 +2132,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2822,13 +2812,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index eb51fa3e8..e1d084e69 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-10-29 11:11-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2181
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2447
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,92 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1504,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1640,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:998
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2147,173 +2137,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:223
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:226
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:266
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:271
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:276
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:281
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:286
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:291
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:296
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:301
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:311
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:316
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:323
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:321
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:325
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:328
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:398
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:464
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:474
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:553
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1195
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1201
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1241
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1354
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1464
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1632
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1639
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1986
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2103
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2218
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2269
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2455
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2458
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2827,13 +2817,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:314
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index ca1de4e7b..e3c5fc496 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "úÁÐÉÓÁÎ: %s\n"
@@ -1442,7 +1442,7 @@ msgid " failed - "
 msgstr "ÎÅ ÕÄÁÌÏÓØ - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1451,85 +1451,75 @@ msgstr ""
 "ÄÌÑ ÚÁ×ÉÓÉÍÏÓÔÉ \"B\" ÎÕÖÎÏ ÕËÁÚÁÔØ \"epoch\" (ÔÁË ÖÅ ËÁË ÄÌÑ \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr "äá"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr "îåT"
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr "%s: %-45s YES (added files)\n"
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr "%s: %-45s YES (added provide)\n"
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (cached)\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s YES (rpmrc provides)\n"
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s YES (rpmlib provides)\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s YES (db files)\n"
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s YES (db provides)\n"
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s YES (db package)\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NO\n"
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
@@ -1537,44 +1527,44 @@ msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, "
 "ÇÌÕÂÉÎÁ)\n"
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n"
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr "ãéëì:\n"
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n"
 
@@ -1678,7 +1668,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr "dataLength() ÄÏÐÕÓÔÉÍ ÔÏÌØËÏ ÏÄÉÎ ÜÌÅÍÅÎÔ ÔÉÐÁ RPM_STRING_TYPE\n"
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "ôÉÐ ÄÁÎÎÙÈ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
@@ -2202,173 +2192,173 @@ msgstr "ÐÏÄÐÉÓÁÔØ ÐÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕÝÕÀ ÐÏÄÐÉÓØ)"
 msgid "generate signature"
 msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ÐÏÄÐÉÓØ"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " ÎÕÖÅÎ ÄÌÑ %s-%s-%s\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " ËÏÎÆÌÉËÔÕÅÔ Ó %s-%s-%s\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "ÐÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÁÒÈÉÔÅËÔÕÒÙ"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "ÐÁËÅÔ %s - ÄÌÑ ÄÒÕÇÏÊ ÏÐÅÒÁÃÉÏÎÎÏÊ ÓÉÓÔÅÍÙ"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "ÐÕÔØ %s × ÐÁËÅÔÅ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "ËÏÎÆÌÉËÔ ÆÁÊÌÁ %s ÐÒÉ ÐÏÐÙÔËÁÈ ÕÓÔÁÎÏ×ËÉ %s É %s"
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "ÆÁÊÌ %s ÉÚ ÕÓÔÁÎÏ×ÌÅÎÎÏÇÏ ÐÁËÅÔÁ %s ËÏÎÆÌÉËÔÕÅÔ Ó ÆÁÊÌÏÍ ÉÚ ÐÁËÅÔÁ %s"
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "ÐÁËÅÔ %s (ËÏÔÏÒÙÊ ÎÏ×ÅÅ, ÞÅÍ %s) ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ %s ÎÕÖÎÏ %ld%cb ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s"
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÐÁËÅÔÁ %s ÎÕÖÎÏ %ld inodes ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ %s"
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "ÐÁËÅÔ %s pre-transaction syscall(s): %s: ÏÛÉÂËÁ: %s"
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ÎÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ %d ÐÒÉ ÒÁÂÏÔÅ Ó ÐÁËÅÔÏÍ %s"
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr "========== ÐÅÒÅÍÅÝÅÎÉÊ\n"
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ÉÓËÌÀÞÅÎ %s\n"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d ÐÅÒÅÍÅÝÅÎÉÅ %s -> %s\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ÉÓËÌÀÞÁÅÔÓÑ ÍÎÏÇÏÂÉÂÌÉÏÔÅÞÎÙÊ ÐÕÔØ %s%s\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "ÉÓËÌÀÞÁÅÔÓÑ %s %s\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ %s × %s\n"
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ ËÁÔÁÌÏÇ %s × %s\n"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n"
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÉÓÁÔØ × %%%s %s\n"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n"
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ\n"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: ×ÙÐÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, 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:1638
+#: lib/psm.c:1571
 #, 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:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, test = %d\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ÐÒÏÐÕÓËÁÅÔÓÑ\n"
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n"
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n"
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr " ÎÁ ÆÁÊÌÅ "
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n"
@@ -2886,13 +2876,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "ðÏÄÐÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁÐÏÌÎÅÎÉÅ(%d)\n"
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n"
@@ -3438,6 +3428,12 @@ msgstr "url ÐÏÒÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏÍ\n"
 msgid "failed to create %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
 
+#~ msgid "%s: %-45s YES (added files)\n"
+#~ msgstr "%s: %-45s YES (added files)\n"
+
+#~ msgid "%s: %-45s YES (added provide)\n"
+#~ msgstr "%s: %-45s YES (added provide)\n"
+
 #~ msgid "cannot open rpm database in %s\n"
 #~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ RPM × %s\n"
 
diff --git a/po/sk.po b/po/sk.po
index 60f2001c7..173f2d00f 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapísané: %s\n"
@@ -1465,93 +1465,83 @@ msgid " failed - "
 msgstr " zlyhalo - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 #, fuzzy
 msgid "NO "
 msgstr "NIE JE V PORIADKU"
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "balík %s nie je nain¹talovaný\n"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
@@ -1559,42 +1549,42 @@ msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balík %s koliduje: %s\n"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstraòuje sa index skupín\n"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1698,7 +1688,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:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ údajov %d nie je podorovaný\n"
@@ -2253,175 +2243,175 @@ msgstr "podpísa» balík (znièi» aktuálny podpis)"
 msgid "generate signature"
 msgstr "vytvori» PGP/GPG podpis"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " je vy¾adované %s-%s-%s\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " koliduje s %s-%s-%s\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "balík %s nie je nain¹talovaný\n"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "balík %s nie je nain¹talovaný\n"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "balík %s nie je nain¹talovaný\n"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "balík %s nie je nain¹talovaný\n"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je vynechaný: %s"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "vynecháva sa %s\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "vynecháva sa %s\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "oèakávaný zdrojový balík, nájdený binárny"
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "balík: %s-%s-%s test súborov = %d\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou¾ije sa root"
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalenie archívu zlyhalo%s%s: %s"
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr " pre súbor "
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nepodarilo sa otvori» %s: %s"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s zlyhalo"
@@ -2952,13 +2942,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Doplnenie podpisu: %d\n"
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s vynechané kvôli príznaku missingok\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "vytvára sa adresár %s\n"
diff --git a/po/sl.po b/po/sl.po
index a97eb44c2..00f57fc55 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.177 2001/10/28 22:18:30 jbj Exp $
+# $Id: sl.po,v 1.178 2001/10/29 20:12:43 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -1466,7 +1466,7 @@ msgid " failed - "
 msgstr " neuspe¹no - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1475,86 +1475,76 @@ msgstr ""
 "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 #, fuzzy
 msgid "NO "
 msgstr "NI DOBRO"
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paket %s-%s-%s je ¾e name¹èen"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, fuzzy, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr "%s: %-45s DA (dodane datoteke)\n"
-
-#: lib/depends.c:1423
-#, fuzzy, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr "%s: %-45s DA (dodane ponudbe)\n"
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (predpomnjeno)\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s DA (rpmrc ponudbe)\n"
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s DA (db datoteke)\n"
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s DA (db ponudbe)\n"
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %s zadovoljen ob paketih db.\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
@@ -1562,42 +1552,42 @@ msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s jw v sporu z: %s\n"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1701,7 +1691,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:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Tip podatkov %d ni podprt\n"
@@ -2253,176 +2243,176 @@ msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
 msgid "generate signature"
 msgstr "izdelava podpisa PGP/GPG"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " potrebuje %s-%s-%s\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " je v sporu z %s-%s-%s\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "paket %s-%s-%s je za drug tip arhitekture"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "paket %s-%s-%s je za drug operacijski sistem"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "paket %s-%s-%s je ¾e name¹èen"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "paketa %s ni mo¾no prestaviti\n"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, fuzzy, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "datoteka %s je v sporu med poskusom namestitve %s in %s"
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 "datoteka %s name¹èena z %s-%s-%s je v sporu z datoteko iz paketa %s-%s-%s"
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "paket %s-%s-%s (ki je novej¹i kot %s-%s-%s) je ¾e name¹èen"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, fuzzy, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "namestitev paketa %s-%s-%s zahteva %ld%cb na datoteènem sistemu %s"
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, fuzzy, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "paket %s pred-prenosljivih sistemskih klicov: %s ni uspelo: %s"
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, fuzzy, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s"
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je izkljuèen: %s"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "izkljuèevanje datoteke %s%s\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "izkljuèevanje datoteke %s%s\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "premiokanje imenika %s v %s\n"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "ni mo¾no ustvariti %s: %s\n"
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "pisanje na %s ni mo¾no"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "prièakovan je bil izvorni paket, najden binarni"
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "izvorni paket ne vsebuje datoteke .spec"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, 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:1638
+#: lib/psm.c:1571
 #, 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:1985
+#: lib/psm.c:1918
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "paket: %s-%s-%s datoteke test = %d\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "uporabnik %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, 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:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr " za datoteko "
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspe¹no odpiranje %s: %s\n"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s neuspe¹en"
@@ -2950,13 +2940,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Dol¾. polnila : %d\n"
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "izkljuèevanje imenika %s\n"
@@ -3510,6 +3500,14 @@ msgid "failed to create %s: %s\n"
 msgstr "neuspe¹no ustvarjanje %s: %s\n"
 
 #, fuzzy
+#~ msgid "%s: %-45s YES (added files)\n"
+#~ msgstr "%s: %-45s DA (dodane datoteke)\n"
+
+#, fuzzy
+#~ msgid "%s: %-45s YES (added provide)\n"
+#~ msgstr "%s: %-45s DA (dodane ponudbe)\n"
+
+#, fuzzy
 #~ msgid "cannot open rpm database in %s\n"
 #~ msgstr "datoteke %s/packages.rpm ni mogo¾no odpreti\n"
 
diff --git a/po/sr.po b/po/sr.po
index ba5b7fb41..0e398d092 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1450,92 +1450,82 @@ msgid " failed - "
 msgstr "PGP omanuo"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
@@ -1543,42 +1533,42 @@ msgstr "datoteka %s ne pripada nijednom paketu\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s nije naveden u %s"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1681,7 +1671,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2239,174 +2229,174 @@ msgstr "potpi¹i paket (ukloni tekuæi potpis)"
 msgid "generate signature"
 msgstr "napravi PGP potpis"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " je potreban paketu %s-%s-%s\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " se sudara sa %s-%s-%s\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, fuzzy, c-format
 msgid "package %s is for a different architecture"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, fuzzy, c-format
 msgid "package %s is for a different operating system"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, fuzzy, c-format
 msgid "package %s is already installed"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, fuzzy, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, fuzzy, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr " se sudara sa %s-%s-%s\n"
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, fuzzy, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, fuzzy, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "nemoj izvr¹iti nijednu fazu"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, 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:1638
+#: lib/psm.c:1571
 #, 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:1985
+#: lib/psm.c:1918
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "PGP omanuo"
@@ -2941,13 +2931,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, fuzzy, c-format
 msgid "excluding directory %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
diff --git a/po/sv.po b/po/sv.po
index 189e032d4..aa681886d 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -1427,7 +1427,7 @@ msgid " failed - "
 msgstr " misslyckades - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1436,85 +1436,75 @@ msgstr ""
 "\"B\"-beroendet behöver en epok (antar samma som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr "JA"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr "NEJ "
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan inte öppna paketdatabas i %s\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paket %s är redan installerat"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr "%s: %-45s JA (lade till filer)\n"
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr "%s: %-45s JA (lade till tillhandahållande)\n"
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (cachad)\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db-tillhandahållande)\n"
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s JA (db-paket)\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
@@ -1522,43 +1512,43 @@ msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s-%s-%s behov inte uppfyllda: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s står i konflikt: %s\n"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr "========== noterar alla relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n"
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr "========== endast efterföljare (presentationsordning)\n"
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr "LOOP:\n"
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr "========== fortsätter med tsort ...\n"
 
@@ -1662,7 +1652,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:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatyp %d stöds inte\n"
@@ -2185,174 +2175,174 @@ msgstr "signera ett paket (släng nuvarande signatur)"
 msgid "generate signature"
 msgstr "generera signatur"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " behövs av %s-%s-%s\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " står i konflikt med %s-%s-%s\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "paket %s är för en annan arkitektur"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "paket %s är för ett annat operativsystem"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr "paket %s är redan installerat"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "sökväg %s i paket %s är inte relokerbar"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "fil %s är en konflikt mellan installationsförsök av %s och %s"
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "fil %s från installation av %s står i konflikt med filen från paket %s"
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "paket %s (som är nyare än %s) är redan installerat"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "installation av paket %s kräver %ld%cB på filsystem %s"
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "installation av paket %s kräver %ld inoder på filsystem %s"
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "paket %s systemanrop före transaktion: %s misslyckades: %s"
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "okänt fel %d uppträdde under behandling av paket %s"
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr "========== omflyttningar\n"
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d utesluter  %s\n"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d flyttar om %s -> %s\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "hoppar över multilib-sökväg %s%s\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "hoppar över %s %s\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "flyttar %s till %s\n"
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "flyttar katalogen %s till %s\n"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan inte skapa %%%s %s\n"
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan inte skriva till %%%s %s\n"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr "källpaket förväntades, fann binärpaket\n"
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr "källpaket innehåller ingen .spec-fil\n"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: kör (eventuellt) %s-skript\n"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, 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:1638
+#: lib/psm.c:1571
 #, 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:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s har %d filer, test = %d\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr "%s: %s-skript misslyckades (%d), hoppar över %s-%s-%s\n"
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "användare %s finns inte - använder root\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupp %s finns inte - använder root\n"
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "uppackning av arkiv misslyckades%s%s: %s\n"
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s misslyckades på fil %s: %s\n"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s misslyckades: %s\n"
@@ -2871,13 +2861,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s överhoppad på grund av missingok-flagga\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "hoppar över katalogen %s\n"
@@ -3418,6 +3408,12 @@ msgstr "url-port måste vara ett tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
+#~ msgid "%s: %-45s YES (added files)\n"
+#~ msgstr "%s: %-45s JA (lade till filer)\n"
+
+#~ msgid "%s: %-45s YES (added provide)\n"
+#~ msgstr "%s: %-45s JA (lade till tillhandahållande)\n"
+
 #~ msgid "cannot open rpm database in %s\n"
 #~ msgstr "kan inte öppna rpmdatabas i %s\n"
 
diff --git a/po/tr.po b/po/tr.po
index e405b938e..7f94a5625 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Yazýldý: %s\n"
@@ -1447,7 +1447,7 @@ msgid " failed - "
 msgstr " baþarýsýz - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, fuzzy, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1456,85 +1456,75 @@ msgstr ""
 "\"B\" baðýmlýlýðý bir dönemsellik gerektirir (tabii ki \"A\" da)\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr "EVET"
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr "HAYIR "
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s de Paket veritabaný açýlamadý\n"
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "%s zaten kurulu"
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr "%s: %-45s EVET (dosyalar eklendi)\n"
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr "%s: %-45s EVET (önlem eklendi)\n"
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (arabellekli)\n"
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s EVET (rpmrc saðlar)\n"
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s EVET (rpmlib saðlar)\n"
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s EVET (db dosyalarý)\n"
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s EVET (db saðlar)\n"
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s EVET (db paketi)\n"
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s HAYIR\n"
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) Baðýmlýlar alanýna eklendi.\n"
@@ -1542,43 +1532,43 @@ msgstr "%s: (%s, %s) Baðýmlýlar alanýna eklendi.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s paketi çeliþiyor: %s\n"
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "tsort baðýntýlarýndan %s-%s-%s \"%s\" kaldýrýlýyor\n"
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort baðýntýlarý kaydediliyor\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n"
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr "========== sadece ardýllar (sunum sýrasý)\n"
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr "ÇEVRÝM:\n"
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort sürüyor ...\n"
 
@@ -1682,7 +1672,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:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "%d veri türü desteklenmiyor\n"
@@ -2209,173 +2199,173 @@ msgstr "paketi imzalar (mevcut imza kaldýrýlýr)"
 msgid "generate signature"
 msgstr "imza üretir"
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr " %s-%s-%s için gerekli\n"
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr " %s-%s-%s ile çeliþiyor\n"
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr "%s farklý bir mimari için"
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr "%s farklý bir iþletim sistemi için"
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr "%s zaten kurulu"
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr "%s dosya yolu %s paketinde yeniden konumlandýrýlamaz"
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr "%s dosyasý kalkýþýlan %s ve %s kurulumlarý arasýnda çeliþiyor"
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr "%s dosyasýnýn %s kurulumu %s kurulumundaki dosya ile çeliþiyor"
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr "%s paketi zaten yüklü (%s sürümünden daha yeni)"
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr "%s kurulumu %ld%cb gerektiriyor (%s dosya sisteminde)"
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr "%s kurulumu %ld i-düðüm gerektiriyor (%s dosya sisteminde)"
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr "%s iþlem öncesi sistem çaðrý(sý/larý): %s baþarýsýz: %s"
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "anlaþýlamayan %d hatasý, %s paketi iþlenirken saptandý"
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr "========== yeniden konumlama\n"
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d %s'i dýþlýyor\n"
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d yeniden konumlandýrýlýyor: %s -> %s\n"
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "multilib dosya yolu dýþlanýyor %s%s\n"
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "%s %s dýþlanýyor\n"
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s %s'e konumlanýyor\n"
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s dizini %s de yeniden konumlanýyor\n"
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s dosyasý oluþturulamýyor: %s\n"
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s dosyasýna yazýlamaz %s\n"
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr "kaynak paketi gerekirken çalýþtýrýlabilir paketi bulundu\n"
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr "kaynak paketi .spec dosyasý içermiyor\n"
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s betiði çalýþtýrýlýyor (varsa)\n"
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, 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:1638
+#: lib/psm.c:1571
 #, 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:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s %d dosya içeriyor, test = %d\n"
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr "%s: %s betiði baþarýsýz (%d), %s-%s-%s atlanýyor\n"
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "kullanýcý %s yok - root kullanýlacak\n"
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grup %s yok - root kullanýlacak\n"
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, 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:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr " dosyada "
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s baþarýsýz\n"
@@ -2892,13 +2882,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Ýmza: boyut(%d)+iz(%d)\n"
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "missingok flamasýndan dolayý %s atlandý\n"
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr "%s dizini dýþlanýyor\n"
@@ -3442,6 +3432,12 @@ msgstr "url portu bir sayý olmalý\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s oluþturulamadý: %s\n"
 
+#~ msgid "%s: %-45s YES (added files)\n"
+#~ msgstr "%s: %-45s EVET (dosyalar eklendi)\n"
+
+#~ msgid "%s: %-45s YES (added provide)\n"
+#~ msgstr "%s: %-45s EVET (önlem eklendi)\n"
+
 #~ msgid "cannot open rpm database in %s\n"
 #~ msgstr "%s dizininde rpm veritabaný açýlamýyor\n"
 
diff --git a/po/uk.po b/po/uk.po
index d8d93b7f5..cd1416c42 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,92 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1504,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1640,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2147,173 +2137,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2827,13 +2817,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index d8d93b7f5..cd1416c42 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,92 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1504,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1640,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2147,173 +2137,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2827,13 +2817,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index d8d93b7f5..cd1416c42 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,92 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1504,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1640,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2147,173 +2137,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2827,13 +2817,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index d8d93b7f5..cd1416c42 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-10-28 17:05-0500\n"
+"POT-Creation-Date: 2001-10-29 15:04-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:2180
+#: build/pack.c:603 lib/psm.c:2113
 #, 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:2446
+#: build/pack.c:683 lib/psm.c:2379
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,92 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:687
+#: lib/depends.c:206
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:716
+#: lib/depends.c:235
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:717 lib/depends.c:1518 lib/depends.c:1651
+#: lib/depends.c:236 lib/depends.c:835 lib/depends.c:968
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:856
+#: lib/depends.c:375
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:1038
+#: lib/depends.c:556
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:1043
+#: lib/depends.c:561
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:1048
+#: lib/depends.c:566
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:1307
-#, c-format
-msgid "%s: %-45s YES (added files)\n"
-msgstr ""
-
-#: lib/depends.c:1423
-#, c-format
-msgid "%s: %-45s YES (added provide)\n"
-msgstr ""
-
-#: lib/depends.c:1517
+#: lib/depends.c:834
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1546
+#: lib/depends.c:863
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1563
+#: lib/depends.c:880
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1587
+#: lib/depends.c:904
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1600
+#: lib/depends.c:917
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1614
+#: lib/depends.c:931
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1630
+#: lib/depends.c:947
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1651
+#: lib/depends.c:968
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1504,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1724
+#: lib/depends.c:1041
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1803
+#: lib/depends.c:1120
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:2058
+#: lib/depends.c:1374
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:2212
+#: lib/depends.c:1530
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:2272
+#: lib/depends.c:1590
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2322
+#: lib/depends.c:1640
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2375
+#: lib/depends.c:1693
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2405
+#: lib/depends.c:1723
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1640,7 +1630,7 @@ msgid "dataLength() RPM_STRING_TYPE count must be 1.\n"
 msgstr ""
 
 #. @-modfilesys@
-#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:997
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:930
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2147,173 +2137,173 @@ msgstr ""
 msgid "generate signature"
 msgstr ""
 
-#: lib/problems.c:83
+#: lib/problems.c:224
 #, c-format
 msgid " is needed by %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:86
+#: lib/problems.c:227
 #, c-format
 msgid " conflicts with %s-%s-%s\n"
 msgstr ""
 
-#: lib/problems.c:126
+#: lib/problems.c:267
 #, c-format
 msgid "package %s is for a different architecture"
 msgstr ""
 
-#: lib/problems.c:131
+#: lib/problems.c:272
 #, c-format
 msgid "package %s is for a different operating system"
 msgstr ""
 
-#: lib/problems.c:136
+#: lib/problems.c:277
 #, c-format
 msgid "package %s is already installed"
 msgstr ""
 
-#: lib/problems.c:141
+#: lib/problems.c:282
 #, c-format
 msgid "path %s in package %s is not relocateable"
 msgstr ""
 
-#: lib/problems.c:146
+#: lib/problems.c:287
 #, c-format
 msgid "file %s conflicts between attempted installs of %s and %s"
 msgstr ""
 
-#: lib/problems.c:151
+#: lib/problems.c:292
 #, c-format
 msgid "file %s from install of %s conflicts with file from package %s"
 msgstr ""
 
-#: lib/problems.c:156
+#: lib/problems.c:297
 #, c-format
 msgid "package %s (which is newer than %s) is already installed"
 msgstr ""
 
-#: lib/problems.c:161
+#: lib/problems.c:302
 #, c-format
 msgid "installing package %s needs %ld%cb on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:171
+#: lib/problems.c:312
 #, c-format
 msgid "installing package %s needs %ld inodes on the %s filesystem"
 msgstr ""
 
-#: lib/problems.c:176
+#: lib/problems.c:317
 #, c-format
 msgid "package %s pre-transaction syscall(s): %s failed: %s"
 msgstr ""
 
-#: lib/problems.c:183
+#: lib/problems.c:324
 #, c-format
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:320
+#: lib/psm.c:246
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:324
+#: lib/psm.c:250
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:327
+#: lib/psm.c:253
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:397
+#: lib/psm.c:323
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:463
+#: lib/psm.c:389
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:473
+#: lib/psm.c:399
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:552
+#: lib/psm.c:478
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1194
+#: lib/psm.c:1127
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1200
+#: lib/psm.c:1133
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1240
+#: lib/psm.c:1173
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1353
+#: lib/psm.c:1286
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1463
+#: lib/psm.c:1396
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1631
+#: lib/psm.c:1564
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1638
+#: lib/psm.c:1571
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1985
+#: lib/psm.c:1918
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2102
+#: lib/psm.c:2035
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2217
+#: lib/psm.c:2150
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2226
+#: lib/psm.c:2159
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2267
+#: lib/psm.c:2200
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2268
+#: lib/psm.c:2201
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2454
+#: lib/psm.c:2387
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2457
+#: lib/psm.c:2390
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
@@ -2827,13 +2817,13 @@ msgstr ""
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
 
-#: lib/transaction.c:311
+#: lib/transaction.c:244
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
 
 #. @innercontinue@
-#: lib/transaction.c:937
+#: lib/transaction.c:867
 #, c-format
 msgid "excluding directory %s\n"
 msgstr ""
diff --git a/rpm.spec b/rpm.spec
index a7fbe2c32..3bfd182d5 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -543,3 +543,4 @@ fi
 - memory indices for dependency check are typedef'd and abstract'd.
 - no-brainer refcounts for fi object, debug the mess.
 - dump the header early in transaction, recreate fi before installing.
+- start hiding availablePackage data/methods in rpmal.c/rpmal.h.
diff --git a/rpm.spec.in b/rpm.spec.in
index be8b5ecf0..0288d5073 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -543,3 +543,4 @@ fi
 - memory indices for dependency check are typedef'd and abstract'd.
 - no-brainer refcounts for fi object, debug the mess.
 - dump the header early in transaction, recreate fi before installing.
+- start hiding availablePackage data/methods in rpmal.c/rpmal.h.