38 files changed, 1922 insertions, 1908 deletions
diff --git a/lib/depends.c b/lib/depends.c
index 3a61a8bd8..b38df3016 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -22,13 +22,14 @@
 /*@access rpmdbMatchIterator@*/		/* XXX compared with NULL */
 /*@access rpmTransactionSet@*/
 
+/*@access rpmDepSet@*/
 /*@access rpmDependencyConflict@*/
 /*@access problemsSet@*/
 
 /*@access orderListIndex@*/
 /*@access tsortInfo@*/
 
-#ifdef DYING
+#ifndef DYING
 /*@access availablePackage@*/
 #endif
 
@@ -41,13 +42,10 @@ int _ts_debug = 0;
 /**
  * Return formatted dependency string.
  * @param depend	type of dependency ("R" == Requires, "C" == Conflcts)
- * @param key		dependency name string
- * @param keyEVR	dependency [epoch:]version[-release] string
- * @param keyFlags	dependency logical range qualifiers
+ * @param key		dependency
  * @return		formatted dependency (malloc'ed)
  */
-static /*@only@*/ char * printDepend(const char * depend, const char * key,
-		const char * keyEVR, int keyFlags)
+static /*@only@*/ char * printDepend(const char * depend, const rpmDepSet key)
 	/*@*/
 {
     char * tbuf, * t;
@@ -55,57 +53,39 @@ static /*@only@*/ char * printDepend(const char * depend, const char * key,
 
     nb = 0;
     if (depend)	nb += strlen(depend) + 1;
-    if (key)	nb += strlen(key);
-    if (keyFlags & RPMSENSE_SENSEMASK) {
+    if (key->N[key->i])	nb += strlen(key->N[key->i]);
+    if (key->Flags[key->i] & RPMSENSE_SENSEMASK) {
 	if (nb)	nb++;
-	if (keyFlags & RPMSENSE_LESS)	nb++;
-	if (keyFlags & RPMSENSE_GREATER) nb++;
-	if (keyFlags & RPMSENSE_EQUAL)	nb++;
+	if (key->Flags[key->i] & RPMSENSE_LESS)	nb++;
+	if (key->Flags[key->i] & RPMSENSE_GREATER) nb++;
+	if (key->Flags[key->i] & RPMSENSE_EQUAL)	nb++;
     }
-    if (keyEVR && *keyEVR) {
+    if (key->EVR[key->i] && *key->EVR[key->i]) {
 	if (nb)	nb++;
-	nb += strlen(keyEVR);
+	nb += strlen(key->EVR[key->i]);
     }
 
     t = tbuf = xmalloc(nb + 1);
     if (depend) {
-	while(*depend != '\0')	*t++ = *depend++;
+	t = stpcpy(t, depend);
 	*t++ = ' ';
     }
-    if (key)
-	while(*key != '\0')	*t++ = *key++;
-    if (keyFlags & RPMSENSE_SENSEMASK) {
+    if (key->N[key->i])
+	t = stpcpy(t, key->N[key->i]);
+    if (key->Flags[key->i] & RPMSENSE_SENSEMASK) {
 	if (t != tbuf)	*t++ = ' ';
-	if (keyFlags & RPMSENSE_LESS)	*t++ = '<';
-	if (keyFlags & RPMSENSE_GREATER) *t++ = '>';
-	if (keyFlags & RPMSENSE_EQUAL)	*t++ = '=';
+	if (key->Flags[key->i] & RPMSENSE_LESS)	*t++ = '<';
+	if (key->Flags[key->i] & RPMSENSE_GREATER) *t++ = '>';
+	if (key->Flags[key->i] & RPMSENSE_EQUAL)	*t++ = '=';
     }
-    if (keyEVR && *keyEVR) {
+    if (key->EVR[key->i] && *key->EVR[key->i]) {
 	if (t != tbuf)	*t++ = ' ';
-	while(*keyEVR != '\0')	*t++ = *keyEVR++;
+	t = stpcpy(t, key->EVR[key->i]);
     }
     *t = '\0';
     return tbuf;
 }
 
-#ifdef	UNUSED
-static /*@only@*/ const char *buildEVR(int_32 *e, const char *v, const char *r)
-{
-    const char *pEVR;
-    char *p;
-
-    pEVR = p = xmalloc(21 + strlen(v) + 1 + strlen(r) + 1);
-    *p = '\0';
-    if (e) {
-	sprintf(p, "%d:", *e);
-	while (*p)
-	    p++;
-    }
-    (void) stpcpy( stpcpy( stpcpy(p, v) , "-") , r);
-    return pEVR;
-}
-#endif
-
 /**
  * Split EVR into epoch, version, and release components.
  * @param evr		[epoch:]version[-release] string
@@ -162,38 +142,37 @@ const char *rpmEVR = VERSION;
 int rpmFLAGS = RPMSENSE_EQUAL;
 /*@=exportheadervar@*/
 
-int rpmRangesOverlap(const char * AName, const char * AEVR, int AFlags,
-	const char * BName, const char * BEVR, int BFlags)
+int rpmRangesOverlap(const rpmDepSet A, const rpmDepSet B)
 {
-    const char *aDepend = printDepend(NULL, AName, AEVR, AFlags);
-    const char *bDepend = printDepend(NULL, BName, BEVR, BFlags);
+    const char *aDepend = printDepend(NULL, A);
+    const char *bDepend = printDepend(NULL, B);
     char *aEVR, *bEVR;
     const char *aE, *aV, *aR, *bE, *bV, *bR;
     int result;
     int sense;
 
     /* Different names don't overlap. */
-    if (strcmp(AName, BName)) {
+    if (strcmp(A->N[A->i], B->N[B->i])) {
 	result = 0;
 	goto exit;
     }
 
     /* Same name. If either A or B is an existence test, always overlap. */
-    if (!((AFlags & RPMSENSE_SENSEMASK) && (BFlags & RPMSENSE_SENSEMASK))) {
+    if (!((A->Flags[A->i] & RPMSENSE_SENSEMASK) && (B->Flags[B->i] & RPMSENSE_SENSEMASK))) {
 	result = 1;
 	goto exit;
     }
 
     /* If either EVR is non-existent or empty, always overlap. */
-    if (!(AEVR && *AEVR && BEVR && *BEVR)) {
+    if (!(A->EVR[A->i] && *A->EVR[A->i] && B->EVR[B->i] && *B->EVR[B->i])) {
 	result = 1;
 	goto exit;
     }
 
     /* Both AEVR and BEVR exist. */
-    aEVR = xstrdup(AEVR);
+    aEVR = xstrdup(A->EVR[A->i]);
     parseEVR(aEVR, &aE, &aV, &aR);
-    bEVR = xstrdup(BEVR);
+    bEVR = xstrdup(B->EVR[B->i]);
     parseEVR(bEVR, &bE, &bV, &bR);
 
     /* Compare {A,B} [epoch:]version[-release] */
@@ -219,14 +198,14 @@ int rpmRangesOverlap(const char * AName, const char * AEVR, int AFlags,
 
     /* Detect overlap of {A,B} range. */
     result = 0;
-    if (sense < 0 && ((AFlags & RPMSENSE_GREATER) || (BFlags & RPMSENSE_LESS))) {
+    if (sense < 0 && ((A->Flags[A->i] & RPMSENSE_GREATER) || (B->Flags[B->i] & RPMSENSE_LESS))) {
 	result = 1;
-    } else if (sense > 0 && ((AFlags & RPMSENSE_LESS) || (BFlags & RPMSENSE_GREATER))) {
+    } else if (sense > 0 && ((A->Flags[A->i] & RPMSENSE_LESS) || (B->Flags[B->i] & RPMSENSE_GREATER))) {
 	result = 1;
     } else if (sense == 0 &&
-	(((AFlags & RPMSENSE_EQUAL) && (BFlags & RPMSENSE_EQUAL)) ||
-	 ((AFlags & RPMSENSE_LESS) && (BFlags & RPMSENSE_LESS)) ||
-	 ((AFlags & RPMSENSE_GREATER) && (BFlags & RPMSENSE_GREATER)))) {
+	(((A->Flags[A->i] & RPMSENSE_EQUAL) && (B->Flags[B->i] & RPMSENSE_EQUAL)) ||
+	 ((A->Flags[A->i] & RPMSENSE_LESS) && (B->Flags[B->i] & RPMSENSE_LESS)) ||
+	 ((A->Flags[A->i] & RPMSENSE_GREATER) && (B->Flags[B->i] & RPMSENSE_GREATER)))) {
 	result = 1;
     }
 
@@ -238,25 +217,17 @@ exit:
     return result;
 }
 
-static int rangeMatchesDepFlags (Header h,
-		const char * reqName, const char * reqEVR, int reqFlags)
+static int rangeMatchesDepFlags (Header h, const rpmDepSet req)
 	/*@*/
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     HFD_t hfd = headerFreeData;
     rpmTagType pnt, pvt;
-#ifdef	DYING
-    const char ** provides;
-    const char ** providesEVR;
-    int_32 * provideFlags;
-    int providesCount;
-#else
-    struct rpmDepSet_s provides;
-#endif
+    rpmDepSet provides = memset(alloca(sizeof(*provides)), 0, sizeof(*provides));
     int result;
-    int i, xx;
+    int xx;
 
-    if (!(reqFlags & RPMSENSE_SENSEMASK) || !reqEVR || !strlen(reqEVR))
+    if (!(req->Flags[req->i] & RPMSENSE_SENSEMASK) || !req->EVR[req->i] || *req->EVR[req->i] == '\0')
 	return 1;
 
     /* Get provides information from header */
@@ -265,49 +236,48 @@ static int rangeMatchesDepFlags (Header h,
      * If no provides version info is available, match any requires.
      */
     if (!hge(h, RPMTAG_PROVIDEVERSION, &pvt,
-		(void **) &provides.EVR, &provides.Count))
+		(void **) &provides->EVR, &provides->Count))
 	return 1;
 
-    xx = hge(h, RPMTAG_PROVIDEFLAGS, NULL, (void **) &provides.Flags, NULL);
+    xx = hge(h, RPMTAG_PROVIDEFLAGS, NULL, (void **) &provides->Flags, NULL);
 
-    if (!hge(h, RPMTAG_PROVIDENAME, &pnt, (void **) &provides.N, &provides.Count))
+    if (!hge(h, RPMTAG_PROVIDENAME, &pnt, (void **) &provides->N, &provides->Count))
     {
-	provides.EVR = hfd(provides.EVR, pvt);
+	provides->EVR = hfd(provides->EVR, pvt);
 	return 0;	/* XXX should never happen */
     }
 
     result = 0;
-    for (i = 0; i < provides.Count; i++) {
+    for (provides->i = 0; provides->i < provides->Count; provides->i++) {
 
 	/* Filter out provides that came along for the ride. */
-	if (strcmp(provides.N[i], reqName))
+	if (strcmp(provides->N[provides->i], req->N[req->i]))
 	    continue;
 
-	result = rpmRangesOverlap(provides.N[i], provides.EVR[i], provides.Flags[i],
-			reqName, reqEVR, reqFlags);
+	result = rpmRangesOverlap(provides, req);
 
 	/* If this provide matches the require, we're done. */
 	if (result)
 	    break;
     }
 
-    provides.N = hfd(provides.N, pnt);
-    provides.EVR = hfd(provides.EVR, pvt);
+    provides->N = hfd(provides->N, pnt);
+    provides->EVR = hfd(provides->EVR, pvt);
 
     return result;
 }
 
-int headerMatchesDepFlags(Header h,
-		const char * reqName, const char * reqEVR, int reqFlags)
+int headerMatchesDepFlags(Header h, const rpmDepSet req)
 {
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     const char *name, *version, *release;
     int_32 * epoch;
-    const char *pkgEVR;
-    char *p;
-    int pkgFlags = RPMSENSE_EQUAL;
+    const char * pkgEVR;
+    char * p;
+    int_32 pkgFlags = RPMSENSE_EQUAL;
+    rpmDepSet pkg = memset(alloca(sizeof(*pkg)), 0, sizeof(*pkg));
 
-    if (!((reqFlags & RPMSENSE_SENSEMASK) && reqEVR && *reqEVR))
+    if (!((req->Flags[req->i] & RPMSENSE_SENSEMASK) && req->EVR[req->i] && *req->EVR[req->i]))
 	return 1;
 
     /* Get package information from header */
@@ -322,7 +292,15 @@ int headerMatchesDepFlags(Header h,
     }
     (void) stpcpy( stpcpy( stpcpy(p, version) , "-") , release);
 
-    return rpmRangesOverlap(name, pkgEVR, pkgFlags, reqName, reqEVR, reqFlags);
+    pkg->N = &name;
+    pkg->EVR = &pkgEVR;
+    pkg->Flags = &pkgFlags;
+    pkg->Count = 1;
+    pkg->i = 0;
+
+    /*@-compmempass@*/ /* FIX: move pkg immediate variables from stack */
+    return rpmRangesOverlap(pkg, req);
+    /*@=compmempass@*/
 }
 
 rpmTransactionSet XrpmtsUnlink(rpmTransactionSet ts, const char * msg, const char * fn, unsigned ln)
@@ -534,8 +512,7 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
     const char * pkgNVR = NULL;
     rpmTagType ont, ovt;
     availablePackage p;
-    int count;
-    const char ** obsoletes;
+    rpmDepSet obsoletes = memset(alloca(sizeof(*obsoletes)), 0, sizeof(*obsoletes));
     int alNum;
     int xx;
     int ec = 0;
@@ -547,14 +524,21 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
      */
     i = ts->orderCount;
     for (i = 0; i < ts->orderCount; i++) {
+	Header ph;
 
 	if ((p = alGetPkg(ts->addedPackages, i)) == NULL)
 	    break;
 
 	if (strcmp(p->name, name))
 	    continue;
-	rc = rpmVersionCompare(p->h, h);
-	pkgNVR = hGetNVR(p->h, NULL);
+	pkgNVR = alGetNVR(ts->addedPackages, i);
+	if (pkgNVR == NULL)	/* XXX can't happen */
+	    continue;
+
+	ph = alGetHeader(ts->addedPackages, i, 0);
+	rc = rpmVersionCompare(ph, h);
+	ph = headerFree(ph);
+
 	if (rc > 0) {
 	    rpmMessage(RPMMESS_WARNING,
 		_("newer package %s already added, skipping %s\n"),
@@ -635,26 +619,23 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
 	mi = rpmdbFreeIterator(mi);
     }
 
-    if (hge(h, RPMTAG_OBSOLETENAME, &ont, (void **) &obsoletes, &count)) {
-	const char ** obsoletesEVR;
-	int_32 * obsoletesFlags;
-	int j;
+    if (hge(h, RPMTAG_OBSOLETENAME, &ont, (void **) &obsoletes->N, &obsoletes->Count)) {
 
-	xx = hge(h, RPMTAG_OBSOLETEVERSION, &ovt, (void **) &obsoletesEVR,
+	xx = hge(h, RPMTAG_OBSOLETEVERSION, &ovt, (void **) &obsoletes->EVR,
 			NULL);
-	xx = hge(h, RPMTAG_OBSOLETEFLAGS, NULL, (void **) &obsoletesFlags,
+	xx = hge(h, RPMTAG_OBSOLETEFLAGS, NULL, (void **) &obsoletes->Flags,
 			NULL);
 
-	for (j = 0; j < count; j++) {
+	for (obsoletes->i = 0; obsoletes->i < obsoletes->Count; obsoletes->i++) {
 
 	    /* XXX avoid self-obsoleting packages. */
-	    if (!strcmp(name, obsoletes[j]))
+	    if (!strcmp(name, obsoletes->N[obsoletes->i]))
 		continue;
 
 	  { rpmdbMatchIterator mi;
 	    Header h2;
 
-	    mi = rpmtsInitIterator(ts, RPMTAG_NAME, obsoletes[j], 0);
+	    mi = rpmtsInitIterator(ts, RPMTAG_NAME, obsoletes->N[obsoletes->i], 0);
 
 	    xx = rpmdbPruneIterator(mi,
 		ts->removedPackages, ts->numRemovedPackages, 1);
@@ -665,20 +646,17 @@ int rpmtransAddPackage(rpmTransactionSet ts, Header h, FD_t fd,
 		 * If no obsoletes version info is available, match all names.
 		 */
 		/*@-branchstate@*/
-		if (obsoletesEVR == NULL ||
-		    headerMatchesDepFlags(h2,
-			obsoletes[j], obsoletesEVR[j], obsoletesFlags[j]))
-		{
+		if (obsoletes->EVR == NULL
+		 || headerMatchesDepFlags(h2, obsoletes))
 		    xx = removePackage(ts, rpmdbGetIteratorOffset(mi), alNum);
-		}
 		/*@=branchstate@*/
 	    }
 	    mi = rpmdbFreeIterator(mi);
 	  }
 	}
 
-	obsoletesEVR = hfd(obsoletesEVR, ovt);
-	obsoletes = hfd(obsoletes, ont);
+	obsoletes->EVR = hfd(obsoletes->EVR, ovt);
+	obsoletes->N = hfd(obsoletes->N, ont);
     }
     ec = 0;
 
@@ -767,49 +745,18 @@ rpmDependencyConflict rpmdepFreeConflicts(rpmDependencyConflict conflicts,
 }
 
 /**
- * Check added package file lists for first package that has a provide.
- * @todo Eliminate.
- * @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 inline /*@only@*/ /*@null@*/ availablePackage
-alSatisfiesDepend(const availableList al,
-		const char * keyType, const char * keyDepend,
-		const char * keyName, const char * keyEVR, int keyFlags)
-	/*@*/
-{
-    availablePackage ret;
-    availablePackage * tmp =
-	alAllSatisfiesDepend(al, keyType, keyDepend, keyName, keyEVR, keyFlags);
-
-    if (tmp) {
-	ret = tmp[0];
-	tmp = _free(tmp);
-	return ret;
-    }
-    return NULL;
- }
-
-/**
  * Check key for an unsatisfied dependency.
  * @todo Eliminate rpmrc provides.
  * @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
+ * @param key		dependency
  * @retval suggestion	possible package(s) to resolve dependency
  * @return		0 if satisfied, 1 if not satisfied, 2 if error
  */
 static int unsatisfiedDepend(rpmTransactionSet ts,
 		const char * keyType, const char * keyDepend,
-		const char * keyName, const char * keyEVR, int keyFlags,
+		rpmDepSet key,
 		/*@null@*/ /*@out@*/ availablePackage ** suggestion)
 	/*@globals _cacheDependsRC, fileSystem @*/
 	/*@modifies ts, *suggestion, _cacheDependsRC, fileSystem @*/
@@ -846,7 +793,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 
 		if (suggestion && rc == 1)
 		    *suggestion = alAllSatisfiesDepend(ts->availablePackages,
-				NULL, NULL, keyName, keyEVR, keyFlags);
+				NULL, NULL, key);
 
 		return rc;
 	    }
@@ -863,10 +810,10 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
     if (rcProvidesString == noProvidesString)
 	rcProvidesString = rpmGetVar(RPMVAR_PROVIDES);
 
-    if (rcProvidesString != NULL && !(keyFlags & RPMSENSE_SENSEMASK)) {
-	i = strlen(keyName);
+    if (rcProvidesString != NULL && !(key->Flags[key->i] & RPMSENSE_SENSEMASK)) {
+	i = strlen(key->N[key->i]);
 	/*@-observertrans -mayaliasunique@*/
-	while ((start = strstr(rcProvidesString, keyName))) {
+	while ((start = strstr(rcProvidesString, key->N[key->i]))) {
 	/*@=observertrans =mayaliasunique@*/
 	    if (xisspace(start[i]) || start[i] == '\0' || start[i] == ',') {
 		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (rpmrc provides)\n"),
@@ -884,8 +831,8 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
      * on rpmlib provides. The dependencies look like "rpmlib(YaddaYadda)".
      * Check those dependencies now.
      */
-    if (!strncmp(keyName, "rpmlib(", sizeof("rpmlib(")-1)) {
-	if (rpmCheckRpmlibProvides(keyName, keyEVR, keyFlags)) {
+    if (!strncmp(key->N[key->i], "rpmlib(", sizeof("rpmlib(")-1)) {
+	if (rpmCheckRpmlibProvides(key)) {
 	    rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (rpmlib provides)\n"),
 			keyType, keyDepend+2);
 	    goto exit;
@@ -893,18 +840,17 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 	goto unsatisfied;
     }
 
-    if (alSatisfiesDepend(ts->addedPackages, keyType, keyDepend,
-		keyName, keyEVR, keyFlags))
+    if (alSatisfiesDepend(ts->addedPackages, keyType, keyDepend, key) != NULL)
     {
 	goto exit;
     }
 
     /* XXX only the installer does not have the database open here. */
     if (ts->rpmdb != NULL) {
-	if (*keyName == '/') {
+	if (*key->N[key->i] == '/') {
 	    /* keyFlags better be 0! */
 
-	    mi = rpmtsInitIterator(ts, RPMTAG_BASENAMES, keyName, 0);
+	    mi = rpmtsInitIterator(ts, RPMTAG_BASENAMES, key->N[key->i], 0);
 
 	    (void) rpmdbPruneIterator(mi,
 			ts->removedPackages, ts->numRemovedPackages, 1);
@@ -918,11 +864,11 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 	    mi = rpmdbFreeIterator(mi);
 	}
 
-	mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, keyName, 0);
+	mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, key->N[key->i], 0);
 	(void) rpmdbPruneIterator(mi,
 			ts->removedPackages, ts->numRemovedPackages, 1);
 	while ((h = rpmdbNextIterator(mi)) != NULL) {
-	    if (rangeMatchesDepFlags(h, keyName, keyEVR, keyFlags)) {
+	    if (rangeMatchesDepFlags(h, key)) {
 		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (db provides)\n"),
 			keyType, keyDepend+2);
 		mi = rpmdbFreeIterator(mi);
@@ -932,11 +878,11 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 	mi = rpmdbFreeIterator(mi);
 
 #if defined(DYING) || defined(__LCLINT__)
-	mi = rpmtsInitIterator(ts, RPMTAG_NAME, keyName, 0);
+	mi = rpmtsInitIterator(ts, RPMTAG_NAME, key->N[key->i], 0);
 	(void) rpmdbPruneIterator(mi,
 			ts->removedPackages, ts->numRemovedPackages, 1);
 	while ((h = rpmdbNextIterator(mi)) != NULL) {
-	    if (rangeMatchesDepFlags(h, keyName, keyEVR, keyFlags)) {
+	    if (rangeMatchesDepFlags(h, key)) {
 		rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (db package)\n"),
 			keyType, keyDepend+2);
 		mi = rpmdbFreeIterator(mi);
@@ -950,7 +896,7 @@ static int unsatisfiedDepend(rpmTransactionSet ts,
 
     if (suggestion)
 	*suggestion = alAllSatisfiesDepend(ts->availablePackages, NULL, NULL,
-				keyName, keyEVR, keyFlags);
+				key);
 
 unsatisfied:
     rpmMessage(RPMMESS_DEBUG, _("%s: %-45s NO\n"), keyType, keyDepend+2);
@@ -1001,55 +947,40 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp,
     rpmTagType rnt, rvt;
     rpmTagType cnt, cvt;
     const char * name, * version, * release;
-#ifdef	DYING
-    const char ** requires;
-    const char ** requiresEVR = NULL;
-    int_32 * requireFlags = NULL;
-    int requiresCount = 0;
-#else
-    struct rpmDepSet_s requires;
-#endif
-#ifdef	DYING
-    const char ** conflicts;
-    const char ** conflictsEVR = NULL;
-    int_32 * conflictFlags = NULL;
-    int conflictsCount = 0;
-#else
-    struct rpmDepSet_s conflicts;
-#endif
+    rpmDepSet requires = memset(alloca(sizeof(*requires)), 0, sizeof(*requires));
+    rpmDepSet conflicts = memset(alloca(sizeof(*conflicts)), 0, sizeof(*conflicts));
     rpmTagType type;
-    int i, rc, xx;
+    int rc, xx;
     int ourrc = 0;
     availablePackage * suggestion;
 
     xx = headerNVR(h, &name, &version, &release);
 
-    if (!hge(h, RPMTAG_REQUIRENAME, &rnt, (void **) &requires.N, &requires.Count))
+    if (!hge(h, RPMTAG_REQUIRENAME, &rnt, (void **) &requires->N, &requires->Count))
     {
-	requires.Count = 0;
+	requires->Count = 0;
 	rvt = RPM_STRING_ARRAY_TYPE;
     } else {
-	xx = hge(h, RPMTAG_REQUIREFLAGS, NULL, (void **) &requires.Flags, NULL);
-	xx = hge(h, RPMTAG_REQUIREVERSION, &rvt, (void **) &requires.EVR, NULL);
+	xx = hge(h, RPMTAG_REQUIREFLAGS, NULL, (void **) &requires->Flags, NULL);
+	xx = hge(h, RPMTAG_REQUIREVERSION, &rvt, (void **) &requires->EVR, NULL);
     }
 
-    for (i = 0; i < requires.Count && !ourrc; i++) {
+    for (requires->i = 0; requires->i < requires->Count && !ourrc; requires->i++) {
 	const char * keyDepend;
 
 	/* Filter out requires that came along for the ride. */
-	if (keyName && strcmp(keyName, requires.N[i]))
+	if (keyName && strcmp(keyName, requires->N[requires->i]))
 	    continue;
 
 	/* If this requirement comes from the core package only, not libraries,
 	   then if we're installing the libraries only, don't count it in. */
-	if (multiLib && !isDependsMULTILIB(requires.Flags[i]))
+	if (multiLib && !isDependsMULTILIB(requires->Flags[requires->i]))
 	    continue;
 
-	keyDepend = printDepend("R",
-		requires.N[i], requires.EVR[i], requires.Flags[i]);
+	keyDepend = printDepend("R", requires);
 
-	rc = unsatisfiedDepend(ts, " Requires", keyDepend,
-		requires.N[i], requires.EVR[i], requires.Flags[i], &suggestion);
+	rc = unsatisfiedDepend(ts, " Requires", keyDepend, requires,
+			&suggestion);
 
 	switch (rc) {
 	case 0:		/* requirements are satisfied. */
@@ -1069,18 +1000,18 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp,
 		pp->byName = xstrdup(name);
 		pp->byVersion = xstrdup(version);
 		pp->byRelease = xstrdup(release);
-		pp->needsName = xstrdup(requires.N[i]);
-		pp->needsVersion = xstrdup(requires.EVR[i]);
-		pp->needsFlags = requires.Flags[i];
+		pp->needsName = xstrdup(requires->N[requires->i]);
+		pp->needsVersion = xstrdup(requires->EVR[requires->i]);
+		pp->needsFlags = requires->Flags[requires->i];
 		pp->sense = RPMDEP_SENSE_REQUIRES;
 
-		if (suggestion) {
+		if (suggestion != NULL) {
 		    int j;
-		    for (j = 0; suggestion[j]; j++)
+		    for (j = 0; suggestion[j] != NULL; j++)
 			{};
 		    pp->suggestedPackages =
 			xmalloc( (j + 1) * sizeof(*pp->suggestedPackages) );
-		    for (j = 0; suggestion[j]; j++)
+		    for (j = 0; suggestion[j] != NULL; j++)
 			pp->suggestedPackages[j] = suggestion[j]->key;
 		    pp->suggestedPackages[j] = NULL;
 		} else {
@@ -1098,38 +1029,37 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp,
 	keyDepend = _free(keyDepend);
     }
 
-    if (requires.Count) {
-	requires.EVR = hfd(requires.EVR, rvt);
-	requires.N = hfd(requires.N, rnt);
+    if (requires->Count) {
+	requires->EVR = hfd(requires->EVR, rvt);
+	requires->N = hfd(requires->N, rnt);
     }
 
-    if (!hge(h, RPMTAG_CONFLICTNAME, &cnt, (void **)&conflicts.N, &conflicts.Count))
+    if (!hge(h, RPMTAG_CONFLICTNAME, &cnt, (void **)&conflicts->N, &conflicts->Count))
     {
-	conflicts.Count = 0;
+	conflicts->Count = 0;
 	cvt = RPM_STRING_ARRAY_TYPE;
     } else {
 	xx = hge(h, RPMTAG_CONFLICTFLAGS, &type,
-		(void **) &conflicts.Flags, &conflicts.Count);
+		(void **) &conflicts->Flags, &conflicts->Count);
 	xx = hge(h, RPMTAG_CONFLICTVERSION, &cvt,
-		(void **) &conflicts.EVR, &conflicts.Count);
+		(void **) &conflicts->EVR, &conflicts->Count);
     }
 
-    for (i = 0; i < conflicts.Count && !ourrc; i++) {
+    for (conflicts->i = 0; conflicts->i < conflicts->Count && !ourrc; conflicts->i++) {
 	const char * keyDepend;
 
 	/* Filter out conflicts that came along for the ride. */
-	if (keyName && strcmp(keyName, conflicts.N[i]))
+	if (keyName && strcmp(keyName, conflicts->N[conflicts->i]))
 	    continue;
 
 	/* If this requirement comes from the core package only, not libraries,
 	   then if we're installing the libraries only, don't count it in. */
-	if (multiLib && !isDependsMULTILIB(conflicts.Flags[i]))
+	if (multiLib && !isDependsMULTILIB(conflicts->Flags[conflicts->i]))
 	    continue;
 
-	keyDepend = printDepend("C", conflicts.N[i], conflicts.EVR[i], conflicts.Flags[i]);
+	keyDepend = printDepend("C", conflicts);
 
-	rc = unsatisfiedDepend(ts, "Conflicts", keyDepend,
-		conflicts.N[i], conflicts.EVR[i], conflicts.Flags[i], NULL);
+	rc = unsatisfiedDepend(ts, "Conflicts", keyDepend, conflicts, NULL);
 
 	/* 1 == unsatisfied, 0 == satsisfied */
 	switch (rc) {
@@ -1148,9 +1078,9 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp,
 		pp->byName = xstrdup(name);
 		pp->byVersion = xstrdup(version);
 		pp->byRelease = xstrdup(release);
-		pp->needsName = xstrdup(conflicts.N[i]);
-		pp->needsVersion = xstrdup(conflicts.EVR[i]);
-		pp->needsFlags = conflicts.Flags[i];
+		pp->needsName = xstrdup(conflicts->N[conflicts->i]);
+		pp->needsVersion = xstrdup(conflicts->EVR[conflicts->i]);
+		pp->needsFlags = conflicts->Flags[conflicts->i];
 		pp->sense = RPMDEP_SENSE_CONFLICTS;
 		pp->suggestedPackages = NULL;
 	    }
@@ -1167,9 +1097,9 @@ static int checkPackageDeps(rpmTransactionSet ts, problemsSet psp,
 	keyDepend = _free(keyDepend);
     }
 
-    if (conflicts.Count) {
-	conflicts.EVR = hfd(conflicts.EVR, cvt);
-	conflicts.N = hfd(conflicts.N, cnt);
+    if (conflicts->Count) {
+	conflicts->EVR = hfd(conflicts->EVR, cvt);
+	conflicts->N = hfd(conflicts->N, cnt);
     }
 
     return ourrc;
@@ -1355,9 +1285,9 @@ static inline /*@observer@*/ const char * const identifyDepend(int_32 f)
  * @return		(possibly NULL) formatted "q <- p" releation (malloc'ed)
  */
 static /*@owned@*/ /*@null@*/ const char *
-zapRelation(availablePackage q, availablePackage p,
+zapRelation(availablePackage q, availablePackage p, rpmDepSet requires,
 		int zap, /*@in@*/ /*@out@*/ int * nzaps)
-	/*@modifies q, p, *nzaps @*/
+	/*@modifies q, p, *nzaps, requires @*/
 {
     tsortInfo tsi_prev;
     tsortInfo tsi;
@@ -1370,23 +1300,21 @@ zapRelation(availablePackage q, availablePackage p,
 	 tsi_prev = tsi, tsi = tsi->tsi_next)
 	/*@=nullderef@*/
     {
-	int j;
-
 	if (tsi->tsi_suc != p)
 	    continue;
-	if (p->requires.N == NULL) continue;	/* XXX can't happen */
-	if (p->requires.EVR == NULL) continue;	/* XXX can't happen */
-	if (p->requires.Flags == NULL) continue;/* XXX can't happen */
 
-	j = tsi->tsi_reqx;
-	dp = printDepend( identifyDepend(p->requires.Flags[j]),
-		p->requires.N[j], p->requires.EVR[j], p->requires.Flags[j]);
+	if (requires->N == NULL) continue;	/* XXX can't happen */
+	if (requires->EVR == NULL) continue;	/* XXX can't happen */
+	if (requires->Flags == NULL) continue;/* XXX can't happen */
+
+	requires->i = tsi->tsi_reqx;	/* XXX hack */
+	dp = printDepend( identifyDepend(requires->Flags[requires->i]), requires);
 
 	/*
 	 * Attempt to unravel a dependency loop by eliminating Requires's.
 	 */
 	/*@-branchstate@*/
-	if (zap && !(p->requires.Flags[j] & RPMSENSE_PREREQ)) {
+	if (zap && !(requires->Flags[requires->i] & RPMSENSE_PREREQ)) {
 	    rpmMessage(RPMMESS_DEBUG,
 			_("removing %s-%s-%s \"%s\" from tsort relations.\n"),
 			p->name, p->version, p->release, dp);
@@ -1415,26 +1343,26 @@ zapRelation(availablePackage q, availablePackage p,
  * @param j		relation index
  * @return		0 always
  */
-static inline int addRelation( const rpmTransactionSet ts,
-		availablePackage p, unsigned char * selected, int j)
+static inline int addRelation(const rpmTransactionSet ts,
+		availablePackage p, unsigned char * selected,
+		rpmDepSet requires)
 	/*@modifies p, *selected @*/
 {
     availablePackage q;
     tsortInfo tsi;
     int matchNum;
 
-    if (!p->requires.N || !p->requires.EVR || !p->requires.Flags)
+    if (!requires->N || !requires->EVR || !requires->Flags)
 	return 0;
 
-    q = alSatisfiesDepend(ts->addedPackages, NULL, NULL,
-		p->requires.N[j], p->requires.EVR[j], p->requires.Flags[j]);
+    q = alSatisfiesDepend(ts->addedPackages, NULL, NULL, requires);
 
     /* Ordering depends only on added package relations. */
     if (q == NULL)
 	return 0;
 
     /* Avoid rpmlib feature dependencies. */
-    if (!strncmp(p->requires.N[j], "rpmlib(", sizeof("rpmlib(")-1))
+    if (!strncmp(requires->N[requires->i], "rpmlib(", sizeof("rpmlib(")-1))
 	return 0;
 
 #if defined(DEPENDENCY_WHITEOUT)
@@ -1459,7 +1387,7 @@ static inline int addRelation( const rpmTransactionSet ts,
     /*@-assignexpose@*/
     tsi->tsi_suc = p;
     /*@=assignexpose@*/
-    tsi->tsi_reqx = j;
+    tsi->tsi_reqx = requires->i;
     tsi->tsi_next = q->tsi.tsi_next;
     q->tsi.tsi_next = tsi;
     q->tsi.tsi_qcnt++;			/* bump q successor count */
@@ -1546,12 +1474,15 @@ int rpmdepOrder(rpmTransactionSet ts)
     /* Record all relations. */
     rpmMessage(RPMMESS_DEBUG, _("========== recording tsort relations\n"));
     for (i = 0; i < npkgs; i++) {
+	rpmDepSet requires;
 	int matchNum;
 
 	if ((p = alGetPkg(ts->addedPackages, i)) == NULL)
 	    break;
 
-	if (p->requires.Count <= 0)
+	requires = alGetRequires(ts->addedPackages, i);
+
+	if (requires->Count <= 0)
 	    continue;
 
 	memset(selected, 0, sizeof(*selected) * npkgs);
@@ -1563,38 +1494,38 @@ int rpmdepOrder(rpmTransactionSet ts)
 	/* T2. Next "q <- p" relation. */
 
 	/* First, do pre-requisites. */
-	for (j = 0; j < p->requires.Count; j++) {
+	for (requires->i = 0; requires->i < requires->Count; requires->i++) {
 
-	    if (p->requires.Flags == NULL) /* XXX can't happen */
+	    if (requires->Flags == NULL) /* XXX can't happen */
 		/*@innercontinue@*/ continue;
 
 	    /* Skip if not %pre/%post requires or legacy prereq. */
 
-	    if (isErasePreReq(p->requires.Flags[j]) ||
-		!( isInstallPreReq(p->requires.Flags[j]) ||
-		   isLegacyPreReq(p->requires.Flags[j]) ))
+	    if (isErasePreReq(requires->Flags[requires->i]) ||
+		!( isInstallPreReq(requires->Flags[requires->i]) ||
+		   isLegacyPreReq(requires->Flags[requires->i]) ))
 		/*@innercontinue@*/ continue;
 
 	    /* T3. Record next "q <- p" relation (i.e. "p" requires "q"). */
-	    (void) addRelation(ts, p, selected, j);
+	    (void) addRelation(ts, p, selected, requires);
 
 	}
 
 	/* Then do co-requisites. */
-	for (j = 0; j < p->requires.Count; j++) {
+	for (requires->i = 0; requires->i < requires->Count; requires->i++) {
 
-	    if (p->requires.Flags == NULL) /* XXX can't happen */
+	    if (requires->Flags == NULL) /* XXX can't happen */
 		/*@innercontinue@*/ continue;
 
 	    /* Skip if %pre/%post requires or legacy prereq. */
 
-	    if (isErasePreReq(p->requires.Flags[j]) ||
-		 ( isInstallPreReq(p->requires.Flags[j]) ||
-		   isLegacyPreReq(p->requires.Flags[j]) ))
+	    if (isErasePreReq(requires->Flags[requires->i]) ||
+		 ( isInstallPreReq(requires->Flags[requires->i]) ||
+		   isLegacyPreReq(requires->Flags[requires->i]) ))
 		/*@innercontinue@*/ continue;
 
 	    /* T3. Record next "q <- p" relation (i.e. "p" requires "q"). */
-	    (void) addRelation(ts, p, selected, j);
+	    (void) addRelation(ts, p, selected, requires);
 
 	}
     }
@@ -1727,7 +1658,7 @@ rescan:
 		}
 
 		/* Find (and destroy if co-requisite) "q <- p" relation. */
-		dp = zapRelation(q, p, 1, &nzaps);
+		dp = zapRelation(q, p, &p->requires, 1, &nzaps);
 
 		/* Print next member of loop. */
 		sprintf(buf, "%s-%s-%s", p->name, p->version, p->release);
@@ -1890,27 +1821,48 @@ int rpmdepCheck(rpmTransactionSet ts,
      */
     for (i = 0; i < npkgs; i++)
     {
+	char * pkgNVR, * n, * v, * r;
+	rpmDepSet provides;
+	uint_32 multiLib;
+
 	if ((p = alGetPkg(ts->addedPackages, i)) == NULL)
 	    break;
 
-        rpmMessage(RPMMESS_DEBUG,  "========== +++ %s-%s-%s\n" ,
-		p->name, p->version, p->release);
-	rc = checkPackageDeps(ts, ps, p->h, NULL, p->multiLib);
-	if (rc)
+	pkgNVR = alGetNVR(ts->addedPackages, i);
+	if (pkgNVR == NULL)	/* XXX can't happen */
+	    break;
+	multiLib = alGetMultiLib(ts->addedPackages, i);
+
+        rpmMessage(RPMMESS_DEBUG,  "========== +++ %s\n" , pkgNVR);
+	h = alGetHeader(ts->addedPackages, i, 0);
+	rc = checkPackageDeps(ts, ps, h, NULL, multiLib);
+	h = headerFree(h);
+	if (rc) {
+	    pkgNVR = _free(pkgNVR);
 	    goto exit;
+	}
 
 	/* Adding: check name against conflicts matches. */
-	rc = checkDependentConflicts(ts, ps, p->name);
+
+	if ((r = strrchr(pkgNVR, '-')) != NULL)
+	    *r++ = '\0';
+	if ((v = strrchr(pkgNVR, '-')) != NULL)
+	    *v++ = '\0';
+	n = pkgNVR;
+
+	rc = checkDependentConflicts(ts, ps, n);
+	pkgNVR = _free(pkgNVR);
 	if (rc)
 	    goto exit;
 
-	if (p->provides.Count == 0 || p->provides.N == NULL)
+	provides = alGetProvides(ts->addedPackages, i);
+	if (provides->Count == 0 || provides->N == NULL)
 	    continue;
 
 	rc = 0;
-	for (j = 0; j < p->provides.Count; j++) {
+	for (provides->i = 0; provides->i < provides->Count; provides->i++) {
 	    /* Adding: check provides key against conflicts matches. */
-	    if (!checkDependentConflicts(ts, ps, p->provides.N[j]))
+	    if (!checkDependentConflicts(ts, ps, provides->N[provides->i]))
 		/*@innercontinue@*/ continue;
 	    rc = 1;
 	    /*@innerbreak@*/ break;
@@ -1924,12 +1876,14 @@ int rpmdepCheck(rpmTransactionSet ts,
      */
     /*@-branchstate@*/
     if (ts->numRemovedPackages > 0) {
+      rpmDepSet provides = memset(alloca(sizeof(*provides)), 0, sizeof(*provides));
       mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES, NULL, 0);
       xx = rpmdbAppendIterator(mi,
 			ts->removedPackages, ts->numRemovedPackages);
       while ((h = rpmdbNextIterator(mi)) != NULL) {
 
 	{   const char * name, * version, * release;
+
 	    xx = headerNVR(h, &name, &version, &release);
 	    rpmMessage(RPMMESS_DEBUG,  "========== --- %s-%s-%s\n" ,
 		name, version, release);
@@ -1941,26 +1895,20 @@ int rpmdepCheck(rpmTransactionSet ts,
 	}
 
 	{
-#ifdef	DYING
-	    const char ** provides;
-	    int providesCount;
-#else
-	    struct rpmDepSet_s provides;
-#endif
 	    rpmTagType pnt;
 
-	    if (hge(h, RPMTAG_PROVIDENAME, &pnt, (void **) &provides.N,
-				&provides.Count))
+	    if (hge(h, RPMTAG_PROVIDENAME, &pnt, (void **) &provides->N,
+				&provides->Count))
 	    {
 		rc = 0;
-		for (j = 0; j < provides.Count; j++) {
+		for (provides->i = 0; provides->i < provides->Count; provides->i++) {
 		    /* Erasing: check provides against requiredby matches. */
-		    if (!checkDependentPackages(ts, ps, provides.N[j]))
+		    if (!checkDependentPackages(ts, ps, provides->N[provides->i]))
 			/*@innercontinue@*/ continue;
 		    rc = 1;
 		    /*@innerbreak@*/ break;
 		}
-		provides.N = hfd(provides.N, pnt);
+		provides->N = hfd(provides->N, pnt);
 		if (rc)
 		    goto exit;
 	    }
diff --git a/lib/depends.h b/lib/depends.h
index fb415c599..52f2a57dc 100644
--- a/lib/depends.h
+++ b/lib/depends.h
@@ -14,8 +14,6 @@ typedef /*@abstract@*/ struct problemsSet_s *		problemsSet;
 typedef /*@abstract@*/ struct orderListIndex_s *	orderListIndex;
 typedef /*@abstract@*/ struct transactionElement_s *	transactionElement;
 
-typedef /*@abstract@*/ struct rpmDepSet_s *		rpmDepSet;
-
 /*@unchecked@*/
 /*@-exportlocal@*/
 extern int _ts_debug;
@@ -50,13 +48,14 @@ struct transactionElement_s {
  * A package dependency set.
  */
 struct rpmDepSet_s {
-/*@owned@*/
+/*@shared@*/
     const char ** N;
-/*@owned@*/
+/*@shared@*/
     const char ** EVR;
+/*@shared@*/
     const int_32 * Flags;
     int Count;
-    int Index;
+    int i;
 };
 
 /** \ingroup rpmdep
@@ -145,13 +144,10 @@ extern "C" {
  * for overlap.
  * @deprecated Remove from API when obsoletes is correctly implemented.
  * @param h		header
- * @param reqName	dependency name
- * @param reqEVR	dependency [epoch:]version[-release]
- * @param reqFlags	dependency logical range qualifiers
+ * @param req		dependency
  * @return		1 if dependency overlaps, 0 otherwise
  */
-int headerMatchesDepFlags(Header h,
-	const char * reqName, const char * reqEVR, int reqFlags)
+int headerMatchesDepFlags(Header h, const rpmDepSet req)
 		/*@*/;
 
 #ifdef __cplusplus
diff --git a/lib/psm.c b/lib/psm.c
index 0e4d24c99..e4990dcb7 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -30,6 +30,7 @@ int _fi_debug = 0;
 /*@access rpmTransactionSet@*/
 /*@access TFI_t@*/
 /*@access PSM_t@*/
+/*@access rpmDepSet@*/
 
 /*@-redecl -declundef -exportheadervar@*/
 /*@unchecked@*/
@@ -1686,52 +1687,50 @@ static int handleOneTrigger(PSM_t psm, Header sourceH, Header triggeredH,
     TFI_t fi = psm->fi;
     HGE_t hge = fi->hge;
     HFD_t hfd = (fi->hfd ? fi->hfd : headerFreeData);
-    const char ** triggerNames;
-    const char ** triggerEVR;
+    rpmDepSet trigger = memset(alloca(sizeof(*trigger)), 0, sizeof(*trigger));
     const char ** triggerScripts;
     const char ** triggerProgs;
-    int_32 * triggerFlags;
     int_32 * triggerIndices;
     rpmTagType tnt, tvt, tft;
     const char * triggerPackageName;
     const char * sourceName;
-    int numTriggers;
     rpmRC rc = RPMRC_OK;
-    int i, xx;
+    int xx;
     int skip;
 
     if (!(	hge(triggeredH, RPMTAG_TRIGGERNAME, &tnt, 
-			(void **) &triggerNames, &numTriggers) &&
+			(void **) &trigger->N, &trigger->Count) &&
 		hge(triggeredH, RPMTAG_TRIGGERFLAGS, &tft,
-			(void **) &triggerFlags, NULL) &&
+			(void **) &trigger->Flags, NULL) &&
 		hge(triggeredH, RPMTAG_TRIGGERVERSION, &tvt,
-			(void **) &triggerEVR, NULL))
+			(void **) &trigger->EVR, NULL))
 	)
 	return 0;
 
     xx = headerNVR(sourceH, &sourceName, NULL, NULL);
 
-    for (i = 0; i < numTriggers; i++) {
+    for (trigger->i = 0; trigger->i < trigger->Count; trigger->i++) {
 	rpmTagType tit, tst, tpt;
 
-	if (!(triggerFlags[i] & psm->sense)) continue;
-	if (strcmp(triggerNames[i], sourceName)) continue;
+	if (!(trigger->Flags[trigger->i] & psm->sense)) continue;
+	if (strcmp(trigger->N[trigger->i], sourceName)) continue;
 
+#ifdef	LEGACY
 	/*
 	 * For some reason, the TRIGGERVERSION stuff includes the name of
 	 * the package which the trigger is based on. We need to skip
 	 * over that here. I suspect that we'll change our minds on this
 	 * and remove that, so I'm going to just 'do the right thing'.
 	 */
-	skip = strlen(triggerNames[i]);
-	if (!strncmp(triggerEVR[i], triggerNames[i], skip) &&
-	    (triggerEVR[i][skip] == '-'))
+	skip = strlen(trigger->N[trigger->i]);
+	if (!strncmp(trigger->EVR[trigger->i], trigger->N[trigger->i], skip) &&
+	    (trigger->EVR[trigger->i][skip] == '-'))
 	    skip++;
 	else
+#endif
 	    skip = 0;
 
-	if (!headerMatchesDepFlags(sourceH, triggerNames[i],
-		triggerEVR[i] + skip, triggerFlags[i]))
+	if (!headerMatchesDepFlags(sourceH, trigger))
 	    continue;
 
 	if (!(	hge(triggeredH, RPMTAG_TRIGGERINDEX, &tit,
@@ -1754,7 +1753,7 @@ static int handleOneTrigger(PSM_t psm, Header sourceH, Header triggeredH,
 		rc = RPMRC_FAIL;
 	    } else {
 		arg1 += psm->countCorrection;
-		index = triggerIndices[i];
+		index = triggerIndices[trigger->i];
 		if (triggersAlreadyRun == NULL ||
 		    triggersAlreadyRun[index] == 0)
 		{
@@ -1778,9 +1777,9 @@ static int handleOneTrigger(PSM_t psm, Header sourceH, Header triggeredH,
 	break;
     }
 
-    triggerNames = hfd(triggerNames, tnt);
-    triggerFlags = hfd(triggerFlags, tft);
-    triggerEVR = hfd(triggerEVR, tvt);
+    trigger->N = hfd(trigger->N, tnt);
+    trigger->Flags = hfd(trigger->Flags, tft);
+    trigger->EVR = hfd(trigger->EVR, tvt);
 
     return rc;
 }
diff --git a/lib/rpmal.c b/lib/rpmal.c
index fcc08bf62..2c65f4014 100644
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -14,8 +14,6 @@
 /*@access Header@*/		/* XXX compared with NULL */
 /*@access FD_t@*/		/* XXX compared with NULL */
 
-/*@access availablePackage@*/
-
 typedef /*@abstract@*/ struct fileIndexEntry_s *	fileIndexEntry;
 typedef /*@abstract@*/ struct dirInfo_s *		dirInfo;
 typedef /*@abstract@*/ struct availableIndexEntry_s *	availableIndexEntry;
@@ -27,6 +25,10 @@ typedef /*@abstract@*/ struct availableIndex_s *	availableIndex;
 /*@access dirInfo@*/
 /*@access availableList@*/
 
+/*@access availablePackage@*/
+
+/*@access rpmDepSet@*/
+
 /** \ingroup rpmdep
  * A single available item (e.g. a Provides: dependency).
  */
@@ -134,6 +136,30 @@ int alGetFilesCount(const availableList al, int pkgNum)
     return (alp != NULL ? alp->filesCount : 0);
 }
 
+rpmDepSet alGetProvides(const availableList al, int pkgNum)
+{
+    availablePackage alp = alGetPkg(al, pkgNum);
+    /*@-immediatetrans -retexpose@*/
+    return (alp != NULL ? &alp->provides : 0);
+    /*@=immediatetrans =retexpose@*/
+}
+
+rpmDepSet alGetRequires(const availableList al, int pkgNum)
+{
+    availablePackage alp = alGetPkg(al, pkgNum);
+    /*@-immediatetrans -retexpose@*/
+    return (alp != NULL ? &alp->requires : 0);
+    /*@=immediatetrans =retexpose@*/
+}
+
+tsortInfo alGetTSI(const availableList al, int pkgNum)
+{
+    availablePackage alp = alGetPkg(al, pkgNum);
+    /*@-immediatetrans -retexpose@*/
+    return (alp != NULL ? &alp->tsi : 0);
+    /*@=immediatetrans =retexpose@*/
+}
+
 Header alGetHeader(availableList al, int pkgNum, int unlink)
 {
     availablePackage alp = alGetPkg(al, pkgNum);
@@ -192,36 +218,36 @@ fprintf(stderr, "*** alp %p[%d]\n", alp, pkgNum);
     return pkgNum;
 }
 
-char * alGetPkgNVR(const availableList al, const availablePackage alp)
+char * alGetNVR(const availableList al, int pkgNum)
 {
+    availablePackage alp = alGetPkg(al, pkgNum);
     char * pkgNVR = NULL;
 
-    if (al != NULL) {
-	if (al->list != NULL)
-	    if (alp != NULL && alp >= al->list && alp < (al->list + al->size)) {
-		char * t;
-		t = xcalloc(1,	strlen(alp->name) +
-				strlen(alp->version) +
-				strlen(alp->release) + sizeof("--"));
-		pkgNVR = t;
-		t = stpcpy(t, alp->name);
-		t = stpcpy(t, "-");
-		t = stpcpy(t, alp->version);
-		t = stpcpy(t, "-");
-		t = stpcpy(t, alp->release);
-	    }
+    if (alp != NULL) {
+	char * t;
+	t = xcalloc(1,	strlen(alp->name) +
+			strlen(alp->version) +
+			strlen(alp->release) + sizeof("--"));
+	pkgNVR = t;
+	t = stpcpy(t, alp->name);
+	t = stpcpy(t, "-");
+	t = stpcpy(t, alp->version);
+	t = stpcpy(t, "-");
+	t = stpcpy(t, alp->release);
     }
     return pkgNVR;
 }
 
+#ifdef	DYING
 void alProblemSetAppend(const availableList al, const availablePackage alp,
 		rpmProblemSet tsprobs, rpmProblemType type,
 		const char * dn, const char * bn,
 		const char * altNEVR, unsigned long ulong1)
 {
-    rpmProblemSetAppend(tsprobs, type, alGetPkgNVR(al, alp),
+    rpmProblemSetAppend(tsprobs, type, alGetNVR(al, alp),
 		alp->key, dn, bn, altNEVR, ulong1);
 }
+#endif
 
 availableList alCreate(int delta)
 {
@@ -772,16 +798,16 @@ alFileSatisfiesDepend(const availableList al,
 availablePackage *
 alAllSatisfiesDepend(const availableList al,
 		const char * keyType, const char * keyDepend,
-		const char * keyName, const char * keyEVR, int keyFlags)
+		const rpmDepSet key)
 {
     availableIndexEntry needle =
 		memset(alloca(sizeof(*needle)), 0, sizeof(*needle));
     availableIndexEntry match;
     availablePackage p, * ret = NULL;
-    int i, rc, found;
+    int rc, found;
 
-    if (*keyName == '/') {
-	ret = alAllFileSatisfiesDepend(al, keyType, keyName);
+    if (*key->N[key->i] == '/') {
+	ret = alAllFileSatisfiesDepend(al, keyType, key->N[key->i]);
 	/* XXX Provides: /path was broken with added packages (#52183). */
 	if (ret != NULL && *ret != NULL)
 	    return ret;
@@ -791,9 +817,9 @@ alAllSatisfiesDepend(const availableList al,
 
     /*@-assignexpose@*/
     /*@-temptrans@*/
-    needle->entry = keyName;
+    needle->entry = key->N[key->i];
     /*@=temptrans@*/
-    needle->entryLen = strlen(keyName);
+    needle->entryLen = strlen(key->N[key->i]);
     match = bsearch(needle, al->index.index, al->index.size,
 		    sizeof(*al->index.index), indexcmp);
     /*@=assignexpose@*/
@@ -809,23 +835,23 @@ alAllSatisfiesDepend(const availableList al,
 		indexcmp(match, needle) == 0;
 	 match++)
     {
+	int isave;
 
 	p = match->package;
 	rc = 0;
+	isave = p->provides.i;	/* XXX hack */
 	switch (match->type) {
 	case IET_PROVIDES:
-	    for (i = 0; i < p->provides.Count; i++) {
-		const char * proEVR;
-		int proFlags;
+	    for (p->provides.i = 0;
+		 p->provides.i < p->provides.Count;
+		 p->provides.i++)
+	    {
 
 		/* Filter out provides that came along for the ride. */
-		if (strcmp(p->provides.N[i], keyName))
+		if (strcmp(p->provides.N[p->provides.i], key->N[key->i]))
 		    /*@innercontinue@*/ continue;
 
-		proEVR = (p->provides.EVR ? p->provides.EVR[i] : NULL);
-		proFlags = (p->provides.Flags ? p->provides.Flags[i] : 0);
-		rc = rpmRangesOverlap(p->provides.N[i], proEVR, proFlags,
-				keyName, keyEVR, keyFlags);
+		rc = rpmRangesOverlap(&p->provides, key);
 		if (rc)
 		    /*@innerbreak@*/ break;
 	    }
@@ -834,6 +860,7 @@ alAllSatisfiesDepend(const availableList al,
 				keyType, keyDepend+2);
 	    /*@switchbreak@*/ break;
 	}
+	p->provides.i = isave;	/* XXX hack */
 
 	/*@-branchstate@*/
 	if (rc) {
@@ -849,3 +876,18 @@ alAllSatisfiesDepend(const availableList al,
 
     return ret;
 }
+
+availablePackage alSatisfiesDepend(const availableList al,
+		const char * keyType, const char * keyDepend,
+		const rpmDepSet key)
+{
+    availablePackage ret;
+    availablePackage * tmp = alAllSatisfiesDepend(al, keyType, keyDepend, key);
+
+    if (tmp) {
+	ret = tmp[0];
+	tmp = _free(tmp);
+	return ret;
+    }
+    return NULL;
+}
diff --git a/lib/rpmal.h b/lib/rpmal.h
index d34d8e766..6d687c217 100644
--- a/lib/rpmal.h
+++ b/lib/rpmal.h
@@ -38,22 +38,8 @@ struct availablePackage_s {
 /*@dependent@*/ const char * name;	/*!< Header name. */
 /*@dependent@*/ const char * version;	/*!< Header version. */
 /*@dependent@*/ const char * release;	/*!< Header release. */
-#ifdef DYING
-/*@owned@*/ const char ** provides;	/*!< Provides: name strings. */
-/*@owned@*/ const char ** providesEVR;	/*!< Provides: [epoch:]version[-release] strings. */
-/*@dependent@*/ int * provideFlags;	/*!< Provides: logical range qualifiers. */
-    int providesCount;			/*!< No. of Provide:'s in header. */
-#else
     struct rpmDepSet_s provides;	/*!< Provides: dependencies. */
-#endif
-#ifdef	DYING
-/*@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. */
-    int requiresCount;			/*!< No. of Require:'s in header. */
-#else
     struct rpmDepSet_s requires;	/*!< Requires: dependencies. */
-#endif
 /*@owned@*//*@null@*/ const char ** baseNames;	/*!< Header file basenames. */
 /*@dependent@*//*@null@*/ int_32 * epoch;	/*!< Header epoch (if any). */
     int filesCount;			/*!< No. of files in header. */
@@ -107,6 +93,33 @@ int alGetFilesCount(/*@null@*/ const availableList al, int pkgNum)
 	/*@*/;
 
 /**
+ * Return available package provides.
+ * @param al		available list
+ * @param pkgNum	available package index
+ * @return		available package provides
+ */
+rpmDepSet alGetProvides(/*@null@*/ const availableList al, int pkgNum)
+	/*@*/;
+
+/**
+ * Return available package requires.
+ * @param al		available list
+ * @param pkgNum	available package index
+ * @return		available package requires
+ */
+rpmDepSet alGetRequires(/*@null@*/ const availableList al, int pkgNum)
+	/*@*/;
+
+/**
+ * Return available package tsort info.
+ * @param al		available list
+ * @param pkgNum	available package index
+ * @return		available package tsort info
+ */
+tsortInfo alGetTSI(/*@null@*/ const availableList al, int pkgNum)
+	/*@*/;
+
+/**
  * Return available package header.
  * @param al		available list
  * @param pkgNum	available package index
@@ -160,15 +173,14 @@ int alGetPkgIndex(/*@null@*/ const availableList al, const availablePackage alp)
 /**
  * Return (malloc'd) available package name-version-release string.
  * @param al		available list
- * @param alp		available package pointer
+ * @param pkgNum	available package index
  * @return		name-version-release string
  */
-/*@-exportlocal@*/
 /*@only@*/ /*@null@*/
-char * alGetPkgNVR(/*@null@*/const availableList al, const availablePackage alp)
+char * alGetNVR(/*@null@*/const availableList al, int pkgNum)
 	/*@*/;
-/*@=exportlocal@*/
 
+#ifdef	DYING
 /**
  * Append available package problem to set.
  */
@@ -179,6 +191,7 @@ void alProblemSetAppend(const availableList al, const availablePackage alp,
 		/*@only@*/ /*@null@*/ const char * altNEVR,
 		unsigned long ulong1)
 	/*@modifies tsprobs @*/;
+#endif
 
 /**
  * Initialize available packckages, items, and directory list.
@@ -250,15 +263,28 @@ availablePackage * alAllFileSatisfiesDepend(const availableList al,
  * @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
+ * @param key		dependency
  * @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)
+		const rpmDepSet key)
+	/*@*/;
+
+/**
+ * Check added package file lists for first package that has a provide.
+ * @todo Eliminate.
+ * @param al		available list
+ * @param keyType	type of dependency
+ * @param keyDepend	dependency string representation
+ * @param key		dependency
+ * @return		available package pointer
+ */
+/*@only@*/ /*@null@*/
+availablePackage alSatisfiesDepend(const availableList al,
+		const char * keyType, const char * keyDepend,
+		const rpmDepSet key)
 	/*@*/;
 
 #ifdef __cplusplus
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 5b9d2b31e..451b7223a 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -64,6 +64,8 @@ struct rpmTransactionSet_s * rpmTransactionSet;
  */
 typedef /*@abstract@*/ struct availablePackage_s * availablePackage;
 
+typedef /*@abstract@*/ struct rpmDepSet_s * rpmDepSet;
+
 /** \ingroup header
  * Return name, version, release strings from header.
  * @param h		header
@@ -1588,27 +1590,20 @@ int rpmvercmp(const char * a, const char * b)
 
 /** \ingroup rpmtrans
  * Compare two versioned dependency ranges, looking for overlap.
- * @param AName		1st dependncy name string
- * @param AEVR		1st dependency [epoch:]version[-release] string
- * @param AFlags	1st dependency logical range qualifiers
- * @param BName		2nd dependncy name string
- * @param BEVR		2nd dependency [epoch:]version[-release] string
- * @param BFlags	2nd dependency logical range qualifiers
+ * @param A		1st dependency
+ * @param B		2nd dependency
  * @return		1 if dependencies overlap, 0 otherwise
  */
-int rpmRangesOverlap(const char * AName, const char * AEVR, int AFlags,
-			const char * BName, const char * BEVR, int BFlags)
+int rpmRangesOverlap(const rpmDepSet A, const rpmDepSet B)
 	/*@*/;
 
 /** \ingroup rpmtrans
  * Check dependency against internal rpmlib feature provides.
- * @param keyName	dependency name string
- * @param keyEVR	dependency [epoch:]version[-release] string
- * @param keyFlags	dependency logical range qualifiers
+ * @param key		dependency
  * @return		1 if dependency overlaps, 0 otherwise
  */
-int rpmCheckRpmlibProvides(const char * keyName, const char * keyEVR,
-	int keyFlags)	/*@*/;
+int rpmCheckRpmlibProvides(const rpmDepSet key)
+	/*@*/;
 
 /** \ingroup rpmcli
  * Display current rpmlib feature provides.
diff --git a/lib/rpmlibprov.c b/lib/rpmlibprov.c
index f934f6d33..5e63624f2 100644
--- a/lib/rpmlibprov.c
+++ b/lib/rpmlibprov.c
@@ -5,8 +5,11 @@
 #include "system.h"
 
 #include <rpmlib.h>
+#include "depends.h"
 #include "debug.h"
 
+/*@access rpmDepSet@*/
+
 struct rpmlibProvides_s {
 /*@observer@*/ /*@null@*/ const char * featureName;
 /*@observer@*/ /*@null@*/ const char * featureEVR;
@@ -54,16 +57,21 @@ void rpmShowRpmlibProvides(FILE * fp)
     }
 }
 
-int rpmCheckRpmlibProvides(const char * keyName, const char * keyEVR,
-	int keyFlags)
+int rpmCheckRpmlibProvides(const rpmDepSet key)
 {
     const struct rpmlibProvides_s * rlp;
     int rc = 0;
+    rpmDepSet pro = memset(alloca(sizeof(*pro)), 0, sizeof(*pro));
 
     for (rlp = rpmlibProvides; rlp->featureName != NULL; rlp++) {
-	if (rlp->featureEVR && rlp->featureFlags)
-	    rc = rpmRangesOverlap(keyName, keyEVR, keyFlags,
-		rlp->featureName, rlp->featureEVR, rlp->featureFlags);
+	if (rlp->featureEVR && rlp->featureFlags) {
+	    pro->N = (const char **) &rlp->featureName;
+	    pro->EVR = (const char **) &rlp->featureEVR;
+	    pro->Flags = &rlp->featureFlags;
+	    pro->Count = 1;
+	    pro->i = 0;
+	    rc = rpmRangesOverlap(key, pro);
+	}
 	if (rc)
 	    break;
     }
diff --git a/po/cs.po b/po/cs.po
index 5150f6ced..43d11f199 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, 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:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1442,75 +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:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr "ANO"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr "NE "
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nemohu otev��t datab�zi bal��k� v %s\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "bal��ek %s je ji� nainstalov�n"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (ke�ov�no)\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s ANO (rpmrc poskytuje)\n"
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s ANO (db soubory)\n"
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s ANO (db bal��ek)\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) p�id�no do ke�e z�vislost�.\n"
@@ -1518,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:1043
+#: lib/depends.c:989
 #, 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:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "bal��ek %s koliduje: %s\n"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, 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:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr "========== ukl�d�n� tsort relac�\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 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:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr "========== pouze �sp�n� (po�ad� dle prezentace)\n"
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr "SMY�KA:\n"
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr "========== pokra�uje tsort ...\n"
 
@@ -1658,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datov� typ %d nen� podporov�n\n"
@@ -2244,108 +2244,108 @@ msgstr "p�edtransak�n� syscall v bal��ku %s: %s selhalo: %s"
 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:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr "========== relokace\n"
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d vynech�v�m %s\n"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d p�em�s�uji %s -> %s\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "vynech�v�m multilib cestu %s%s\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "vynech�v�m %s %s\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "p�em�s�uji %s do %s\n"
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "p�em�s�uji adres�� %s do %s\n"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nemohu vytvo�it %s: %s\n"
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nemohu zapsat do %%%s %s\n"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 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:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr "zdrojov� bal��ek neobsahuje .spec soubor\n"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: spou�t�m %s skript(y) (pokud existuj�)\n"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, 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:1599
+#: lib/psm.c:1600
 #, 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:1946
+#: lib/psm.c:1945
 #, 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:2063
+#: lib/psm.c:2062
 #, 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:2177
+#: lib/psm.c:2176
 #, 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:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou�ita skupina root\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalov�n� arch�vu selhalo %s%s: %s\n"
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr " na souboru "
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nemohu otev��t %s: %s\n"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s selhalo\n"
diff --git a/po/da.po b/po/da.po
index 0a897894b..be28d3915 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, 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:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1443,76 +1443,76 @@ msgstr ""
 "\"B\"-afh�ngighed kr�ver en epoke (antager samme som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 #, fuzzy
 msgid "NO "
 msgstr "IKKE O.K."
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kunne ikke �bne Packages-database i %s\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "pakken %s er allerede installeret"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (husket)\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s JA (rpmrc tilf�rer)\n"
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s JA (rpmlib tilf�rer)\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db tilf�rer)\n"
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s JA (db-pakke)\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tilf�jet til afh�ngigheds-buffer.\n"
@@ -1520,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:1043
+#: lib/depends.c:989
 #, 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:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakke %s skaber konflikt: %s\n"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, 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:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr "========== gemmer tsort-relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr "========== kun efterf�lgere (pr�sentationsr�kkef�lge)\n"
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr "L�KKE:\n"
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr "========== forts�tter tsort ...\n"
 
@@ -1658,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatype %d underst�ttes ikke\n"
@@ -2263,110 +2263,110 @@ msgstr "pakke %s pr�transaktion-systemkald: %s mislykkedes: %s"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ukendt fejl %d under arbejdet med pakken %s"
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr "========== gemmer omrokeringer\n"
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ekskluderer %s\n"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d omrokerer %s -> %s\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ekskluderer multilib-sti %s%s\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "ekskluderer %s %s\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "omrokerer %s til %s\n"
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "omrokerer kataloget %s til %s\n"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kunne ikke skrive til %s\n"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, bin�r fundet\n"
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke indeholder ingen .spec-fil\n"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "k�rer postinstallations-skript (hvis det findes)\n"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, 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:1599
+#: lib/psm.c:1600
 #, 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:1946
+#: lib/psm.c:1945
 #, 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:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "bruger %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "gruppe %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr " for fil "
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "kunne ikke �bne %s: %s\n"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s mislykkedes\n"
diff --git a/po/de.po b/po/de.po
index a6426e556..c62fa59a1 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1569,82 +1569,82 @@ msgid " failed - "
 msgstr "pgp fehlgeschlagen"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "Fehler: kann nicht �ffnen %s%s/packages.rpm\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "die Datei �%s� geh�rt zu keinem Paket\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "die Datei �%s� geh�rt zu keinem Paket\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "die Datei �%s� geh�rt zu keinem Paket\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "die Datei �%s� geh�rt zu keinem Paket\n"
@@ -1652,43 +1652,43 @@ msgstr "die Datei �%s� geh�rt zu keinem Paket\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, 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:1122
+#: lib/depends.c:1067
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "Paket %s wird nicht in %s aufgef�hrt"
 
 # FIXME
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, 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:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1795,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2432,114 +2432,114 @@ msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
 # , c-format
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "kann Datei %s nicht �ffnen: "
 
 # , c-format
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Hole %s heraus\n"
 
 # , c-format
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kann Datei %s nicht �ffnen: "
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kann Datei %s nicht �ffnen: "
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "Keine Stufen ausf�hren"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, 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:1599
+#: lib/psm.c:1600
 #, 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:1946
+#: lib/psm.c:1945
 #, 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:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp fehlgeschlagen"
diff --git a/po/en_RN.po b/po/en_RN.po
index 4e5123fe1..01af174f7 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,82 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1494,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1630,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2202,108 +2202,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 4e5123fe1..01af174f7 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,82 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1494,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1630,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2202,108 +2202,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index 4e5123fe1..01af174f7 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,82 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1494,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1630,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2202,108 +2202,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 3cf1ba5e0..76cd31cf4 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1452,82 +1452,82 @@ msgid " failed - "
 msgstr "pgp ep�onnistui"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "tiedostoa %s ei omista mik��n paketti\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "tiedostoa %s ei omista mik��n paketti\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "tiedostoa %s ei omista mik��n paketti\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "tiedostoa %s ei omista mik��n paketti\n"
@@ -1535,42 +1535,42 @@ msgstr "tiedostoa %s ei omista mik��n paketti\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, 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:1122
+#: lib/depends.c:1067
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paketti %s ei ole %s:ss�"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, 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:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1673,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2295,109 +2295,109 @@ msgstr "paketti %s-%s-%s  sis�lt�� jaettuja tiedostoja\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Haen: %s\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "�l� suorita mit��n vaiheita"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, 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:1599
+#: lib/psm.c:1600
 #, 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:1946
+#: lib/psm.c:1945
 #, 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:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ryhm�ss� %s ei ole paketteja\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp ep�onnistui"
diff --git a/po/fr.po b/po/fr.po
index b9c59e0cd..02d2df068 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1492,82 +1492,82 @@ msgid " failed - "
 msgstr "La construction a chou.\n"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1575,42 +1575,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, 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:1122
+#: lib/depends.c:1067
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1711,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2348,110 +2348,110 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, 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:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "La construction a chou.\n"
diff --git a/po/gl.po b/po/gl.po
index 42f2c4ba5..0c9a9fd4d 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1406,82 +1406,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1625,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2197,108 +2197,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 4e5123fe1..01af174f7 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,82 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1494,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1630,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2202,108 +2202,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 4e5123fe1..01af174f7 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,82 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1494,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1630,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2202,108 +2202,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 5c78a1425..e543dab35 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrifa�i: %s\n"
@@ -1411,82 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "get ekki opna� pakka gagnagrunn �\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1494,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1630,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2207,108 +2207,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d f�ra %s -> %s\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "gat ekki b�i� til %%%s %s\n"
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "get ekki rita� � %%%s %s\n"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr "pakkinn inniheldur enga .spec skr�\n"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "gat ekki opna� %s: %s\n"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s br�st\n"
diff --git a/po/it.po b/po/it.po
index 4e5123fe1..01af174f7 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,82 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1494,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1630,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2202,108 +2202,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index a482d9d95..b281b335d 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, 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:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1493,75 +1493,75 @@ msgstr ""
 "\"B\" �ΰ�¸���� epoch ��ɬ�פȤ��ޤ�(\"A\"��Ʊ���Ǥ���Ȳ��ꤷ��)\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s/packages.rpm �򥪡��ץ�Ǥ��ޤ���\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "�ѥå����� %s-%s-%s �Ϥ��Ǥ˥��󥹥ȡ��뤵��Ƥ��ޤ�"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %s �� db �ѥå������ˤ�ä�������Ƥ��ޤ���\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %s �� rpmrc ���󶡤��뤳�Ȥˤ�ä�������ޤ���\n"
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %s �� rpmrc ���󶡤��뤳�Ȥˤ�ä�������ޤ���\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %s �� db ���󶡤��뤳�Ȥˤ�ä�������ޤ���\n"
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %s �� db �ѥå������ˤ�ä�������Ƥ��ޤ���\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s �ϥѥå������˲ä��뤳�Ȥˤ�ä�������ޤ���\n"
@@ -1569,42 +1569,42 @@ msgstr "%s: %s �ϥѥå������˲ä��뤳�Ȥˤ�ä�������ޤ���\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "�ѥå����� %s �� require ����������Ƥ��ޤ���: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s �ȶ��礹��ѥå�����������ޤ�: %s\n"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "group ����ǥå����������ޤ�\n"
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1708,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "�ǡ��������� %d �ϥ��ݡ��Ȥ���Ƥ��ޤ���\n"
@@ -2355,111 +2355,111 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "�����ʥ��顼 %d ���ѥå����� %s-%s-%s �������ˤ����ޤ���"
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS �Ͻ�������Ƥ��ޤ�: %s"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%s �� %s �˺����֤��Ƥ��ޤ�\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "�ե�����ν���: %s%s\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "�ե�����ν���: %s%s\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s �� %s �˺����֤��Ƥ��ޤ�\n"
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "�ǥ��쥯�ȥ� %s �� %s �˺����֤��Ƥ��ޤ�\n"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%s ������Ǥ��ޤ���: %s\n"
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%s �ؽ񤭹���ޤ���"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "�������ѥå����������Ԥ���ޤ����Х��ʥ�ϸ��Ĥ���ޤ���"
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "�������ѥå������� .spec �ե������ޤ�Ǥ��ޤ���"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "�ݥ��ȥ��󥹥ȡ��륹����ץ�(��ͭ���)��¹Ԥ��ޤ�\n"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "������ץȤμ¹Ԥ˼���"
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "������ץȤμ¹Ԥ˼���"
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "�ѥå�����: %s-%s-%s �ե�����ƥ��� = %d\n"
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "�桼�� %s ��¸�ߤ��ޤ��� - root ����Ѥ��ޤ�"
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "���롼�� %s ��¸�ߤ��ޤ��� - root ����Ѥ��ޤ�"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "�ե����� %s �Υ��������֤ο�Ĺ�˼��� %s%s: %s"
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 #, fuzzy
 msgid " on file "
 msgstr "�ե������"
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s �Υ����ץ�˼���: %s"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ����"
diff --git a/po/ko.po b/po/ko.po
index d5f979b63..013ebbebe 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, 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:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1433,75 +1433,75 @@ msgstr ""
 "\"B\" �������� �߿�� �Ǵ� ��(epoch)�� �ʿ�� �մϴ� (\"A\" �� �����մϴ�)\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr "��"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr "�ƴϿ�"
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s ���� ��Ű�� �����ͺ��̽��� �� �� �����ϴ�\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "%s ��Ű���� �̹� ��ġ�Ǿ� �ֽ��ϴ�"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (ĳ�õ�)\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s �� (rpmrc�� ������)\n"
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s �� (rpmlib�� ������)\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s �� (db ����)\n"
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s �� (db�� ������)\n"
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s �� (db ��Ű��)\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s �ƴϿ�\n"
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ����(Depends) ĳ�ÿ� �߰��Ǿ����ϴ�.\n"
@@ -1509,43 +1509,43 @@ msgstr "%s: (%s, %s) ����(Depends) ĳ�ÿ� �߰��Ǿ����ϴ�.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "%s-%s-%s ��Ű���� �ʿ� ������ �������� ����: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "��Ű�� %s (��)�� �浹��: %s\n"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, 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:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort ���踦 ���(record)�մϴ�\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== ��Ű���� tsort �մϴ� (����, #������, #������, ����[depth])\n"
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ������ [successors only] (ǥ�� ��)\n"
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr "����(LOOP):\n"
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort�� �����մϴ�...\n"
 
@@ -1649,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "%d ������ ������ ����Ͻ� �� �����ϴ�\n"
@@ -2244,114 +2244,114 @@ msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 "%2$s ��Ű���� ó���ϴ� �������� �� �� ���� ���� %1$d (��)�� �߻��߽��ϴ�"
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr "========== ���ġ\n"
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d ����(exclude)  %s\n"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d ���ġ %s -> %s\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "%s%s multilib ��θ� ���ܽ�ŵ�ϴ�\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "%s %s (��)�� ���ܽ�ŵ�ϴ�\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s ���� %s (��)�� ���ġ �մϴ�\n"
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s ���丮�� %s (��)�� ���ġ �մϴ�\n"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s %s (��)�� ������ �� �����ϴ�\n"
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s %s (��)�� �ۼ��� �� �����ϴ�\n"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr "�ҽ� ��Ű���� �䱸�˴ϴ�, ���̳ʸ��� ã�ҽ��ϴ�\n"
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr "�ҽ� ��Ű���� .spec ������ ���ԵǾ� ���� �ʽ��ϴ�\n"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s ��ũ��Ʈ�� �����մϴ� (���� ���)\n"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, 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:1599
+#: lib/psm.c:1600
 #, 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:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s (��)�� %d �� ������ ���� �ֽ��ϴ�, �׽�Ʈ = %d\n"
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, 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:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "%s ����ڰ� �������� �ʽ��ϴ� - root�� �̿��մϴ�\n"
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "%s �׷��� �������� �ʽ��ϴ� - root�� �̿��մϴ�\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "��ī�̺긦 Ǫ�µ� ������%s%s: %s\n"
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr " ���� ���Ͽ� "
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%2$s ������ %1$s (��)�� ������: %3$s\n"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s (��)�� ������: %s\n"
diff --git a/po/no.po b/po/no.po
index 084081cad..8e6f49e32 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -1425,82 +1425,82 @@ msgid " failed - "
 msgstr " feilet - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr "JA"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr "NEI"
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan ikke �pne pakkedatabase i %s\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "pakke %s er allerede installert"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1508,42 +1508,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakke %s er i konflikt: %s\n"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1644,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatype %d ikke st�ttet\n"
@@ -2229,108 +2229,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d omplasser %s -> %s\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "ekskluderer multilib-sti %s%s\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "eksluderer %s %s\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "relokerer %s til %s\n"
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "relokerer katalog %s til %s\n"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan ikke opprette %%%s %s\n"
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan ikke skrive til %%%s %s\n"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, bin�r funnet\n"
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke inneholder ikke en .spec-fil\n"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: kj�rer %s-skript (hvis noen)\n"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "klarte ikke � �pne %s: %s\n"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s feilet\n"
diff --git a/po/pl.po b/po/pl.po
index 8a83cd3c6..4c126c2f0 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -1466,83 +1466,83 @@ msgid " failed - "
 msgstr " nie powiod�o si� -"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 #, fuzzy
 msgid "NO "
 msgstr "NIE DOBRZE"
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie mo�na otworzy� %s/packages.rpm\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "pakiet %s-%s-%s jest ju� zainstalowany"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "plik %s nie nale�y do �adnego pakietu\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "plik %s nie nale�y do �adnego pakietu\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "plik %s nie nale�y do �adnego pakietu\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "plik %s nie nale�y do �adnego pakietu\n"
@@ -1550,42 +1550,42 @@ msgstr "plik %s nie nale�y do �adnego pakietu\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, 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:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakiet %s jest w konflikcie: %s\n"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "usuwanie indeksu grupy\n"
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1689,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ danych %d nie jest obs�ugiwany\n"
@@ -2311,110 +2311,110 @@ msgstr ""
 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:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Ten OS nie jest wspierany: %s"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "wy��czanie %s\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "wy��czanie %s\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nie mo�na utworzy� %s"
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nie mo�na zapisa� do %s"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "spodziewany pakiet �r�d�owy a nie binarny"
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pakiet �r�d�owy nie zawiera pliku .spec"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "uruchamianie skryptu postinstall (je�li istnieje)\n"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, 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:1599
+#: lib/psm.c:1600
 #, 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:1946
+#: lib/psm.c:1945
 #, 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:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, 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:2186
+#: lib/psm.c:2185
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s nie istnieje - u�yto grupy root"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, 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:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s nie powiod�o si�"
diff --git a/po/pt.po b/po/pt.po
index ad28b7b10..58d66e1e5 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, 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:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1430,76 +1430,76 @@ msgstr ""
 "A depend�ncia \"B\" precisa duma �poca (assumindo a mesma que \"A\")\n"
 "\t %s\tB %s\n"
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s     A %s\tB %s\n"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 #, fuzzy
 msgid "NO "
 msgstr "N�O-OK"
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, 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:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "o pacote %s j� est� instalado"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (em cache)\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n"
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s SIM (ficheiros db)\n"
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s SI (oferecidos pelo db)\n"
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s SIM (pacote db)\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s N�O\n"
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) adicionado � cache de depend�ncias.\n"
@@ -1507,42 +1507,42 @@ msgstr "%s: (%s, %s) adicionado � cache de depend�ncias.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, 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:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "o pacote %s est� em conflito: %s\n"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, 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:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr "=========== a guardar as rela��es do tsort\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr "========== s� os sucessores (ordem de apresenta��o)\n"
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr "CICLO:\n"
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr "========== a prosseguir o tsort ...\n"
 
@@ -1645,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "O tipo de dados %d n�o � suportado\n"
@@ -2241,108 +2241,108 @@ msgstr "a(s) chamada(s) de pr�-transac��o do pacote %s: %s falhou: %s"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "encontrado o erro desconhecido %d ao manipular o pacote %s"
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr "========== mudan�as de local\n"
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d excluir o %s\n"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d mudar de local %s -> %s\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "a exclur a directoria 'multilib' %s%s\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "a excluir o %s %s\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "a mudar o %s para %s\n"
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "a mudar a directoria %s para %s\n"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "n�o consigo criar o %s: %s\n"
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "n�o consigo escrever em %s\n"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 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:1314
+#: lib/psm.c:1315
 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:1424
+#: lib/psm.c:1425
 #, 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:1592
+#: lib/psm.c:1593
 #, 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:1599
+#: lib/psm.c:1600
 #, 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:1946
+#: lib/psm.c:1945
 #, 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:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, 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:2186
+#: lib/psm.c:2185
 #, 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:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "a abertura do pacote falhou%s%s: %s\n"
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr " no ficheiro "
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "falhei ao aceder ao %s: %s\n"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "O %s falhou\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 447bd79a6..a34fddeda 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1578,83 +1578,83 @@ msgid " failed - "
 msgstr "Construo falhou.\n"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
 # , c-format
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1662,42 +1662,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, 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:1122
+#: lib/depends.c:1067
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1805,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2435,7 +2435,7 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
@@ -2447,13 +2447,13 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "RPM verso %s\n"
 
 # , c-format
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -2466,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:341
+#: lib/psm.c:342
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "RPM verso %s\n"
@@ -2479,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:407
+#: lib/psm.c:408
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "RPM verso %s\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
 # , c-format
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "no execute nenhum estgio"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "Construo falhou.\n"
diff --git a/po/ro.po b/po/ro.po
index 65e3b33a8..fd4dcc631 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1406,82 +1406,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1625,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2197,108 +2197,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 2471c8800..d53797c01 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,82 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1494,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1630,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2202,108 +2202,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 957ed274f..a48b4657b 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, 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:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1451,75 +1451,75 @@ msgstr ""
 "��� ����������� \"B\" ����� ������� \"epoch\" (��� �� ��� ��� \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr "��"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr "��T"
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "�� ���� ������� ���� ������ Packages � %s\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "����� %s ��� ����������"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (cached)\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s YES (rpmrc provides)\n"
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s YES (rpmlib provides)\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s YES (db files)\n"
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s YES (db provides)\n"
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s YES (db package)\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NO\n"
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ��������� � ��� ������������\n"
@@ -1527,44 +1527,44 @@ msgstr "%s: (%s, %s) ��������� � ��� ������������\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "���������� ������ %s-%s-%s �� �������������: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "����� %s ����������� �: %s\n"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "��������� %s-%s-%s \"%s\" �� ������������� ������������.\n"
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr "========== ������ ������������� ������������\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== ���������� ������� (�����������, #predecessors, #succesors, "
 "�������)\n"
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ������ ������������� (� ������� �������������)\n"
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr "����:\n"
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr "========== ����������� ������������ ...\n"
 
@@ -1668,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "��� ������ %d �� ��������������\n"
@@ -2257,108 +2257,108 @@ msgstr "����� %s pre-transaction syscall(s): %s: ������: %s"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "����������� ������ %d ��� ������ � ������� %s"
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr "========== �����������\n"
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d �������� %s\n"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d ����������� %s -> %s\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "����������� ����������������� ���� %s%s\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "����������� %s %s\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "������������ %s � %s\n"
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "������������ ������� %s � %s\n"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "���������� ������� %%%s %s\n"
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "���������� ������ � %%%s %s\n"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr "��������� �������� ����� ������ ���������� ���������\n"
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr "�������� ����� �� �������� ����� ������������\n"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: ����������� �������� %s (���� ����)\n"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, 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:1599
+#: lib/psm.c:1600
 #, 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:1946
+#: lib/psm.c:1945
 #, 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:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr "%s: ������ �������� %s (%d), %s-%s-%s ������������\n"
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "������������ %s �� ���������� - ������������ root\n"
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "������ %s �� ���������� - ������������ root\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "���������� ������ �� �������%s%s: %s\n"
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr " �� ����� "
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ������ �� ����� %s: %s\n"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s �� �������: %s\n"
diff --git a/po/sk.po b/po/sk.po
index 764596727..5f20e22ac 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zap�san�: %s\n"
@@ -1465,83 +1465,83 @@ msgid " failed - "
 msgstr " zlyhalo - "
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 #, fuzzy
 msgid "NO "
 msgstr "NIE JE V PORIADKU"
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie je mo�n� otvori� %s/packages.rpm\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "bal�k %s nie je nain�talovan�\n"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "s�bor %s nie je vlastnen� �iadnym bal�kom\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "s�bor %s nie je vlastnen� �iadnym bal�kom\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "s�bor %s nie je vlastnen� �iadnym bal�kom\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "s�bor %s nie je vlastnen� �iadnym bal�kom\n"
@@ -1549,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:1043
+#: lib/depends.c:989
 #, 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:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "bal�k %s koliduje: %s\n"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, 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:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1688,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Typ �dajov %d nie je podorovan�\n"
@@ -2308,110 +2308,110 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je vynechan�: %s"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "pres�va sa %s do %s\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "vynech�va sa %s\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "vynech�va sa %s\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "pres�va sa %s do %s\n"
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "pres�va sa %s do %s\n"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "nie je mo�n� zap�sa� do %s: "
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "nie je mo�n� zap�sa� do %s: "
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "o�ak�van� zdrojov� bal�k, n�jden� bin�rny"
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "zdrojov� bal�k neobsahuje �iadny .spec s�bor"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "vykon�vaj� sa poin�tala�n� skripty (ak existuj�)\n"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, 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:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "pou��vate� %s neexistuje - pou�ije sa root"
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou�ije sa root"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalenie arch�vu zlyhalo%s%s: %s"
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr " pre s�bor "
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nepodarilo sa otvori� %s: %s"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s zlyhalo"
diff --git a/po/sl.po b/po/sl.po
index 48cd6e73e..753684a70 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.180 2001/10/30 18:00:33 jbj Exp $
+# $Id: sl.po,v 1.181 2001/10/31 04:01:44 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, 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:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1475,76 +1475,76 @@ msgstr ""
 "odvisnost \"B\" potrebuje \"epoch\" (privzeto enak kot \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 #, fuzzy
 msgid "NO "
 msgstr "NI DOBRO"
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, 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:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paket %s-%s-%s je �e name��en"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (predpomnjeno)\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s DA (rpmrc ponudbe)\n"
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s DA (db datoteke)\n"
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s DA (db ponudbe)\n"
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %s zadovoljen ob paketih db.\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
@@ -1552,42 +1552,42 @@ msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, 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:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s jw v sporu z: %s\n"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1691,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Tip podatkov %d ni podprt\n"
@@ -2309,110 +2309,110 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "neznana napaka %d ob rokovanju s paketom %s-%s-%s"
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "OS je izklju�en: %s"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "izklju�evanje datoteke %s%s\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "izklju�evanje datoteke %s%s\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "premiokanje imenika %s v %s\n"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "ni mo�no ustvariti %s: %s\n"
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "pisanje na %s ni mo�no"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "pri�akovan je bil izvorni paket, najden binarni"
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "izvorni paket ne vsebuje datoteke .spec"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "poganjanje ponamestitvenih skript (�e obstajajo)\n"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, 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:1599
+#: lib/psm.c:1600
 #, 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:1946
+#: lib/psm.c:1945
 #, 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:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "uporabnik %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, 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:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr " za datoteko "
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspe�no odpiranje %s: %s\n"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s neuspe�en"
diff --git a/po/sr.po b/po/sr.po
index 5995fa0c2..4b810295b 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1450,82 +1450,82 @@ msgid " failed - "
 msgstr "PGP omanuo"
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, 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:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
@@ -1533,42 +1533,42 @@ msgstr "datoteka %s ne pripada nijednom paketu\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, 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:1122
+#: lib/depends.c:1067
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, 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:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1671,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2294,109 +2294,109 @@ msgstr "paket %s-%s-%s sadr�i deljene datoteke\n"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, fuzzy, c-format
 msgid "%5d exclude  %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, fuzzy, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, fuzzy, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, fuzzy, c-format
 msgid "excluding %s %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "gre�ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, fuzzy, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, fuzzy, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "nemoj izvr�iti nijednu fazu"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, 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:1599
+#: lib/psm.c:1600
 #, 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:1946
+#: lib/psm.c:1945
 #, 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:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s ne sadr�i nijedan paket\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "PGP omanuo"
diff --git a/po/sv.po b/po/sv.po
index 2a86f3a73..3ee0eca9d 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, 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:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1436,75 +1436,75 @@ msgstr ""
 "\"B\"-beroendet beh�ver en epok (antar samma som \"A\")\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr "JA"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr "NEJ "
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan inte �ppna paketdatabas i %s\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "paket %s �r redan installerat"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (cachad)\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s JA (rpmrc tillhandah�ller)\n"
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s JA (rpmlib tillhandah�ller)\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db-tillhandah�llande)\n"
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s JA (db-paket)\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
@@ -1512,43 +1512,43 @@ msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, 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:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s st�r i konflikt: %s\n"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, 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:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr "========== noterar alla relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== tsort:erar paket (ordning, #f�reg�ngare, #efterf�ljare, djup)\n"
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr "========== endast efterf�ljare (presentationsordning)\n"
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr "LOOP:\n"
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr "========== forts�tter med tsort ...\n"
 
@@ -1652,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "Datatyp %d st�ds inte\n"
@@ -2240,109 +2240,109 @@ msgstr "paket %s systemanrop f�re transaktion: %s misslyckades: %s"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "ok�nt fel %d upptr�dde under behandling av paket %s"
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr "========== omflyttningar\n"
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d utesluter  %s\n"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d flyttar om %s -> %s\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "hoppar �ver multilib-s�kv�g %s%s\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "hoppar �ver %s %s\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "flyttar %s till %s\n"
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "flyttar katalogen %s till %s\n"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "kan inte skapa %%%s %s\n"
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "kan inte skriva till %%%s %s\n"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr "k�llpaket f�rv�ntades, fann bin�rpaket\n"
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr "k�llpaket inneh�ller ingen .spec-fil\n"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: k�r (eventuellt) %s-skript\n"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, 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:1599
+#: lib/psm.c:1600
 #, 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:1946
+#: lib/psm.c:1945
 #, 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:2063
+#: lib/psm.c:2062
 #, 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:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "anv�ndare %s finns inte - anv�nder root\n"
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupp %s finns inte - anv�nder root\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "uppackning av arkiv misslyckades%s%s: %s\n"
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s misslyckades p� fil %s: %s\n"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s misslyckades: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 3b5870ecf..db070fcdc 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, 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:202
+#: lib/depends.c:184
 #, fuzzy, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
@@ -1456,75 +1456,75 @@ msgstr ""
 "\"B\" ba��ml�l��� bir d�nemsellik gerektirir (tabii ki \"A\" da)\n"
 "\tA %s\tB %s\n"
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr "EVET"
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr "HAYIR "
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s de Paket veritaban� a��lamad�\n"
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, fuzzy, c-format
 msgid "package %s already added, ignoring\n"
 msgstr "%s zaten kurulu"
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (arabellekli)\n"
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s EVET (rpmrc sa�lar)\n"
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s EVET (rpmlib sa�lar)\n"
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s EVET (db dosyalar�)\n"
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s EVET (db sa�lar)\n"
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s EVET (db paketi)\n"
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s HAYIR\n"
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) Ba��ml�lar alan�na eklendi.\n"
@@ -1532,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:1043
+#: lib/depends.c:989
 #, 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:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s paketi �eli�iyor: %s\n"
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, 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:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort ba��nt�lar� kaydediliyor\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== paketler tsort'lan�yor (s�ra, #�nc�ller, #ard�llar, derinlik)\n"
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr "========== sadece ard�llar (sunum s�ras�)\n"
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr "�EVR�M:\n"
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort s�r�yor ...\n"
 
@@ -1672,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr "%d veri t�r� desteklenmiyor\n"
@@ -2264,108 +2264,108 @@ msgstr "%s i�lem �ncesi sistem �a�r�(s�/lar�): %s ba�ar�s�z: %s"
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr "anla��lamayan %d hatas�, %s paketi i�lenirken saptand�"
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr "========== yeniden konumlama\n"
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr "%5d %s'i d��l�yor\n"
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr "%5d yeniden konumland�r�l�yor: %s -> %s\n"
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr "multilib dosya yolu d��lan�yor %s%s\n"
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr "%s %s d��lan�yor\n"
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s %s'e konumlan�yor\n"
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s dizini %s de yeniden konumlan�yor\n"
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr "%%%s dosyas� olu�turulam�yor: %s\n"
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s dosyas�na yaz�lamaz %s\n"
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr "kaynak paketi gerekirken �al��t�r�labilir paketi bulundu\n"
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr "kaynak paketi .spec dosyas� i�ermiyor\n"
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s beti�i �al��t�r�l�yor (varsa)\n"
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, 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:1599
+#: lib/psm.c:1600
 #, 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:1946
+#: lib/psm.c:1945
 #, 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:2063
+#: lib/psm.c:2062
 #, 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:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "kullan�c� %s yok - root kullan�lacak\n"
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grup %s yok - root kullan�lacak\n"
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, 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:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr " dosyada "
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s a��lamad�: %s\n"
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ba�ar�s�z\n"
diff --git a/po/uk.po b/po/uk.po
index 4e5123fe1..01af174f7 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,82 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1494,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1630,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2202,108 +2202,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 4e5123fe1..01af174f7 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,82 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1494,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1630,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2202,108 +2202,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 4e5123fe1..01af174f7 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,82 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1494,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1630,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2202,108 +2202,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 4e5123fe1..01af174f7 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-30 12:48-0500\n"
+"POT-Creation-Date: 2001-10-30 22:54-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:2141
+#: build/pack.c:603 lib/psm.c:2140
 #, 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:2406
+#: build/pack.c:683 lib/psm.c:2405
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -1411,82 +1411,82 @@ msgid " failed - "
 msgstr ""
 
 #. XXX legacy epoch-less requires/conflicts compatibility
-#: lib/depends.c:202
+#: lib/depends.c:184
 #, c-format
 msgid ""
 "the \"B\" dependency needs an epoch (assuming same as \"A\")\n"
 "\tA %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:231
+#: lib/depends.c:213
 #, c-format
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:232 lib/depends.c:837 lib/depends.c:970
+#: lib/depends.c:214 lib/depends.c:791 lib/depends.c:923
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:371
+#: lib/depends.c:356
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/depends.c:553
+#: lib/depends.c:544
 #, c-format
 msgid "newer package %s already added, skipping %s\n"
 msgstr ""
 
-#: lib/depends.c:558
+#: lib/depends.c:549
 #, c-format
 msgid "package %s already added, ignoring\n"
 msgstr ""
 
-#: lib/depends.c:563
+#: lib/depends.c:554
 #, c-format
 msgid "older package %s already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:836
+#: lib/depends.c:790
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:865
+#: lib/depends.c:819
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:882
+#: lib/depends.c:836
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:906
+#: lib/depends.c:859
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:919
+#: lib/depends.c:872
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:933
+#: lib/depends.c:886
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:949
+#: lib/depends.c:902
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:970
+#: lib/depends.c:923
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1494,42 +1494,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1043
+#: lib/depends.c:989
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1122
+#: lib/depends.c:1067
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1376
+#: lib/depends.c:1319
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1532
+#: lib/depends.c:1475
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1597
+#: lib/depends.c:1543
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:1649
+#: lib/depends.c:1595
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1710
+#: lib/depends.c:1656
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1740
+#: lib/depends.c:1686
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1630,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:948
+#: lib/header.c:351 lib/header_internal.c:161 lib/psm.c:949
 #, c-format
 msgid "Data type %d not supported\n"
 msgstr ""
@@ -2202,108 +2202,108 @@ msgstr ""
 msgid "unknown error %d encountered while manipulating package %s"
 msgstr ""
 
-#: lib/psm.c:264
+#: lib/psm.c:265
 msgid "========== relocations\n"
 msgstr ""
 
-#: lib/psm.c:268
+#: lib/psm.c:269
 #, c-format
 msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/psm.c:271
+#: lib/psm.c:272
 #, c-format
 msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/psm.c:341
+#: lib/psm.c:342
 #, c-format
 msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/psm.c:407
+#: lib/psm.c:408
 #, c-format
 msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/psm.c:417
+#: lib/psm.c:418
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:496
+#: lib/psm.c:497
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/psm.c:1145
+#: lib/psm.c:1146
 #, c-format
 msgid "cannot create %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1151
+#: lib/psm.c:1152
 #, c-format
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1191
+#: lib/psm.c:1192
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1314
+#: lib/psm.c:1315
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1424
+#: lib/psm.c:1425
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1592
+#: lib/psm.c:1593
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1599
+#: lib/psm.c:1600
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1946
+#: lib/psm.c:1945
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2063
+#: lib/psm.c:2062
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2177
+#: lib/psm.c:2176
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2185
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2227
+#: lib/psm.c:2226
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2228
+#: lib/psm.c:2227
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2414
+#: lib/psm.c:2413
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2417
+#: lib/psm.c:2416
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""