From: jbj <devnull@localhost>
Date: Tue, 9 Jan 2001 04:07:49 +0000 (+0000)
Subject: - tsorted packages processed in successor count order.
X-Git-Tag: tznext/4.11.0.1.tizen20130304~7955
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=424793073c381d75d75bd1b4787d153ba16fd4b1;p=tools%2Flibrpm-tizen.git

- tsorted packages processed in successor count order.
- fix: resurrect --excludepath (#19666).

CVS patchset: 4418
CVS date: 2001/01/09 04:07:49
---

diff --git a/CHANGES b/CHANGES
index 3322995..f6e9cdd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -94,6 +94,8 @@
 	- fix: pass scriptlet args, as in %post -p "/sbin/ldconfig -n /lib".
 		(Rodrigo Barbosa)
 	- fix: 3 packages from Red Hat 5.2 had bogus %verifyscript tag.
+	- tsorted packages processed in successor count order.
+	- fix: resurrect --excludepath (#19666).
 
 3.0.6 -> 4.0
 	- use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db.
diff --git a/lib/depends.c b/lib/depends.c
index e692f54..04287f0 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -1576,12 +1576,13 @@ static inline int addRelation( const rpmTransactionSet rpmdep,
     selected[matchNum] = 1;
 
     /* T3. Record next "q <- p" relation (i.e. "p" requires "q"). */
-    p->tsi.tsi_count++;
+    p->tsi.tsi_count++;			/* bump p predecessor count */
     tsi = xmalloc(sizeof(*tsi));
     tsi->tsi_suc = p;
     tsi->tsi_reqx = j;
     tsi->tsi_next = q->tsi.tsi_next;
     q->tsi.tsi_next = tsi;
+    q->tsi.tsi_qcnt++;			/* bump q successor count */
     return 0;
 }
 
@@ -1598,6 +1599,38 @@ static int orderListIndexCmp(const void * one, const void * two)
     return (a - b);
 }
 
+/**
+ * Add element to list sorting by initial successor count.
+ * @param p		new element
+ * @retval qp		address of first element
+ * @retval rp		address of last element
+ */
+static void addQ(struct availablePackage * p,
+	/*@out@*/ struct availablePackage ** qp,
+	/*@out@*/ struct availablePackage ** rp)
+{
+    struct availablePackage *q, *qprev;
+
+    if ((*rp) == NULL) {	/* 1st element */
+	(*rp) = (*qp) = p;
+	return;
+    }
+    for (qprev = NULL, q = (*qp); q != NULL; qprev = q, q = q->tsi.tsi_suc) {
+	if (q->tsi.tsi_qcnt < p->tsi.tsi_qcnt)
+	    break;
+    }
+    if (qprev == NULL) {	/* insert at beginning of list */
+	p->tsi.tsi_suc = q;
+	(*qp) = p;		/* new head */
+    } else if (q == NULL) {	/* insert at end of list */
+	qprev->tsi.tsi_suc = p;
+	(*rp) = p;		/* new tail */
+    } else {			/* insert between qprev and q */
+	p->tsi.tsi_suc = q;
+	qprev->tsi.tsi_suc = p;
+    }
+}
+
 int rpmdepOrder(rpmTransactionSet rpmdep)
 {
     struct availablePackage * p;
@@ -1614,6 +1647,7 @@ int rpmdepOrder(rpmTransactionSet rpmdep)
     int newOrderCount = 0;
     struct orderListIndex * orderList;
     int nrescans = 10;
+    int qlen;
     int i, j;
 
     alMakeIndex(&rpmdep->addedPackages);
@@ -1677,6 +1711,7 @@ int rpmdepOrder(rpmTransactionSet rpmdep)
 
 rescan:
     q = r = NULL;
+    qlen = 0;
     for (i = 0, p = rpmdep->addedPackages.list;
 	     i < rpmdep->addedPackages.size;
 	     i++, p++)
@@ -1684,18 +1719,16 @@ rescan:
 	    if (p->tsi.tsi_count != 0)
 		continue;
 	    p->tsi.tsi_suc = NULL;
-	    if (r == NULL)
-		q = p;
-	    else
-		r->tsi.tsi_suc = p;
-	    r = p;
+	    addQ(p, &q, &r);
+	    qlen++;
     }
 
     /* T5. Output fromt of queue (T7. Remove from queue.) */
     for (; q != NULL; q = q->tsi.tsi_suc) {
 
-	rpmMessage(RPMMESS_DEBUG, "%5d %s-%s-%s\n", orderingCount,
-			q->name, q->version, q->release);
+	rpmMessage(RPMMESS_DEBUG, "%5d (%d) %s-%s-%s\n", orderingCount,
+			qlen, q->name, q->version, q->release);
+	qlen--;
 
 	ordering[orderingCount++] = q - rpmdep->addedPackages.list;
 	loopcheck--;
@@ -1709,14 +1742,9 @@ rescan:
 	    p = tsi->tsi_suc;
 	    if ((--p->tsi.tsi_count) <= 0) {
 		/* XXX FIXME: add control bit. */
-#ifdef	QUEUE_AT_REAR
 		p->tsi.tsi_suc = NULL;
-		r->tsi.tsi_suc = p;
-		r = p;
-#else
-		p->tsi.tsi_suc = q->tsi.tsi_suc;
-		q->tsi.tsi_suc = p;
-#endif
+		addQ(p, &q->tsi.tsi_suc, &r);
+		qlen++;
 	    }
 	    free(tsi);
 	}
diff --git a/lib/depends.h b/lib/depends.h
index 890c59a..ed6007e 100644
--- a/lib/depends.h
+++ b/lib/depends.h
@@ -20,6 +20,7 @@ struct tsortInfo {
 /*@owned@*/ struct tsortInfo * tsi_next;
 /*@dependent@*/ struct availablePackage * tsi_pkg;
     int		tsi_reqx;
+    int		tsi_qcnt;
 };
 
 /**
diff --git a/lib/install.h b/lib/install.h
index 1ae4320..76e3043 100644
--- a/lib/install.h
+++ b/lib/install.h
@@ -25,6 +25,7 @@ struct sharedFileInfo {
 };
 
 /**
+ * File disposition(s) during package install/erase.
  */
 enum fileActions {
     FA_UNKNOWN = 0,
@@ -40,15 +41,19 @@ enum fileActions {
 };
 
 /**
+ * File types.
+ * These are the types of files used internally by rpm. The file
+ * type is determined by applying stat(2) macros like S_ISDIR to
+ * the file mode tag from a header.
  */
 enum fileTypes {
-    XDIR,
-    BDEV,
-    CDEV,
-    SOCK,
-    PIPE,
-    REG,
-    LINK
+    PIPE	= 1,	/*!< pipe/fifo */
+    CDEV	= 2,	/*!< character device */
+    XDIR	= 4,	/*!< directory */
+    BDEV	= 6,	/*!< block device */
+    REG		= 8,	/*!< regular file */
+    LINK	= 10,	/*!< hard link */
+    SOCK	= 12	/*!< socket */
 };
 
 #ifdef __cplusplus
diff --git a/lib/misc.c b/lib/misc.c
index 4292f4c..13810f0 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -183,17 +183,6 @@ int rpmvercmp(const char * a, const char * b)
     if (!*one) return -1; else return 1;
 }
 
-void stripTrailingSlashes(char * str)
-{
-    char * chptr;
-
-    chptr = str + strlen(str) - 1;
-    while (*chptr == '/' && chptr >= str) {
-	*chptr = '\0';
-	chptr--;
-    }
-}
-
 int doputenv(const char *str)
 {
     char * a;
diff --git a/lib/misc.h b/lib/misc.h
index 56f60b4..c85ec46 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -24,8 +24,19 @@ extern "C" {
 void	freeSplitString( /*@only@*/ char ** list);
 
 /**
- */
-void	stripTrailingSlashes(char * str)	/*@modifies *str @*/;
+ * Remove occurences of trailing character from string.
+ * @param s		string
+ * @param c		character to strip
+ * @return 		string
+ */
+/*@unused@*/ static inline char * stripTrailingChar(char * s, char c)
+	/*@modifies *s */
+{
+    char * t;
+    for (t = s + strlen(s) - 1; *t == c && t >= s; t--)
+	*t = '\0';
+    return s;
+}
 
 /**
  */
diff --git a/lib/package.c b/lib/package.c
index e0fed94..b9c024f 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -15,6 +15,8 @@
 #include "signature.h"
 #include "debug.h"
 
+#define	alloca_strdup(_s)	strcpy(alloca(strlen(_s)+1), (_s))
+
 /*@access Header@*/		/* XXX compared with NULL */
 
 void headerMergeLegacySigs(Header h, const Header sig)
@@ -82,17 +84,17 @@ static int readPackageHeaders(FD_t fd, /*@out@*/ struct rpmlead * leadPtr,
 
     switch (lead->major) {
     case 1:
-	rpmError(RPMERR_NEWPACKAGE, _("packaging version 1 is not"
-		" supported by this version of RPM"));
+	rpmError(RPMERR_NEWPACKAGE,
+	    _("packaging version 1 is not supported by this version of RPM"));
 	return 2;
 	/*@notreached@*/ break;
     case 2:
     case 3:
     case 4:
 	if (rpmReadSignature(fd, sigs, lead->signature_type))
-	   return 2;
-	*hdr = headerRead(fd, (lead->major >= 3) ?
-			  HEADER_MAGIC_YES : HEADER_MAGIC_NO);
+	    return 2;
+	*hdr = headerRead(fd, (lead->major >= 3)
+			  ? HEADER_MAGIC_YES : HEADER_MAGIC_NO);
 	if (*hdr == NULL) {
 	    if (sigs != NULL)
 		headerFree(*sigs);
@@ -113,9 +115,8 @@ static int readPackageHeaders(FD_t fd, /*@out@*/ struct rpmlead * leadPtr,
 	   which is quite handy. */
 	if (headerGetEntry(*hdr, RPMTAG_DEFAULTPREFIX, NULL,
 			   (void **) &defaultPrefix, NULL)) {
-	    defaultPrefix = strcpy(alloca(strlen(defaultPrefix) + 1), 
-				   defaultPrefix);
-	    stripTrailingSlashes(defaultPrefix);
+	    defaultPrefix =
+		stripTrailingChar(alloca_strdup(defaultPrefix), '/');
 	    headerAddEntry(*hdr, RPMTAG_PREFIXES, RPM_STRING_ARRAY_TYPE,
 			   &defaultPrefix, 1); 
 	}
diff --git a/lib/transaction.c b/lib/transaction.c
index 387f450..a753d8e 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -317,48 +317,94 @@ void rpmProblemSetFree(rpmProblemSet probs)
     free(probs);
 }
 
-/** @todo multilib file action assignment need to be checked. */
-static Header relocateFileList(struct availablePackage * alp,
-			       rpmProblemSet probs, Header origH,
-			       enum fileActions * actions,
-			       int allowBadRelocate)
+static /*@observer@*/ const char *const ftstring (enum fileTypes ft)
 {
-    int numValid, numRelocations;
-    int i, j;
+    switch (ft) {
+    case XDIR:	return "directory";
+    case CDEV:	return "char dev";
+    case BDEV:	return "block dev";
+    case LINK:	return "link";
+    case SOCK:	return "sock";
+    case PIPE:	return "fifo/pipe";
+    case REG:	return "file";
+    }
+    return "unknown file type";
+}
+
+static enum fileTypes whatis(uint_16 mode)
+{
+    if (S_ISDIR(mode))	return XDIR;
+    if (S_ISCHR(mode))	return CDEV;
+    if (S_ISBLK(mode))	return BDEV;
+    if (S_ISLNK(mode))	return LINK;
+    if (S_ISSOCK(mode))	return SOCK;
+    if (S_ISFIFO(mode))	return PIPE;
+    return REG;
+}
+
+#define alloca_strdup(_s)	strcpy(alloca(strlen(_s)+1), (_s))
+
+/**
+ * Relocate files in header.
+ * @todo multilib file dispositions need to be checked.
+ * @param ts		transaction set
+ * @param alp		available package
+ * @param origH		package header
+ * @param actions	file dispositions
+ * @return		header with relocated files
+ */
+static Header relocateFileList(const rpmTransactionSet ts,
+		struct availablePackage * alp,
+		Header origH, enum fileActions * actions)
+{
+    static int _printed = 0;
+    rpmProblemSet probs = ts->probs;
+    int allowBadRelocate = (ts->ignoreSet & RPMPROB_FILTER_FORCERELOCATE);
     rpmRelocation * rawRelocations = alp->relocs;
     rpmRelocation * relocations = NULL;
+    int numRelocations;
     const char ** validRelocations;
-    char ** baseNames, ** dirNames;
+    int_32 validType;
+    int numValid;
+    const char ** baseNames;
+    const char ** dirNames;
     int_32 * dirIndexes;
     int_32 * newDirIndexes;
-    int_32 fileCount, dirCount;
+    int_32 fileCount;
+    int_32 dirCount;
     uint_32 * fFlags = NULL;
+    uint_16 * fModes = NULL;
     char * skipDirList;
     Header h;
-    int relocated = 0, len;
-    char * str;
+    int nrelocated = 0;
     int fileAlloced = 0;
-    char * filespec = NULL;
-    char * chptr;
+    char * fn = NULL;
     int haveRelocatedFile = 0;
+    int len;
+    int i, j;
 
-    if (!headerGetEntry(origH, RPMTAG_PREFIXES, NULL,
+    if (!headerGetEntry(origH, RPMTAG_PREFIXES, &validType,
 			(void **) &validRelocations, &numValid))
 	numValid = 0;
 
+    numRelocations = 0;
+    if (rawRelocations)
+	while (rawRelocations[numRelocations].newPath ||
+	       rawRelocations[numRelocations].oldPath)
+	    numRelocations++;
+
     /*
      * If no relocations are specified (usually the case), then return the
      * original header. If there are prefixes, however, then INSTPREFIXES
      * should be added, but, since relocateFileList() can be called more
      * than once for the same header, don't bother if already present.
      */
-    if (rawRelocations == NULL) {
-
-	if (numValid && !headerIsEntry(origH, RPMTAG_INSTPREFIXES)) {
+    if (numRelocations == 0) {
+	if (numValid) {
 	    if (!headerIsEntry(origH, RPMTAG_INSTPREFIXES))
 		headerAddEntry(origH, RPMTAG_INSTPREFIXES,
-			RPM_STRING_ARRAY_TYPE, validRelocations, numValid);
-	    free((void *)validRelocations);
+			validType, validRelocations, numValid);
+	    headerFreeData(validRelocations, validType);
 	}
 	/* XXX FIXME multilib file actions need to be checked. */
 	return headerLink(origH);
@@ -370,13 +416,6 @@ static Header relocateFileList(struct availablePackage * alp,
     h = headerLink(origH);
 #endif
 
-    if (rawRelocations) {
-	for (i = 0; rawRelocations[i].newPath || rawRelocations[i].oldPath; i++)
-	    ;
-	numRelocations = i;
-    } else {
-	numRelocations = 0;
-    }
     relocations = alloca(sizeof(*relocations) * numRelocations);
 
     /* Build sorted relocation list from raw relocations. */
@@ -386,22 +425,19 @@ static Header relocateFileList(struct availablePackage * alp,
 
 	/* FIXME: Trailing /'s will confuse us greatly. Internal ones will 
 	   too, but those are more trouble to fix up. :-( */
-	str = alloca(strlen(rawRelocations[i].oldPath) + 1);
-	strcpy(str, rawRelocations[i].oldPath);
-	stripTrailingSlashes(str);
-	relocations[i].oldPath = str;
+	relocations[i].oldPath =
+	    stripTrailingChar(alloca_strdup(rawRelocations[i].oldPath), '/');
 
 	/* An old path w/o a new path is valid, and indicates exclusion */
 	if (rawRelocations[i].newPath) {
-	    str = alloca(strlen(rawRelocations[i].newPath) + 1);
-	    strcpy(str, rawRelocations[i].newPath);
-	    stripTrailingSlashes(str);
-	    relocations[i].newPath = str;
+	    relocations[i].newPath =
+	    	stripTrailingChar(alloca_strdup(rawRelocations[i].newPath), '/');
 
 	    /* Verify that the relocation's old path is in the header. */
 	    for (j = 0; j < numValid; j++)
 		if (!strcmp(validRelocations[j], relocations[i].oldPath)) break;
-	    if (j == numValid && !allowBadRelocate)
+	    /* XXX actions check prevents problem from being appended twice. */
+	    if (j == numValid && !allowBadRelocate && actions)
 		psAppend(probs, RPMPROB_BADRELOCATE, alp->key, alp->h,
 			 relocations[i].oldPath, NULL, NULL, 0);
 	} else {
@@ -425,6 +461,19 @@ static Header relocateFileList(struct availablePackage * alp,
 	if (!madeSwap) break;
     }
 
+    if (!_printed) {
+	_printed = 1;
+	rpmMessage(RPMMESS_DEBUG, _("========== relocations\n"));
+	for (i = 0; i < numRelocations; i++) {
+	    if (relocations[i].newPath == NULL)
+		rpmMessage(RPMMESS_DEBUG, _("%5d exclude  %s\n"),
+			i, relocations[i].oldPath);
+	    else
+		rpmMessage(RPMMESS_DEBUG, _("%5d relocate %s -> %s\n"),
+			i, relocations[i].oldPath, relocations[i].newPath);
+	}
+    }
+
     /* Add relocation values to the header */
     if (numValid) {
 	const char ** actualRelocations;
@@ -454,98 +503,121 @@ static Header relocateFileList(struct availablePackage * alp,
 		       (void **) actualRelocations, numActual);
 
 	free((void *)actualRelocations);
-	free((void *)validRelocations);
+	headerFreeData(validRelocations, validType);
     }
 
-    /* For all relocations, we go through sorted file and relocation lists 
-     * backwards so that /usr/local relocations take precedence over /usr 
-     * ones.
-     */
-
     headerGetEntry(h, RPMTAG_BASENAMES, NULL, (void **) &baseNames, 
 		   &fileCount);
     headerGetEntry(h, RPMTAG_DIRINDEXES, NULL, (void **) &dirIndexes, NULL);
     headerGetEntry(h, RPMTAG_DIRNAMES, NULL, (void **) &dirNames, 
 		   &dirCount);
     headerGetEntry(h, RPMTAG_FILEFLAGS, NULL, (void **) &fFlags, NULL);
+    headerGetEntry(h, RPMTAG_FILEMODES, NULL, (void **) &fModes, NULL);
 
-    skipDirList = xcalloc(sizeof(*skipDirList), dirCount);
+    skipDirList = alloca(dirCount * sizeof(*skipDirList));
+    memset(skipDirList, 0, dirCount * sizeof(*skipDirList));
 
     newDirIndexes = alloca(sizeof(*newDirIndexes) * fileCount);
     memcpy(newDirIndexes, dirIndexes, sizeof(*newDirIndexes) * fileCount);
     dirIndexes = newDirIndexes;
 
-    /* Now relocate individual files. */
+    /*
+     * For all relocations, we go through sorted file/relocation lists 
+     * backwards so that /usr/local relocations take precedence over /usr 
+     * ones.
+     */
+
+    /* Relocate individual paths. */
 
     for (i = fileCount - 1; i >= 0; i--) {
+	char * te;
+	int fslen;
 
 	/*
 	 * If only adding libraries of different arch into an already
 	 * installed package, skip all other files.
 	 */
-	if (actions && alp->multiLib && !isFileMULTILIB((fFlags[i]))) {
-	    actions[i] = FA_SKIPMULTILIB;
+	if (alp->multiLib && !isFileMULTILIB((fFlags[i]))) {
+	    if (actions) {
+		actions[i] = FA_SKIPMULTILIB;
+		rpmMessage(RPMMESS_DEBUG, _("excluding multilib path %s%s\n"), 
+			dirNames[dirIndexes[i]], baseNames[i]);
+	    }
 	    continue;
 	}
 
-	/* If we're skipping the directory this file is part of, skip this
-	 * file as well.
-	 */
-	if (skipDirList[dirIndexes[i]]) {
-	    actions[i] = FA_SKIPNSTATE;
-	    rpmMessage(RPMMESS_DEBUG, _("excluding file %s%s\n"), 
-		       dirNames[dirIndexes[i]], baseNames[i]);
-	    continue;
-	} 
-
-	/* See if this file needs relocating (which will only occur if the
-	 * full file path we have exactly matches a path in the relocation
-	 * list. XXX FIXME: Would a bsearch of the (already sorted) 
-	 * relocation list be a good idea?
-	 */
-
 	len = strlen(dirNames[dirIndexes[i]]) + strlen(baseNames[i]) + 1;
 	if (len >= fileAlloced) {
 	    fileAlloced = len * 2;
-	    filespec = xrealloc(filespec, fileAlloced);
+	    fn = xrealloc(fn, fileAlloced);
 	}
-	(void) stpcpy( stpcpy(filespec, dirNames[dirIndexes[i]]) , baseNames[i]);
-
-	for (j = numRelocations - 1; j >= 0; j--)
-	    if (!strcmp(relocations[j].oldPath, filespec)) break;
+	te = stpcpy( stpcpy(fn, dirNames[dirIndexes[i]]), baseNames[i]);
+	fslen = (te - fn);
 
+	/*
+	 * See if this file needs relocating.
+	 */
+	/*
+	 * XXX FIXME: Would a bsearch of the (already sorted) 
+	 * relocation list be a good idea?
+	 */
+	for (j = numRelocations - 1; j >= 0; j--) {
+	    len = strlen(relocations[j].oldPath);
+	    if (fslen < len)
+		continue;
+	    if (strncmp(relocations[j].oldPath, fn, len))
+		continue;
+	    break;
+	}
 	if (j < 0) continue;
 
-	if (actions && relocations[j].newPath == NULL) {
-	    /* On install, a relocate to NULL means skip the path. */
-	    skipDirList[i] = 1;
-	    rpmMessage(RPMMESS_DEBUG, _("excluding directory %s\n"), 
-		       dirNames[i]);
+	/* On install, a relocate to NULL means skip the path. */
+	if (relocations[j].newPath == NULL) {
+	    enum fileTypes ft = whatis(fModes[i]);
+	    int k;
+	    if (ft == XDIR) {
+		/* Start with the parent, looking for directory to exclude. */
+		for (k = dirIndexes[i]; k < dirCount; k++) {
+		    len = strlen(dirNames[k]) - 1;
+		    while (len > 0 && dirNames[k][len-1] == '/') len--;
+		    if (len == fslen && !strncmp(dirNames[k], fn, len))
+			break;
+		}
+		if (k >= dirCount)
+		    continue;
+		skipDirList[k] = 1;
+	    }
+	    if (actions) {
+		actions[i] = FA_SKIPNSTATE;
+		rpmMessage(RPMMESS_DEBUG, _("excluding %s %s\n"),
+			ftstring(ft), fn);
+	    }
 	    continue;
 	}
 
-	rpmMessage(RPMMESS_DEBUG, _("relocating %s to %s\n"),
-		    filespec, relocations[j].newPath);
-	relocated = 1;
+	if (actions)
+	    rpmMessage(RPMMESS_DEBUG, _("relocating %s to %s\n"),
+		    fn, relocations[j].newPath);
+	nrelocated++;
 
 	len = strlen(relocations[j].newPath);
 	if (len >= fileAlloced) {
 	    fileAlloced = len * 2;
-	    filespec = xrealloc(filespec, fileAlloced);
+	    fn = xrealloc(fn, fileAlloced);
 	}
-	strcpy(filespec, relocations[j].newPath);
-	chptr = strrchr(filespec, '/');
-	*chptr++ = '\0';
-
-	/* filespec is the new path, and chptr is the new basename */
-	if (strcmp(baseNames[i], chptr)) {
-	    baseNames[i] = alloca(strlen(chptr) + 1);
-	    strcpy(baseNames[i], chptr);
+	strcpy(fn, relocations[j].newPath);
+
+	{   char * s = strrchr(fn, '/');
+	    *s++ = '\0';
+
+	    /* fn is the new dirName, and s is the new baseName */
+	    if (strcmp(baseNames[i], s))
+		baseNames[i] = alloca_strdup(s);
 	}
 
 	/* Does this directory already exist in the directory list? */
 	for (j = 0; j < dirCount; j++)
-	    if (!strcmp(filespec, dirNames[j])) break;
+	    if (!strcmp(fn, dirNames[j])) break;
 	
 	if (j < dirCount) {
 	    dirIndexes[i] = j;
@@ -554,29 +626,26 @@ static Header relocateFileList(struct availablePackage * alp,
 
 	/* Creating new paths is a pita */
 	if (!haveRelocatedFile) {
-	    char ** newDirList;
+	    const char ** newDirList;
 	    int k;
 
 	    haveRelocatedFile = 1;
 	    newDirList = xmalloc(sizeof(*newDirList) * (dirCount + 1));
-	    for (k = 0; k < dirCount; k++) {
-		newDirList[k] = alloca(strlen(dirNames[k]) + 1);
-		strcpy(newDirList[k], dirNames[k]);
-	    }
-	    free(dirNames);
+	    for (k = 0; k < dirCount; k++)
+		newDirList[k] = alloca_strdup(dirNames[k]);
+	    headerFreeData(dirNames, RPM_STRING_ARRAY_TYPE);
 	    dirNames = newDirList;
 	} else {
 	    dirNames = xrealloc(dirNames, 
 			       sizeof(*dirNames) * (dirCount + 1));
 	}
 
-	dirNames[dirCount] = alloca(strlen(filespec) + 1);
-	strcpy(dirNames[dirCount], filespec);
+	dirNames[dirCount] = alloca_strdup(fn);
 	dirIndexes[i] = dirCount;
 	dirCount++;
     }
 
-    /* Start off by relocating directories. */
+    /* Finish off by relocating directories. */
     for (i = dirCount - 1; i >= 0; i--) {
 	for (j = numRelocations - 1; j >= 0; j--) {
 	    int oplen;
@@ -585,8 +654,10 @@ static Header relocateFileList(struct availablePackage * alp,
 	    if (strncmp(relocations[j].oldPath, dirNames[i], oplen))
 		continue;
 
-	    /* Only subdirectories or complete file paths may be relocated. We
-	       don't check for '\0' as our directory names all end in '/'. */
+	    /*
+	     * Only subdirectories or complete file paths may be relocated. We
+	     * don't check for '\0' as our directory names all end in '/'.
+	     */
 	    if (!(dirNames[i][oplen] == '/'))
 		continue;
 
@@ -595,22 +666,24 @@ static Header relocateFileList(struct availablePackage * alp,
 		char *t = alloca(strlen(s) + strlen(dirNames[i]) - oplen + 1);
 
 		(void) stpcpy( stpcpy(t, s) , dirNames[i] + oplen);
-		rpmMessage(RPMMESS_DEBUG, _("relocating directory %s to %s\n"),
-			dirNames[i], t);
+		if (actions)
+		    rpmMessage(RPMMESS_DEBUG,
+			_("relocating directory %s to %s\n"), dirNames[i], t);
 		dirNames[i] = t;
-		relocated = 1;
-	    } else if (actions) {
-		/* On install, a relocate to NULL means skip the file */
-		skipDirList[i] = 1;
-		rpmMessage(RPMMESS_DEBUG, _("excluding directory %s\n"), 
-			   dirNames[i]);
+		nrelocated++;
+	    } else {
+		if (actions && !skipDirList[i]) {
+		    rpmMessage(RPMMESS_DEBUG, _("excluding directory %s\n"), 
+			dirNames[dirIndexes[i]]);
+		    actions[i] = FA_SKIPNSTATE;
+		}
 	    }
 	    break;
 	}
     }
 
     /* Save original filenames in header and replace (relocated) filenames. */
-    if (relocated) {
+    if (nrelocated) {
 	int c;
 	void * p;
 	int t;
@@ -618,16 +691,17 @@ static Header relocateFileList(struct availablePackage * alp,
 	p = NULL;
 	headerGetEntry(h, RPMTAG_BASENAMES, &t, &p, &c);
 	headerAddEntry(h, RPMTAG_ORIGBASENAMES, t, p, c);
-	free((void *)p);
+	headerFreeData(p, t);
 
 	p = NULL;
 	headerGetEntry(h, RPMTAG_DIRNAMES, &t, &p, &c);
 	headerAddEntry(h, RPMTAG_ORIGDIRNAMES, t, p, c);
-	free((void *)p);
+	headerFreeData(p, t);
 
 	p = NULL;
 	headerGetEntry(h, RPMTAG_DIRINDEXES, &t, &p, &c);
 	headerAddEntry(h, RPMTAG_ORIGDIRINDEXES, t, p, c);
+	headerFreeData(p, t);
 
 	headerModifyEntry(h, RPMTAG_BASENAMES, RPM_STRING_ARRAY_TYPE,
 			  baseNames, fileCount);
@@ -637,10 +711,9 @@ static Header relocateFileList(struct availablePackage * alp,
 			  dirIndexes, fileCount);
     }
 
-    free(baseNames);
-    free(dirNames);
-    if (filespec) free(filespec);
-    free(skipDirList);
+    headerFreeData(baseNames, RPM_STRING_ARRAY_TYPE);
+    headerFreeData(dirNames, RPM_STRING_ARRAY_TYPE);
+    if (fn) free(fn);
 
     return h;
 }
@@ -701,28 +774,6 @@ static int sharedCmp(const void * one, const void * two)
     return 0;
 }
 
-static enum fileTypes whatis(short mode)
-{
-    enum fileTypes result;
-
-    if (S_ISDIR(mode))
-	result = XDIR;
-    else if (S_ISCHR(mode))
-	result = CDEV;
-    else if (S_ISBLK(mode))
-	result = BDEV;
-    else if (S_ISLNK(mode))
-	result = LINK;
-    else if (S_ISSOCK(mode))
-	result = SOCK;
-    else if (S_ISFIFO(mode))
-	result = PIPE;
-    else
-	result = REG;
-
-    return result;
-}
-
 static enum fileActions decideFileFate(const char * dirName,
 			const char * baseName, short dbMode,
 			const char * dbMd5, const char * dbLink, short newMode,
@@ -884,7 +935,7 @@ static int handleInstInstalledFiles(TFI_t * fi, rpmdb db,
 	if (otherStates && otherStates[otherFileNum] != RPMFILE_STATE_NORMAL)
 	    continue;
 
-	if (fi->actions[fileNum] == FA_SKIPMULTILIB)
+	if (XFA_SKIPPING(fi->actions[fileNum]))
 	    continue;
 
 	if (filecmp(otherModes[otherFileNum],
@@ -1032,7 +1083,7 @@ static void handleOverlappedFiles(TFI_t * fi, hashTable ht,
 	 */
 
 	/* Locate this overlapped file in the set of added/removed packages. */
-	for (j = 0; recs[j] != fi; j++)
+	for (j = 0; j < numRecs && recs[j] != fi; j++)
 	    ;
 
 	/* Find what the previous disposition of this file was. */
@@ -1472,13 +1523,12 @@ int rpmRunTransactions(	rpmTransactionSet ts,
 		continue;
 	    }
 
-	    /* Allocate file actions (and initialize to RPMFILE_STATE_NORMAL) */
+	    /* Allocate file actions (and initialize to FA_UNKNOWN) */
 	    fi->actions = xcalloc(fi->fc, sizeof(*fi->actions));
-	    hdrs[i] = relocateFileList(alp, ts->probs, alp->h, fi->actions,
-			          ts->ignoreSet & RPMPROB_FILTER_FORCERELOCATE);
+	    hdrs[i] = relocateFileList(ts, alp, alp->h, fi->actions);
 	    fi->h = headerLink(hdrs[i]);
-	    fi->type = TR_ADDED;
 	    fi->ap = alp;
+	    fi->type = TR_ADDED;
 	    break;
 	case TR_REMOVED:
 	    fi->record = ts->order[oc].u.removed.dboffset;
@@ -1792,7 +1842,7 @@ int rpmRunTransactions(	rpmTransactionSet ts,
 			ourrc++;
 			fd = NULL;
 		    } else {
-			hdrs[i] = relocateFileList(alp, ts->probs, h, NULL, 1);
+			hdrs[i] = relocateFileList(ts, alp, h, NULL);
 			headerFree(h);
 		    }
 		}
diff --git a/po/cs.po b/po/cs.po
index f6439f3..82ae3fc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-0500\n"
 "PO-Revision-Date: 2000-08-23 22:24+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -2455,20 +2455,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstraòuji \"%s\" z indexu %s.\n"
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2836,16 +2836,16 @@ msgstr "varov
 msgid "running postinstall scripts (if any)\n"
 msgstr "spou¹tím pøípadný postinstalaèní skript\n"
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "chyba pøi vytváøení doèasného souboru %s"
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "práce s balíèky verze 1 není podporována touto verzí RPM"
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr "tato verze RPM podporuje práci s balíèky s hlavním (major) èíslem <= 4"
@@ -3900,27 +3900,46 @@ msgstr "Mus
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "Musíte nastavit \"%%_pgp_name\" ve svém makro souboru"
 
-#: lib/transaction.c:496
-#, c-format
-msgid "excluding file %s%s\n"
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
+#, fuzzy, c-format
+msgid "%5d exclude  %s\n"
+msgstr "OS je vyøazen: %s"
+
+#: lib/transaction.c:472
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "pøemís»uji %s do %s\n"
+
+#: lib/transaction.c:543
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
 msgstr "vynechávám soubor %s%s\n"
 
-#: lib/transaction.c:522 lib/transaction.c:605
-#, c-format
-msgid "excluding directory %s\n"
-msgstr "vynechávám adresáø %s\n"
+#: lib/transaction.c:592
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "vynechávám soubor %s%s\n"
 
-#: lib/transaction.c:527
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "pøemís»uji %s do %s\n"
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "pøemís»uji adresáø %s do %s\n"
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr "vynechávám adresáø %s\n"
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s pøeskoèeno, proto¾e chybí pøíznak\n"
diff --git a/po/da.po b/po/da.po
index bd4bd0e..c4dc087 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-0500\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -2416,20 +2416,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2791,16 +2791,16 @@ msgstr " ... som %s\n"
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3810,27 +3810,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index bed7670..11c3644 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2651,20 +2651,20 @@ 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:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -3038,18 +3038,18 @@ msgstr "kann Datei %s nicht 
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, fuzzy, c-format
 msgid "error creating temporary file %s"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/package.c:85
+#: lib/package.c:88
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
 
-#: lib/package.c:142
+#: lib/package.c:143
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4125,28 +4125,49 @@ msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
 
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
 # , c-format
-#: lib/transaction.c:496
+#: lib/transaction.c:469
 #, fuzzy, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr "Hole %s heraus\n"
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
+msgid "%5d relocate %s -> %s\n"
+msgstr "kann Datei %s nicht öffnen: "
+
+# , c-format
+#: lib/transaction.c:543
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "Hole %s heraus\n"
 
-#: lib/transaction.c:527
+# , c-format
+#: lib/transaction.c:592
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "Hole %s heraus\n"
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 0d28260..4464cc3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2758,16 +2758,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3774,27 +3774,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index f48480e..e2fce48 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-01-05 16:10-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -70,21 +70,21 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm.c:185 rpmqv.c:391
+#: rpm.c:185 rpmqv.c:386
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:196 rpmqv.c:402
+#: rpm.c:196 rpmqv.c:397
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:200 rpmqv.c:406
+#: rpm.c:200 rpmqv.c:401
 msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
 msgstr ""
 
-#: rpm.c:201 rpmqv.c:407
+#: rpm.c:201 rpmqv.c:402
 msgid "This program may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
@@ -105,43 +105,43 @@ msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:213 rpmqv.c:428
+#: rpm.c:213 rpmqv.c:423
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:214 rpmqv.c:429
+#: rpm.c:214 rpmqv.c:424
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:215 rpmqv.c:430
+#: rpm.c:215
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:216 rpmqv.c:431
+#: rpm.c:216 rpmqv.c:426
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:432 rpmqv.c:441 rpmqv.c:457
+#: rpm.c:217 rpm.c:226 rpm.c:236 rpmqv.c:427 rpmqv.c:436 rpmqv.c:452
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:218 rpm.c:237 rpmqv.c:433 rpmqv.c:442 rpmqv.c:458
+#: rpm.c:218 rpm.c:237 rpmqv.c:428 rpmqv.c:437 rpmqv.c:453
 msgid "                        [--httpproxy <host>] [--httpport <port>]"
 msgstr ""
 
-#: rpm.c:219 rpmqv.c:434
+#: rpm.c:219 rpmqv.c:429
 msgid ""
 "                        [--justdb] [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:220 rpmqv.c:435
+#: rpm.c:220 rpmqv.c:430
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:221 rpmqv.c:436
+#: rpm.c:221 rpmqv.c:431
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -150,16 +150,16 @@ msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:223 rpmqv.c:438
+#: rpm.c:223 rpmqv.c:433
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:224 rpmqv.c:439
+#: rpm.c:224
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:225 rpmqv.c:440
+#: rpm.c:225 rpmqv.c:435
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
@@ -168,20 +168,20 @@ msgstr ""
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:228 rpmqv.c:443
+#: rpm.c:228 rpmqv.c:438
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:229 rpmqv.c:444
+#: rpm.c:229 rpmqv.c:439
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:230 rpmqv.c:445
+#: rpm.c:230 rpmqv.c:440
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:231 rpmqv.c:446
+#: rpm.c:231 rpmqv.c:441
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
@@ -189,23 +189,23 @@ msgstr ""
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:233 rpmqv.c:454
+#: rpm.c:233
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:234 rpmqv.c:455
+#: rpm.c:234 rpmqv.c:450
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:235 rpmqv.c:456
+#: rpm.c:235 rpmqv.c:451
 msgid "                        [--triggeredby]"
 msgstr ""
 
-#: rpm.c:238 rpmqv.c:459
+#: rpm.c:238 rpmqv.c:454
 msgid "                        [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:239 rpmqv.c:460
+#: rpm.c:239 rpmqv.c:455
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
@@ -213,12 +213,12 @@ msgstr ""
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:241 rpmqv.c:462
+#: rpm.c:241 rpmqv.c:457
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:242 rpmqv.c:463
+#: rpm.c:242 rpmqv.c:458
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
@@ -238,11 +238,11 @@ msgstr ""
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:247 rpmqv.c:448
+#: rpm.c:247 rpmqv.c:443
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:248 rpmqv.c:449
+#: rpm.c:248 rpmqv.c:444
 msgid "                        [--justdb] [--notriggers] package1 ... packageN"
 msgstr ""
 
@@ -259,7 +259,7 @@ msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:252 rpmqv.c:473
+#: rpm.c:252 rpmqv.c:468
 msgid "                           package1 ... packageN"
 msgstr ""
 
@@ -271,15 +271,15 @@ msgstr ""
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:288 rpmqv.c:509
+#: rpm.c:288 rpmqv.c:504
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:290 rpmqv.c:511
+#: rpm.c:290 rpmqv.c:506
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:292 rpmqv.c:149 rpmqv.c:513
+#: rpm.c:292 rpmqv.c:149 rpmqv.c:508
 msgid "print the version of rpm being used"
 msgstr ""
 
@@ -291,7 +291,7 @@ msgstr ""
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:297 rpmqv.c:156 rpmqv.c:518
+#: rpm.c:297 rpmqv.c:156 rpmqv.c:513
 msgid "define macro <name> with value <body>"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:299 rpmqv.c:520
+#: rpm.c:299
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:301 rpmqv.c:162 rpmqv.c:522
+#: rpm.c:301 rpmqv.c:162 rpmqv.c:517
 msgid "send stdout to <cmd>"
 msgstr ""
 
@@ -315,19 +315,19 @@ msgstr ""
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:303 rpmqv.c:524
+#: rpm.c:303
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:305 rpmqv.c:180 rpmqv.c:526
+#: rpm.c:305 rpmqv.c:180 rpmqv.c:521
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:307 rpmqv.c:534
+#: rpm.c:307 rpmqv.c:529
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:309 rpmqv.c:536
+#: rpm.c:309 rpmqv.c:531
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgstr ""
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:315 rpmqv.c:543
+#: rpm.c:315 rpmqv.c:538
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:317 rpmqv.c:545
+#: rpm.c:317 rpmqv.c:540
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
@@ -359,7 +359,7 @@ msgstr ""
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:319 rpmqv.c:547
+#: rpm.c:319 rpmqv.c:542
 msgid "hostname or IP of http proxy"
 msgstr ""
 
@@ -367,11 +367,11 @@ msgstr ""
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:321 rpmqv.c:549
+#: rpm.c:321 rpmqv.c:544
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:325 rpmqv.c:569
+#: rpm.c:325 rpmqv.c:564
 msgid "query mode"
 msgstr ""
 
@@ -379,7 +379,7 @@ msgstr ""
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:529
+#: rpm.c:327 rpm.c:373 rpm.c:398 rpm.c:450 rpm.c:524 rpmqv.c:524
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:329 rpmqv.c:571
+#: rpm.c:329 rpmqv.c:566
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
@@ -395,7 +395,7 @@ msgstr ""
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:531
+#: rpm.c:331 rpm.c:375 rpm.c:433 rpm.c:462 rpm.c:526 rpmqv.c:165 rpmqv.c:526
 msgid "use <dir> as the top level directory"
 msgstr ""
 
@@ -451,31 +451,31 @@ msgstr ""
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:347 rpmqv.c:575
+#: rpm.c:347 rpmqv.c:570
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:349 rpmqv.c:577
+#: rpm.c:349 rpmqv.c:572
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:351 rpmqv.c:579
+#: rpm.c:351 rpmqv.c:574
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:353 rpmqv.c:581
+#: rpm.c:353 rpmqv.c:576
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:355 rpmqv.c:583
+#: rpm.c:355 rpmqv.c:578
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:357 rpmqv.c:585
+#: rpm.c:357 rpmqv.c:580
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:359 rpmqv.c:587
+#: rpm.c:359 rpmqv.c:582
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
@@ -497,26 +497,26 @@ msgstr ""
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:371 rpmqv.c:598
+#: rpm.c:371 rpmqv.c:593
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
 #: lib/poptBT.c:180 lib/verify.c:56 rpm.c:377 rpm.c:419 rpm.c:454 rpmqv.c:291
-#: rpmqv.c:600 rpmqv.c:648 rpmqv.c:682
+#: rpmqv.c:595 rpmqv.c:643 rpmqv.c:677
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:604
+#: lib/verify.c:62 rpm.c:379 rpmqv.c:236 rpmqv.c:599
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:381 rpmqv.c:602
+#: rpm.c:381 rpmqv.c:597
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:383 rpmqv.c:609
+#: rpm.c:383 rpmqv.c:604
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
@@ -528,7 +528,7 @@ msgstr ""
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:388 rpmqv.c:285 rpmqv.c:623
+#: rpm.c:388 rpmqv.c:285 rpmqv.c:618
 msgid "install package"
 msgstr ""
 
@@ -544,11 +544,11 @@ msgstr ""
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:392 rpmqv.c:312 rpmqv.c:660
+#: rpm.c:392 rpmqv.c:312 rpmqv.c:655
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:394 rpmqv.c:252 rpmqv.c:628
+#: rpm.c:394 rpmqv.c:252 rpmqv.c:623
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
@@ -556,47 +556,47 @@ msgstr ""
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:396 rpmqv.c:309 rpmqv.c:658
+#: rpm.c:396 rpmqv.c:309 rpmqv.c:653
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:400 rpmqv.c:258 rpmqv.c:630
+#: rpm.c:400 rpmqv.c:258 rpmqv.c:625
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:402 rpmqv.c:264 rpmqv.c:634
+#: rpm.c:402 rpmqv.c:264 rpmqv.c:629
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:404 rpmqv.c:270 rpmqv.c:636
+#: rpm.c:404 rpmqv.c:270 rpmqv.c:631
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:406 rpmqv.c:246 rpmqv.c:625
+#: rpm.c:406 rpmqv.c:246 rpmqv.c:620
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:409 rpmqv.c:273 rpmqv.c:638
+#: rpm.c:409 rpmqv.c:273 rpmqv.c:633
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:411 rpmqv.c:279 rpmqv.c:640
+#: rpm.c:411 rpmqv.c:279 rpmqv.c:635
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:413 rpmqv.c:276 rpmqv.c:642
+#: rpm.c:413 rpmqv.c:276 rpmqv.c:637
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:415 rpmqv.c:282 rpmqv.c:644
+#: rpm.c:415 rpmqv.c:282 rpmqv.c:639
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:646 rpmqv.c:680
+#: rpm.c:417 rpm.c:452 rpmqv.c:288 rpmqv.c:641 rpmqv.c:675
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:650 rpmqv.c:684
+#: rpm.c:421 rpm.c:456 rpmqv.c:294 rpmqv.c:645 rpmqv.c:679
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
@@ -604,23 +604,23 @@ msgstr ""
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:425 rpm.c:460 rpmqv.c:688
+#: rpm.c:425 rpm.c:460 rpmqv.c:683
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:427 rpmqv.c:306 rpmqv.c:656
+#: rpm.c:427 rpmqv.c:306 rpmqv.c:651
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:429 rpmqv.c:315 rpmqv.c:662
+#: rpm.c:429 rpmqv.c:315 rpmqv.c:657
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:431 rpmqv.c:318 rpmqv.c:664
+#: rpm.c:431 rpmqv.c:318 rpmqv.c:659
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:435 rpmqv.c:321 rpmqv.c:666
+#: rpm.c:435 rpmqv.c:321 rpmqv.c:661
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
@@ -632,11 +632,11 @@ msgstr ""
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:440 rpmqv.c:670
+#: rpm.c:440 rpmqv.c:665
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:442 rpmqv.c:303 rpmqv.c:672
+#: rpm.c:442 rpmqv.c:303 rpmqv.c:667
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
@@ -646,17 +646,17 @@ msgstr ""
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:446 rpmqv.c:255 rpmqv.c:676
+#: rpm.c:446 rpmqv.c:255 rpmqv.c:671
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:448 rpmqv.c:249 rpmqv.c:678
+#: rpm.c:448 rpmqv.c:249 rpmqv.c:673
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:458 rpmqv.c:686
+#: rpm.c:458 rpmqv.c:681
 msgid "do not execute any package specific scripts"
 msgstr ""
 
@@ -767,7 +767,7 @@ msgstr ""
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:505 rpmqv.c:221 rpmqv.c:694
+#: rpm.c:505 rpmqv.c:221 rpmqv.c:689
 msgid "sign a package (discard current signature)"
 msgstr ""
 
@@ -775,7 +775,7 @@ msgstr ""
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:507 rpmqv.c:218 rpmqv.c:696
+#: rpm.c:507 rpmqv.c:218 rpmqv.c:691
 msgid "add a signature to a package"
 msgstr ""
 
@@ -787,19 +787,19 @@ msgstr ""
 msgid "    -K <pkg>+             "
 msgstr ""
 
-#: rpm.c:510 rpmqv.c:227 rpmqv.c:700
+#: rpm.c:510 rpmqv.c:227 rpmqv.c:695
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:512 rpmqv.c:230 rpmqv.c:702
+#: rpm.c:512 rpmqv.c:230 rpmqv.c:697
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:514 rpmqv.c:233 rpmqv.c:704
+#: rpm.c:514 rpmqv.c:233 rpmqv.c:699
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:516 rpmqv.c:706
+#: rpm.c:516 rpmqv.c:701
 msgid "skip any MD5 signatures"
 msgstr ""
 
@@ -811,50 +811,50 @@ msgstr ""
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:530 rpmqv.c:611
+#: rpm.c:530 rpmqv.c:606
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:533 rpmqv.c:614
+#: rpm.c:533 rpmqv.c:609
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
 #: rpm.c:671 rpm.c:677 rpm.c:686 rpm.c:708 rpm.c:714 rpm.c:721 rpm.c:729
-#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:894 rpmqv.c:903 rpmqv.c:909
-#: rpmqv.c:915 rpmqv.c:922 rpmqv.c:957 rpmqv.c:965 rpmqv.c:971 rpmqv.c:979
-#: rpmqv.c:1047
+#: rpm.c:737 rpm.c:758 rpm.c:821 rpmqv.c:889 rpmqv.c:898 rpmqv.c:904
+#: rpmqv.c:910 rpmqv.c:917 rpmqv.c:952 rpmqv.c:960 rpmqv.c:966 rpmqv.c:974
+#: rpmqv.c:1042
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:679 rpmqv.c:896
+#: rpm.c:679 rpmqv.c:891
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:681 rpmqv.c:898
+#: rpm.c:681 rpmqv.c:893
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:764 rpmqv.c:941
+#: rpm.c:764 rpmqv.c:936
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:766 rpmqv.c:943
+#: rpm.c:766 rpmqv.c:938
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:769 rpmqv.c:946
+#: rpm.c:769 rpmqv.c:941
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:778 rpmqv.c:930
+#: rpm.c:778 rpmqv.c:925
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:787 rpmqv.c:1000
+#: rpm.c:787 rpmqv.c:995
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
@@ -862,105 +862,105 @@ msgstr ""
 msgid "Use --macros with a colon separated list of macro files to read.\n"
 msgstr ""
 
-#: rpm.c:793 rpmqv.c:1006
+#: rpm.c:793 rpmqv.c:1001
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:828 rpmqv.c:1062
+#: rpm.c:828 rpmqv.c:1057
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:833 rpmqv.c:1066
+#: rpm.c:833 rpmqv.c:1061
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:836 rpmqv.c:1069
+#: rpm.c:836 rpmqv.c:1064
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:839 rpmqv.c:1072
+#: rpm.c:839 rpmqv.c:1067
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:842 rpmqv.c:1082
+#: rpm.c:842 rpmqv.c:1077
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:845 rpmqv.c:1087
+#: rpm.c:845 rpmqv.c:1082
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:848 rpmqv.c:1090
+#: rpm.c:848 rpmqv.c:1085
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:851 rpmqv.c:1093
+#: rpm.c:851 rpmqv.c:1088
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:854 rpmqv.c:1096
+#: rpm.c:854 rpmqv.c:1091
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:857 rpmqv.c:1099
+#: rpm.c:857 rpmqv.c:1094
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:860 rpmqv.c:1102
+#: rpm.c:860 rpmqv.c:1097
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:864 rpmqv.c:1106
+#: rpm.c:864 rpmqv.c:1101
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:868 rpmqv.c:1110
+#: rpm.c:868 rpmqv.c:1105
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:872 rpmqv.c:1114
+#: rpm.c:872 rpmqv.c:1109
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:876 rpmqv.c:1118
+#: rpm.c:876 rpmqv.c:1113
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:880 rpmqv.c:1122
+#: rpm.c:880 rpmqv.c:1117
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:884 rpmqv.c:1126
+#: rpm.c:884 rpmqv.c:1121
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:888 rpmqv.c:1130
+#: rpm.c:888 rpmqv.c:1125
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:892 rpmqv.c:1134
+#: rpm.c:892 rpmqv.c:1129
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:896 rpmqv.c:1138
+#: rpm.c:896 rpmqv.c:1133
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:900 rpmqv.c:1142
+#: rpm.c:900 rpmqv.c:1137
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:904 rpmqv.c:1146
+#: rpm.c:904 rpmqv.c:1141
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:908 rpmqv.c:1150
+#: rpm.c:908 rpmqv.c:1145
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:913 rpmqv.c:1157
+#: rpm.c:913 rpmqv.c:1152
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
@@ -972,115 +972,115 @@ msgid ""
 "verification"
 msgstr ""
 
-#: rpm.c:921 rpmqv.c:1167
+#: rpm.c:921 rpmqv.c:1162
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:926 rpmqv.c:1172
+#: rpm.c:926 rpmqv.c:1167
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:930 rpmqv.c:1177
+#: rpm.c:930 rpmqv.c:1172
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:942 rpmqv.c:1189
+#: rpm.c:942 rpmqv.c:1184
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:948 rpmqv.c:1196
+#: rpm.c:948 rpmqv.c:1191
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:951 rpmqv.c:1201
+#: rpm.c:951 rpmqv.c:1196
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:954 rpmqv.c:1204
+#: rpm.c:954 rpmqv.c:1199
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:957 rpmqv.c:1209
+#: rpm.c:957 rpmqv.c:1204
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:968 rpmqv.c:1225
+#: rpm.c:968 rpmqv.c:1220
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:973 rpmqv.c:1230
+#: rpm.c:973 rpmqv.c:1225
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:988 rpmqv.c:1246
+#: rpm.c:988 rpmqv.c:1241
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:992 rpmqv.c:1250
+#: rpm.c:992 rpmqv.c:1245
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:994 rpmqv.c:1252
+#: rpm.c:994 rpmqv.c:1247
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:997 rpmqv.c:1255
+#: rpm.c:997 rpmqv.c:1250
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1002 rpmqv.c:1260
+#: rpm.c:1002 rpmqv.c:1255
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1008 rpmqv.c:1266
+#: rpm.c:1008 rpmqv.c:1261
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1023 rpmqv.c:1282
+#: rpm.c:1023 rpmqv.c:1277
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1042 rpmqv.c:1552
+#: rpm.c:1042 rpmqv.c:1547
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1053 rpmqv.c:1574
+#: rpm.c:1053 rpmqv.c:1569
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1064 rpmqv.c:1585
+#: rpm.c:1064 rpmqv.c:1580
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1080 rpmqv.c:1422
+#: rpm.c:1080 rpmqv.c:1417
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1131 rpmqv.c:1473
+#: rpm.c:1131 rpmqv.c:1468
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1154 rpmqv.c:1513
+#: rpm.c:1154 rpmqv.c:1508
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1159 rpmqv.c:1518
+#: rpm.c:1159 rpmqv.c:1513
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1176 rpmqv.c:1540
+#: rpm.c:1176 rpmqv.c:1535
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1180 rpmqv.c:1544
+#: rpm.c:1180 rpmqv.c:1539
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1178,7 +1178,7 @@ msgstr ""
 msgid "<package>"
 msgstr ""
 
-#: rpmqv.c:261 rpmqv.c:632
+#: rpmqv.c:261 rpmqv.c:627
 msgid "skip files with leading component <path> "
 msgstr ""
 
@@ -1190,11 +1190,11 @@ msgstr ""
 msgid "<packagefile>+"
 msgstr ""
 
-#: rpmqv.c:297 rpmqv.c:606
+#: rpmqv.c:297 rpmqv.c:601
 msgid "do not execute scripts (if any)"
 msgstr ""
 
-#: rpmqv.c:300 rpmqv.c:654
+#: rpmqv.c:300 rpmqv.c:649
 msgid "don't execute any scriptlets triggered by this package"
 msgstr ""
 
@@ -1206,298 +1206,322 @@ msgstr ""
 msgid "upgrade package"
 msgstr ""
 
-#: rpmqv.c:348
-msgid "Query/Verify options:"
-msgstr ""
-
-#: rpmqv.c:352
+#: rpmqv.c:347
 msgid "Query options (with -q or --query):"
 msgstr ""
 
-#: rpmqv.c:355
+#: rpmqv.c:350
 msgid "Verify options (with -V or --verify):"
 msgstr ""
 
-#: rpmqv.c:361
+#: rpmqv.c:356
 msgid "Signature options:"
 msgstr ""
 
-#: rpmqv.c:367
+#: rpmqv.c:362
 msgid "Database options:"
 msgstr ""
 
-#: rpmqv.c:373
+#: rpmqv.c:368
 msgid "Build options with [ <specfile> | <tarball> | <source package> ]:"
 msgstr ""
 
-#: rpmqv.c:378
+#: rpmqv.c:373
 msgid "Common options for all rpm modes:"
 msgstr ""
 
-#: rpmqv.c:418
+#: rpmqv.c:413
 #, c-format
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:422
+#: rpmqv.c:417
 #, c-format
 msgid "       %s {--initdb}   [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:423
+#: rpmqv.c:418
 #, c-format
-msgid "       %s {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]\n"
+msgid "       %s {--rebuilddb} [--macros <file:...>] [--dbpath <dir>]\n"
 msgstr ""
 
-#: rpmqv.c:427
+#: rpmqv.c:422
 #, c-format
 msgid ""
 "       %s {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]\n"
 msgstr ""
 
-#: rpmqv.c:447
+#: rpmqv.c:425
+msgid ""
+"                        [--macros <file:...>] [--ignorearch] [--dbpath <dir>]"
+msgstr ""
+
+#: rpmqv.c:434
+msgid ""
+"                        [--excludedocs] [--includedocs] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:442
 #, c-format
-msgid "       %s {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]\n"
+msgid ""
+"       %s {--erase -e} [--root <dir>] [--noscripts] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:461
+#: rpmqv.c:449
+msgid ""
+"                        [--scripts] [--root <dir>] [--macros <file:...>]"
+msgstr ""
+
+#: rpmqv.c:456
 #, c-format
-msgid "       %s {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]\n"
+msgid ""
+"       %s {--verify -V -y} [-afpg] [--root <dir>] [--macros <file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:465
+#: rpmqv.c:460
 #, c-format
 msgid "       %s {--setperms} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:466
+#: rpmqv.c:461
 #, c-format
 msgid "       %s {--setugids} [-afpg] [target]\n"
 msgstr ""
 
-#: rpmqv.c:470
+#: rpmqv.c:465
 #, c-format
-msgid "       %s {--resign} [--rcfile <file>] package1 package2 ... packageN\n"
+msgid ""
+"       %s {--resign} [--macros <file:...>] package1 package2 ... packageN\n"
 msgstr ""
 
-#: rpmqv.c:471
+#: rpmqv.c:466
 #, c-format
-msgid "       %s {--addsign} [--rcfile <file>] package1 package2 ... packageN"
+msgid ""
+"       %s {--addsign} [--macros <file:...>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpmqv.c:472
+#: rpmqv.c:467
 #, c-format
 msgid ""
-"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]\n"
+"       %s {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--macros "
+"<file:...>]\n"
 msgstr ""
 
-#: rpmqv.c:516
+#: rpmqv.c:511
 msgid "  All modes support the following options:"
 msgstr ""
 
-#: rpmqv.c:517
+#: rpmqv.c:512
 msgid "   --define '<name> <body>'"
 msgstr ""
 
-#: rpmqv.c:519
-msgid "   --eval '<name>+'       "
+#: rpmqv.c:514
+msgid "   --eval '<expr>+'       "
 msgstr ""
 
-#: rpmqv.c:521
+#: rpmqv.c:515
+msgid "print the expansion of macro <expr> to stdout"
+msgstr ""
+
+#: rpmqv.c:516
 msgid "   --pipe <cmd>           "
 msgstr ""
 
-#: rpmqv.c:523
-msgid "   --rcfile <file>        "
+#: rpmqv.c:518
+msgid "   --macros <file:...>    "
+msgstr ""
+
+#: rpmqv.c:519
+msgid "use <file:...> instead of default list of macro files"
 msgstr ""
 
-#: rpmqv.c:528
+#: rpmqv.c:523
 msgid "   --dbpath <dir>         "
 msgstr ""
 
-#: rpmqv.c:530
+#: rpmqv.c:525
 msgid "   --root <dir>           "
 msgstr ""
 
-#: rpmqv.c:540
+#: rpmqv.c:535
 msgid ""
 "  Install, upgrade and query (with -p) modes allow URL's to be used in place"
 msgstr ""
 
-#: rpmqv.c:541
+#: rpmqv.c:536
 msgid "  of file names as well as the following options:"
 msgstr ""
 
-#: rpmqv.c:542
+#: rpmqv.c:537
 msgid "     --ftpproxy <host>    "
 msgstr ""
 
-#: rpmqv.c:544
+#: rpmqv.c:539
 msgid "     --ftpport <port>     "
 msgstr ""
 
-#: rpmqv.c:546
+#: rpmqv.c:541
 msgid "     --httpproxy <host>   "
 msgstr ""
 
-#: rpmqv.c:548
+#: rpmqv.c:543
 msgid "     --httpport <port>    "
 msgstr ""
 
-#: rpmqv.c:554
+#: rpmqv.c:549
 msgid "  Package specification options:"
 msgstr ""
 
-#: lib/poptQV.c:68 rpmqv.c:556
+#: lib/poptQV.c:68 rpmqv.c:551
 msgid "query/verify all packages"
 msgstr ""
 
-#: rpmqv.c:557
+#: rpmqv.c:552
 msgid "     -f <file>+           "
 msgstr ""
 
-#: rpmqv.c:558
+#: rpmqv.c:553
 msgid "query/verify package owning <file>"
 msgstr ""
 
-#: rpmqv.c:559
+#: rpmqv.c:554
 msgid "     -p <packagefile>+    "
 msgstr ""
 
-#: rpmqv.c:560
+#: rpmqv.c:555
 msgid "query/verify (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpmqv.c:561
+#: rpmqv.c:556
 msgid "     --triggeredby <pkg>  "
 msgstr ""
 
-#: rpmqv.c:562
+#: rpmqv.c:557
 msgid "query/verify packages triggered by <pkg>"
 msgstr ""
 
-#: rpmqv.c:563
+#: rpmqv.c:558
 msgid "     --whatprovides <cap> "
 msgstr ""
 
-#: rpmqv.c:564
+#: rpmqv.c:559
 msgid "query/verify packages which provide <cap> capability"
 msgstr ""
 
-#: rpmqv.c:565
+#: rpmqv.c:560
 msgid "     --whatrequires <cap> "
 msgstr ""
 
-#: rpmqv.c:566
+#: rpmqv.c:561
 msgid "query/verify packages which require <cap> capability"
 msgstr ""
 
-#: rpmqv.c:570
+#: rpmqv.c:565
 msgid "     --queryformat <qfmt> "
 msgstr ""
 
-#: rpmqv.c:573
+#: rpmqv.c:568
 msgid "    Information selection options:"
 msgstr ""
 
-#: rpmqv.c:589
+#: rpmqv.c:584
 msgid "list capabilities provided by package"
 msgstr ""
 
-#: rpmqv.c:591
+#: rpmqv.c:586
 msgid "list capabilities required by package"
 msgstr ""
 
-#: rpmqv.c:593
+#: rpmqv.c:588
 msgid "print the various [un]install scriptlets"
 msgstr ""
 
-#: rpmqv.c:595
+#: rpmqv.c:590
 msgid "show the trigger scriptlets contained in the package"
 msgstr ""
 
-#: rpmqv.c:621
+#: rpmqv.c:616
 msgid "   --install <packagefile>"
 msgstr ""
 
-#: rpmqv.c:622
+#: rpmqv.c:617
 msgid "   -i <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:631
+#: rpmqv.c:626
 msgid "     --excludepath <path> "
 msgstr ""
 
-#: rpmqv.c:652
+#: rpmqv.c:647
 msgid "don't execute any installation scriptlets"
 msgstr ""
 
-#: rpmqv.c:657
+#: rpmqv.c:652
 msgid "     --prefix <dir>       "
 msgstr ""
 
-#: rpmqv.c:659
+#: rpmqv.c:654
 msgid "     --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpmqv.c:668
+#: rpmqv.c:663
 msgid "   --upgrade <packagefile>"
 msgstr ""
 
-#: rpmqv.c:669
+#: rpmqv.c:664
 msgid "   -U <packagefile>       "
 msgstr ""
 
-#: rpmqv.c:674
+#: rpmqv.c:669
 msgid "   --erase <package>"
 msgstr ""
 
-#: rpmqv.c:693
+#: rpmqv.c:688
 msgid "   --resign <pkg>+        "
 msgstr ""
 
-#: rpmqv.c:695
+#: rpmqv.c:690
 msgid "   --addsign <pkg>+       "
 msgstr ""
 
-#: rpmqv.c:698
+#: rpmqv.c:693
 msgid "   --checksig <pkg>+"
 msgstr ""
 
-#: rpmqv.c:699
+#: rpmqv.c:694
 msgid "   -K <pkg>+             "
 msgstr ""
 
-#: rpmqv.c:712
+#: rpmqv.c:707
 msgid "initalize database (unnecessary, legacy use)"
 msgstr ""
 
-#: rpmqv.c:714
+#: rpmqv.c:709
 msgid "rebuild database indices from existing database headers"
 msgstr ""
 
-#: rpmqv.c:1001
-msgid "Use \"--macros <file:...>\" instead..\n"
+#: rpmqv.c:996
+msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:1076
+#: rpmqv.c:1071
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:1163
+#: rpmqv.c:1158
 msgid ""
 "--notriggers may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:1322
+#: rpmqv.c:1317
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1391
+#: rpmqv.c:1386
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1393
+#: rpmqv.c:1388
 msgid "no tar files given for build"
 msgstr ""
 
@@ -2359,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2734,16 +2758,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3379,35 +3403,35 @@ msgstr ""
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2446
+#: lib/rpmdb.c:2449
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2483
+#: lib/rpmdb.c:2484
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2501
+#: lib/rpmdb.c:2502
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2509
+#: lib/rpmdb.c:2510
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2511
+#: lib/rpmdb.c:2512
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2521
+#: lib/rpmdb.c:2522
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2523
+#: lib/rpmdb.c:2524
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
@@ -3750,27 +3774,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
+msgstr ""
+
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 0fe0090..7afde60 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -2573,20 +2573,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2953,18 +2953,18 @@ msgstr "en voinut avata tiedostoa %s: "
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, fuzzy, c-format
 msgid "error creating temporary file %s"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/package.c:85
+#: lib/package.c:88
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
 
-#: lib/package.c:142
+#: lib/package.c:143
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4021,27 +4021,46 @@ msgstr "Sinun pit
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, fuzzy, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr "Haen: %s\n"
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "virhe luotaessa hakemistoa %s: %s"
+msgid "%5d relocate %s -> %s\n"
+msgstr "en voinut avata tiedostoa %s: "
+
+#: lib/transaction.c:543
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "Haen: %s\n"
 
-#: lib/transaction.c:527
+#: lib/transaction.c:592
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "Haen: %s\n"
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "virhe luotaessa hakemistoa %s: %s"
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 04cec21..574247a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2001-01-05 16:03-0500\n"
+msgstr "POT-Creation-Date: 2001-01-08 23:06-0500\n"
 
 #: build.c:26
 #, fuzzy, c-format
@@ -2585,20 +2585,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2964,16 +2964,16 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -4031,27 +4031,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/transaction.c:543
 #, c-format
-msgid "excluding directory %s\n"
+msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 0d28260..4464cc3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2758,16 +2758,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3774,27 +3774,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 0d28260..4464cc3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2758,16 +2758,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3774,27 +3774,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 0d28260..4464cc3 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2758,16 +2758,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3774,27 +3774,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index c8c3fa8..6476dd6 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-0500\n"
 "PO-Revision-Date: 2000-08-02 13:00+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -2416,20 +2416,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2791,16 +2791,16 @@ msgstr "gat ekki b
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3811,27 +3811,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "gat ekki búið til %s: %s\n"
+
+#: lib/transaction.c:543
 #, c-format
-msgid "excluding directory %s\n"
+msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 0d28260..4464cc3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2758,16 +2758,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3774,27 +3774,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index d0e74a0..1a11a0f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -88,7 +88,7 @@ msgstr "
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.142 2001/01/05 21:04:47 jbj Exp $
+# $Id: ja.po,v 1.143 2001/01/09 04:07:51 jbj Exp $
 #: rpm.c:185 rpmqv.c:386
 #, c-format
 msgid "rpm: %s\n"
@@ -2536,20 +2536,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2920,18 +2920,18 @@ msgstr "
 msgid "running postinstall scripts (if any)\n"
 msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n"
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼"
 
-#: lib/package.c:85
+#: lib/package.c:88
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: lib/package.c:142
+#: lib/package.c:143
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4001,27 +4001,46 @@ msgstr "
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
+#, fuzzy, c-format
+msgid "%5d exclude  %s\n"
+msgstr "OS ¤Ï½ü³°¤µ¤ì¤Æ¤¤¤Þ¤¹: %s"
+
+#: lib/transaction.c:472
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n"
+
+#: lib/transaction.c:543
 #, fuzzy, c-format
-msgid "excluding file %s%s\n"
+msgid "excluding multilib path %s%s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n"
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:592
 #, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n"
+msgid "excluding %s %s\n"
+msgstr "¥Õ¥¡¥¤¥ë¤Î½ü³°: %s%s\n"
 
-#: lib/transaction.c:527
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "%s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò %s ¤ËºÆÇÛÃÖ¤·¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î½ü³°: %s\n"
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ¤Ï missingok ¥Õ¥é¥°¤Î¤¿¤á¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
diff --git a/po/ko.po b/po/ko.po
index 0d28260..4464cc3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2758,16 +2758,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3774,27 +3774,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index 3f1b95a..297fef5 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-0500\n"
 "PO-Revision-Date: 2000-08-17 20:22+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -2437,20 +2437,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2812,16 +2812,16 @@ msgstr "kunne ikke opprette %s: %s\n"
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3839,27 +3839,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "kunne ikke opprette %s: %s\n"
+
+#: lib/transaction.c:543
 #, c-format
-msgid "excluding directory %s\n"
+msgid "excluding multilib path %s%s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 33f8d31..f649b4e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2534,20 +2534,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "usuwanie indeksu grupy\n"
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2912,18 +2912,18 @@ msgstr "ostrze
 msgid "running postinstall scripts (if any)\n"
 msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n"
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "b³±d w tworzeniu pliku tymczasowego %s"
 
-#: lib/package.c:85
+#: lib/package.c:88
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
 
-#: lib/package.c:142
+#: lib/package.c:143
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -3964,27 +3964,46 @@ msgstr "Musisz ustawi
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "Musisz ustawiæ \"%%_pgp_name\" w pliku swego makra"
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
+#, fuzzy, c-format
+msgid "%5d exclude  %s\n"
+msgstr "Ten OS nie jest wspierany: %s"
+
+#: lib/transaction.c:472
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "przesuwanie %s do %s\n"
+
+#: lib/transaction.c:543
 #, fuzzy, c-format
-msgid "excluding file %s%s\n"
+msgid "excluding multilib path %s%s\n"
 msgstr "wy³±czanie %s\n"
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:592
 #, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "tworzenie katalogu: %s\n"
+msgid "excluding %s %s\n"
+msgstr "wy³±czanie %s\n"
 
-#: lib/transaction.c:527
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "przesuwanie %s do %s\n"
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "tworzenie katalogu: %s\n"
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s pominiêty z powodu flagi missingok\n"
diff --git a/po/pt.po b/po/pt.po
index defd317..a7b958b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-0500\n"
 "PO-Revision-Date: 2000-08-01 21:11+01:00\n"
 "Last-Translator: Pedro Morais <morais@poli.org>\n"
 "Language-Team: pt <morais@poli.org>\n"
@@ -2380,20 +2380,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2755,16 +2755,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3775,27 +3775,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5bb2666..8bbb254 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2001-01-05 16:03-0500\n"
+msgstr "POT-Creation-Date: 2001-01-08 23:06-0500\n"
 
 # , c-format
 #: build.c:26
@@ -2652,20 +2652,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -3039,16 +3039,16 @@ msgstr "N
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -4137,6 +4137,10 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
 # "Project-Id-Version: rpm-2.5.3\n"
 # "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
 # "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
@@ -4145,11 +4149,17 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/transaction.c:496
+#: lib/transaction.c:469
 #, fuzzy, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr "RPM versão %s\n"
 
+# , c-format
+#: lib/transaction.c:472
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "Não consegui abrir: %s\n"
+
 # "Project-Id-Version: rpm-2.5.3\n"
 # "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
 # "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
@@ -4158,23 +4168,49 @@ msgstr "RPM vers
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:543
 #, fuzzy, c-format
-msgid "excluding directory %s\n"
+msgid "excluding multilib path %s%s\n"
+msgstr "RPM versão %s\n"
+
+# "Project-Id-Version: rpm-2.5.3\n"
+# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
+# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+# "Language-Team: Portuguese <pt@li.org>\n"
+# "MIME-Version: 1.0\n"
+# "Content-Type: text/plain; charset=ISO-8859-1\n"
+# "Content-Transfer-Encoding: 8-bit\n"
+# , c-format
+#: lib/transaction.c:592
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
 msgstr "RPM versão %s\n"
 
-#: lib/transaction.c:527
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
 # , c-format
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "Não consegui abrir: %s\n"
 
-#: lib/transaction.c:749
+# "Project-Id-Version: rpm-2.5.3\n"
+# "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
+# "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
+# "Language-Team: Portuguese <pt@li.org>\n"
+# "MIME-Version: 1.0\n"
+# "Content-Type: text/plain; charset=ISO-8859-1\n"
+# "Content-Transfer-Encoding: 8-bit\n"
+# , c-format
+#: lib/transaction.c:676
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "RPM versão %s\n"
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 5a06bf2..d22641e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2378,20 +2378,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2753,16 +2753,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3769,27 +3769,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 01776ee..e2fce48 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-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2758,16 +2758,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3774,27 +3774,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index b5c01ed..b8ff5ca 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-0500\n"
 "PO-Revision-Date: 2000-08-08 01:20+0300\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -2470,20 +2470,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n"
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2852,16 +2852,16 @@ msgstr "
 msgid "running postinstall scripts (if any)\n"
 msgstr "×ÙÐÏÌÎÑÅÔÓÑ ÓËÒÉÐÔ postinstall (ÅÓÌÉ ÅÓÔØ)\n"
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s"
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "ÐÁËÅÔÙ ×ÅÒÓÉÉ 1 ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÜÔÏÊ ×ÅÒÓÉÅÊ RPM"
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ÐÁËÅÔÙ ×ÅÒÓÉÉ <= 4"
@@ -3923,27 +3923,46 @@ msgstr "
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_pgp_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ"
 
-#: lib/transaction.c:496
-#, c-format
-msgid "excluding file %s%s\n"
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
+#, fuzzy, c-format
+msgid "%5d exclude  %s\n"
+msgstr "ïó ÉÓËÌÀÞÅÎÁ: %s"
+
+#: lib/transaction.c:472
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ %s × %s\n"
+
+#: lib/transaction.c:543
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
 msgstr "ÉÓËÌÀÞÁÀ ÆÁÊÌ %s%s\n"
 
-#: lib/transaction.c:522 lib/transaction.c:605
-#, c-format
-msgid "excluding directory %s\n"
-msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n"
+#: lib/transaction.c:592
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "ÉÓËÌÀÞÁÀ ÆÁÊÌ %s%s\n"
 
-#: lib/transaction.c:527
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ %s × %s\n"
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "ÐÅÒÅÍÅÝÁÅÔÓÑ ËÁÔÁÌÏÇ %s × %s\n"
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr "ÉÓËÌÀÞÁÅÔÓÑ ËÁÔÁÌÏÇ %s\n"
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s ÐÒÏÐÕÝÅÎ ÉÚ-ÚÁ ÆÌÁÇÁ missingok\n"
diff --git a/po/sk.po b/po/sk.po
index 9aee676..2bcf1ec 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2543,20 +2543,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstraòuje sa index skupín\n"
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2921,17 +2921,17 @@ msgstr "varovanie: %s uchovan
 msgid "running postinstall scripts (if any)\n"
 msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n"
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "chyba pri vytváraní doèasného súboru %s"
 
-#: lib/package.c:85
+#: lib/package.c:88
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3"
 
-#: lib/package.c:142
+#: lib/package.c:143
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -3971,27 +3971,46 @@ msgstr "Mus
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "Musíte nastavi» \"%%pgp_name\" vo va¹om makro-súbore"
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
+#, fuzzy, c-format
+msgid "%5d exclude  %s\n"
+msgstr "OS je vynechaný: %s"
+
+#: lib/transaction.c:472
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "presúva sa %s do %s\n"
+
+#: lib/transaction.c:543
 #, fuzzy, c-format
-msgid "excluding file %s%s\n"
+msgid "excluding multilib path %s%s\n"
 msgstr "vynecháva sa %s\n"
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:592
 #, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "vytvára sa adresár %s\n"
+msgid "excluding %s %s\n"
+msgstr "vynecháva sa %s\n"
 
-#: lib/transaction.c:527
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "presúva sa %s do %s\n"
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "vytvára sa adresár %s\n"
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s vynechané kvôli príznaku missingok\n"
diff --git a/po/sl.po b/po/sl.po
index 2096bd1..e212362 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.127 2001/01/05 21:04:51 jbj Exp $
+# $Id: sl.po,v 1.128 2001/01/09 04:07:53 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2527,20 +2527,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2910,17 +2910,17 @@ msgstr "opozorilo: %s shranjen kot %s"
 msgid "running postinstall scripts (if any)\n"
 msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n"
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "napaka pri ustvarjanju zaèasne datoteke %s"
 
-#: lib/package.c:85
+#: lib/package.c:88
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <= 3"
 
-#: lib/package.c:142
+#: lib/package.c:143
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -3985,27 +3985,46 @@ msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/transaction.c:496
-#, c-format
-msgid "excluding file %s%s\n"
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
+#, fuzzy, c-format
+msgid "%5d exclude  %s\n"
+msgstr "OS je izkljuèen: %s"
+
+#: lib/transaction.c:472
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "premikanje %s v %s\n"
+
+#: lib/transaction.c:543
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
 msgstr "izkljuèevanje datoteke %s%s\n"
 
-#: lib/transaction.c:522 lib/transaction.c:605
-#, c-format
-msgid "excluding directory %s\n"
-msgstr "izkljuèevanje imenika %s\n"
+#: lib/transaction.c:592
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "izkljuèevanje datoteke %s%s\n"
 
-#: lib/transaction.c:527
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "premikanje %s v %s\n"
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "premiokanje imenika %s v %s\n"
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr "izkljuèevanje imenika %s\n"
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s preskoèen zaradi manjkajoèe zastavice OK\n"
diff --git a/po/sr.po b/po/sr.po
index 2df252d..a3f1f8c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -2537,20 +2537,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2917,17 +2917,17 @@ msgstr "Ne mogu da otvorim datoteku %s: "
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, fuzzy, c-format
 msgid "error creating temporary file %s"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/package.c:85
+#: lib/package.c:88
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
 
-#: lib/package.c:142
+#: lib/package.c:143
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -3983,27 +3983,46 @@ msgstr "Morate podesiti \"pgp_name:\" u va
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci"
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, fuzzy, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr "Pribavljam %s\n"
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
+msgid "%5d relocate %s -> %s\n"
+msgstr "Ne mogu da otvorim datoteku %s: "
+
+#: lib/transaction.c:543
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "Pribavljam %s\n"
 
-#: lib/transaction.c:527
+#: lib/transaction.c:592
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "Pribavljam %s\n"
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 185b58b..4a21e07 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-0500\n"
 "PO-Revision-Date: 2000-10-09 22:31+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -2445,20 +2445,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "tar bort \"%s\" från %s-indexet.\n"
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2827,16 +2827,16 @@ msgstr "varning: %s sparades som %s"
 msgid "running postinstall scripts (if any)\n"
 msgstr "kör (eventuellt) postinstallationsskript\n"
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr "fel när tämporärfil %s skapades"
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr "paket med versionsnummer 1 stöds inte av denna version av RPM"
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM"
@@ -3894,27 +3894,46 @@ msgstr "Du m
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "Du måste sätta \"%%_pgp_name\" i din makrofil"
 
-#: lib/transaction.c:496
-#, c-format
-msgid "excluding file %s%s\n"
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
+#, fuzzy, c-format
+msgid "%5d exclude  %s\n"
+msgstr "OS är uteslutet: %s"
+
+#: lib/transaction.c:472
+#, fuzzy, c-format
+msgid "%5d relocate %s -> %s\n"
+msgstr "flyttar %s till %s\n"
+
+#: lib/transaction.c:543
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
 msgstr "hoppar över %s%s\n"
 
-#: lib/transaction.c:522 lib/transaction.c:605
-#, c-format
-msgid "excluding directory %s\n"
-msgstr "hoppar över katalogen %s\n"
+#: lib/transaction.c:592
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "hoppar över %s%s\n"
 
-#: lib/transaction.c:527
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr "flyttar %s till %s\n"
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "flyttar katalogen %s till %s\n"
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr "hoppar över katalogen %s\n"
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr "%s överhoppad på grund av missingok-flagga\n"
diff --git a/po/tr.po b/po/tr.po
index 7256e7e..243b82f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2585,20 +2585,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "%s kaydýnýn %s dosyasýndan silinmesinde hata"
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2965,18 +2965,18 @@ msgstr "%s dosyas
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, fuzzy, c-format
 msgid "error creating temporary file %s"
 msgstr "%s dizinin oluþturulmasýnda hata: %s"
 
-#: lib/package.c:85
+#: lib/package.c:88
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 "RPM'in bu sürümünde sadece major numarasý <= 3 olan paketler destekleniyor"
 
-#: lib/package.c:142
+#: lib/package.c:143
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
@@ -4035,27 +4035,46 @@ msgstr "rpmrc dosyan
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr "rpmrc dosyanýzda \"pgp_name:\" tanýmlanmýþ olmalý"
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, fuzzy, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr "%s alýnýyor\n"
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, fuzzy, c-format
-msgid "excluding directory %s\n"
-msgstr "%s dizinin oluþturulmasýnda hata: %s"
+msgid "%5d relocate %s -> %s\n"
+msgstr "%s dosyasý açýlamýyor: "
+
+#: lib/transaction.c:543
+#, fuzzy, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr "%s alýnýyor\n"
 
-#: lib/transaction.c:527
+#: lib/transaction.c:592
+#, fuzzy, c-format
+msgid "excluding %s %s\n"
+msgstr "%s alýnýyor\n"
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, fuzzy, c-format
 msgid "relocating directory %s to %s\n"
 msgstr "%s dizinin oluþturulmasýnda hata: %s"
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, fuzzy, c-format
+msgid "excluding directory %s\n"
+msgstr "%s dizinin oluþturulmasýnda hata: %s"
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 0d28260..4464cc3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2758,16 +2758,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3774,27 +3774,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 0d28260..4464cc3 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2758,16 +2758,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3774,27 +3774,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 0d28260..4464cc3 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2758,16 +2758,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3774,27 +3774,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 0d28260..4464cc3 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.1\n"
-"POT-Creation-Date: 2001-01-05 16:03-0500\n"
+"POT-Creation-Date: 2001-01-08 23:06-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"
@@ -2383,20 +2383,20 @@ msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1626
+#: lib/depends.c:1660
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1676
+#: lib/depends.c:1710
 msgid "========== tsorting packages\n"
 msgstr ""
 
-#: lib/depends.c:1779
+#: lib/depends.c:1807
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1810
+#: lib/depends.c:1838
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -2758,16 +2758,16 @@ msgstr ""
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
-#: lib/misc.c:339 lib/misc.c:344 lib/misc.c:350
+#: lib/misc.c:328 lib/misc.c:333 lib/misc.c:339
 #, c-format
 msgid "error creating temporary file %s"
 msgstr ""
 
-#: lib/package.c:85
+#: lib/package.c:88
 msgid "packaging version 1 is not supported by this version of RPM"
 msgstr ""
 
-#: lib/package.c:142
+#: lib/package.c:143
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM"
 msgstr ""
@@ -3774,27 +3774,46 @@ msgstr ""
 msgid "You must set \"%%_pgp_name\" in your macro file"
 msgstr ""
 
-#: lib/transaction.c:496
+#: lib/transaction.c:466
+msgid "========== relocations\n"
+msgstr ""
+
+#: lib/transaction.c:469
 #, c-format
-msgid "excluding file %s%s\n"
+msgid "%5d exclude  %s\n"
 msgstr ""
 
-#: lib/transaction.c:522 lib/transaction.c:605
+#: lib/transaction.c:472
 #, c-format
-msgid "excluding directory %s\n"
+msgid "%5d relocate %s -> %s\n"
 msgstr ""
 
-#: lib/transaction.c:527
+#: lib/transaction.c:543
+#, c-format
+msgid "excluding multilib path %s%s\n"
+msgstr ""
+
+#: lib/transaction.c:592
+#, c-format
+msgid "excluding %s %s\n"
+msgstr ""
+
+#: lib/transaction.c:599
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:598
+#: lib/transaction.c:671
 #, c-format
 msgid "relocating directory %s to %s\n"
 msgstr ""
 
-#: lib/transaction.c:749
+#: lib/transaction.c:676
+#, c-format
+msgid "excluding directory %s\n"
+msgstr ""
+
+#: lib/transaction.c:800
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/rpm.spec b/rpm.spec
index 411d1f0..d3de17b 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -13,7 +13,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 4.0.2
 Version: %{version}
-Release: 0.18
+Release: 0.19
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -309,6 +309,10 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Mon Jan  8 2001 Jeff Johnson <jbj@redhat.com>
+- tsorted packages processed in successor count order.
+- fix: resurrect --excludepath (#19666).
+
 * Fri Jan  5 2001 Jeff Johnson <jbj@redhat.com>
 - fix: 3 packages from Red Hat 5.2 had bogus %verifyscript tag.
 
diff --git a/rpm.spec.in b/rpm.spec.in
index 3429f51..863fea5 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -13,7 +13,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version @VERSION@
 Version: %{version}
-Release: 0.18
+Release: 0.19
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -309,6 +309,10 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Mon Jan  8 2001 Jeff Johnson <jbj@redhat.com>
+- tsorted packages processed in successor count order.
+- fix: resurrect --excludepath (#19666).
+
 * Fri Jan  5 2001 Jeff Johnson <jbj@redhat.com>
 - fix: 3 packages from Red Hat 5.2 had bogus %verifyscript tag.