34 files changed, 935 insertions, 843 deletions
diff --git a/CHANGES b/CHANGES
index 62893b9c3..31da7a37c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -40,6 +40,7 @@
 	- add explicit -L/lib64 -L/usr/lib64 for libtool mode=relink on x86_64.
 	- use usrlib_LTLIBRARIES to install directly in /usr/lib64 instead.
 	- late rpmts reference causes premature free (#78862).
+	- internal automagic dependency generation (disabled for now).
 
 4.0.4 -> 4.1:
 	- loosely wire beecrypt library into rpm.
diff --git a/build/.lclintrc b/build/.splintrc
index 8f683ee47..8f683ee47 100644
--- a/build/.lclintrc
+++ b/build/.splintrc
diff --git a/build/Makefile.am b/build/Makefile.am
index 9d78ff98c..0d035774d 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -31,7 +31,7 @@ librpmbuild_la_LDFLAGS = -release @VERSION@ $(top_builddir)/lib/librpm.la
 rpmfile.h:
 	@ln -sf $(top_builddir)/file/file.h $@
 
-rpmfc.c: rpmfile.h
+files.c rpmfc.c: rpmfile.h
 
 clean-local:
 	 rm -f *.o rpmfile.h # .created $(FILELOBJS)
diff --git a/build/argv.c b/build/argv.c
index 2f92fe0cd..9156133d1 100644
--- a/build/argv.c
+++ b/build/argv.c
@@ -64,6 +64,14 @@ int argiCount(ARGI_t argi)
     return nvals;
 }
 
+const ARGint_t argiData(const ARGI_t argi)
+{
+    ARGint_t vals = NULL;
+    if (argi && argi->nvals > 0)
+	vals = argi->vals;
+    return vals;
+}
+
 int argvCount(const ARGV_t argv)
 {
     int argc = 0;
@@ -73,6 +81,13 @@ int argvCount(const ARGV_t argv)
     return argc;
 }
 
+const ARGV_t argvData(const ARGV_t argv)
+{
+/*@-retalias -temptrans @*/
+    return argv;
+/*@=retalias =temptrans @*/
+}
+
 int argvCmp(const void * a, const void * b)
 {
 /*@-boundsread@*/
diff --git a/build/argv.h b/build/argv.h
index 2401cd0b1..eb74c2882 100644
--- a/build/argv.h
+++ b/build/argv.h
@@ -50,18 +50,38 @@ ARGV_t argvFree(/*@only@*/ /*@null@*/ ARGV_t argv)
 /**
  * Return no. of elements in argi array.
  * @param argi		argi array
+ * @return		no. of elements
  */
 int argiCount(/*@null@*/ const ARGI_t argi)
 	/*@*/;
 
 /**
+ * Return data from argi array.
+ * @param argi		argi array
+ * @return		argi array data address
+ */
+/*@null@*/
+const ARGint_t argiData(/*@null@*/ const ARGI_t argi)
+	/*@*/;
+
+/**
  * Return no. of elements in argv array.
  * @param argv		argv array
+ * @return		no. of elements
  */
 int argvCount(/*@null@*/ const ARGV_t argv)
 	/*@*/;
 
 /**
+ * Return data from argv array.
+ * @param argv		argv array
+ * @return		argv array data address
+ */
+/*@null@*/
+const ARGV_t argvData(/*@null@*/ const ARGV_t argv)
+	/*@*/;
+
+/**
  * Compare argv arrays (qsort/bsearch).
  * @param a		1st instance address
  * @param b		2nd instance address
diff --git a/build/files.c b/build/files.c
index bb1e61afb..c49103d88 100644
--- a/build/files.c
+++ b/build/files.c
@@ -1115,6 +1115,7 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl,
     int apathlen = 0;
     int dpathlen = 0;
     int skipLen = 0;
+    size_t fnlen;
     FileListRec flp;
     char buf[BUFSIZ];
     int i;
@@ -1379,17 +1380,15 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl,
 	    continue;
 	}
 
+	if ((fnlen = strlen(flp->diskURL) + 1) > fi->fnlen)
+	    fi->fnlen = fnlen;
+
 	/* Create disk directory and base name. */
 	fi->dil[i] = i;
 	/*@-dependenttrans@*/ /* FIX: artifact of spoofing headerGetEntry */
 	fi->dnl[fi->dil[i]] = d;
 	/*@=dependenttrans@*/
-#ifdef IA64_SUCKS_ROCKS
-	(void) stpcpy(d, flp->diskURL);
-	d += strlen(d);
-#else
 	d = stpcpy(d, flp->diskURL);
-#endif
 
 	/* Make room for the dirName NUL, find start of baseName. */
 	for (b = d; b > fi->dnl[fi->dil[i]] && *b != '/'; b--)
@@ -1403,20 +1402,9 @@ static void genCpioListAndHeader(/*@partial@*/ FileList fl,
 	/*@-dependenttrans@*/	/* FIX: xstrdup? nah ... */
 	fi->apath[i] = a;
  	/*@=dependenttrans@*/
-	if (_addDotSlash) {
-#ifdef IA64_SUCKS_ROCKS
-	    (void) stpcpy(a, "./");
-	    a += strlen(a);
-#else
+	if (_addDotSlash)
 	    a = stpcpy(a, "./");
-#endif
-	}
-#ifdef IA64_SUCKS_ROCKS
-	(void) stpcpy(a, (flp->fileURL + skipLen));
-	a += strlen(a);
-#else
 	a = stpcpy(a, (flp->fileURL + skipLen));
-#endif
 	a++;		/* skip apath NUL */
 
 	if (flp->flags & RPMFILE_GHOST) {
@@ -2289,248 +2277,6 @@ int processSourceFiles(Spec spec)
 }
 
 /**
- */
-typedef struct {
-/*@observer@*/ /*@null@*/ const char * msg;
-/*@observer@*/ const char * argv[4];
-    rpmTag ntag;
-    rpmTag vtag;
-    rpmTag ftag;
-    int mask;
-    int xor;
-} DepMsg_t;
-
-/**
- */
-/*@-exportlocal -exportheadervar@*/
-/*@unchecked@*/
-DepMsg_t depMsgs[] = {
-  { "Provides",		{ "%{?__find_provides}", NULL, NULL, NULL },
-	RPMTAG_PROVIDENAME, RPMTAG_PROVIDEVERSION, RPMTAG_PROVIDEFLAGS,
-	0, -1 },
-  { "PreReq",		{ NULL, NULL, NULL, NULL },
-	RPMTAG_REQUIRENAME, RPMTAG_REQUIREVERSION, RPMTAG_REQUIREFLAGS,
-	RPMSENSE_PREREQ, 0 },
-  { "Requires(interp)",	{ NULL, "interp", NULL, NULL },
-	-1, -1, RPMTAG_REQUIREFLAGS,
-	_notpre(RPMSENSE_INTERP), 0 },
-  { "Requires(rpmlib)",	{ NULL, "rpmlib", NULL, NULL },
-	-1, -1, RPMTAG_REQUIREFLAGS,
-	_notpre(RPMSENSE_RPMLIB), 0 },
-  { "Requires(verify)",	{ NULL, "verify", NULL, NULL },
-	-1, -1, RPMTAG_REQUIREFLAGS,
-	RPMSENSE_SCRIPT_VERIFY, 0 },
-  { "Requires(pre)",	{ NULL, "pre", NULL, NULL },
-	-1, -1, RPMTAG_REQUIREFLAGS,
-	_notpre(RPMSENSE_SCRIPT_PRE), 0 },
-  { "Requires(post)",	{ NULL, "post", NULL, NULL },
-	-1, -1, RPMTAG_REQUIREFLAGS,
-	_notpre(RPMSENSE_SCRIPT_POST), 0 },
-  { "Requires(preun)",	{ NULL, "preun", NULL, NULL },
-	-1, -1, RPMTAG_REQUIREFLAGS,
-	_notpre(RPMSENSE_SCRIPT_PREUN), 0 },
-  { "Requires(postun)",	{ NULL, "postun", NULL, NULL },
-	-1, -1, RPMTAG_REQUIREFLAGS,
-	_notpre(RPMSENSE_SCRIPT_POSTUN), 0 },
-  { "Requires",		{ "%{?__find_requires}", NULL, NULL, NULL },
-	-1, -1, RPMTAG_REQUIREFLAGS,	/* XXX inherit name/version arrays */
-	RPMSENSE_PREREQ, RPMSENSE_PREREQ },
-  { "Conflicts",	{ "%{?__find_conflicts}", NULL, NULL, NULL },
-	RPMTAG_CONFLICTNAME, RPMTAG_CONFLICTVERSION, RPMTAG_CONFLICTFLAGS,
-	0, -1 },
-  { "Obsoletes",	{ "%{?__find_obsoletes}", NULL, NULL, NULL },
-	RPMTAG_OBSOLETENAME, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS,
-	0, -1 },
-  { NULL,		{ NULL, NULL, NULL, NULL },	0, 0, 0, 0, 0 }
-};
-/*@=exportlocal =exportheadervar@*/
-
-/**
- */
-/*@-bounds@*/
-static int generateDepends(Spec spec, Package pkg, rpmfi cpioList)
-	/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
-	/*@modifies rpmGlobalMacroContext, fileSystem, internalState @*/
-{
-    rpmfi fi = cpioList;
-    StringBuf sb_stdin;
-    StringBuf sb_stdout;
-    DepMsg_t * dm;
-    int failnonzero = 0;
-    int rc = 0;
-    int i;
-
-    if (!(fi && fi->fc > 0))
-	return 0;
-
-    if (! (pkg->autoReq || pkg->autoProv))
-	return 0;
-
-    /*
-     * Create file manifest buffer to deliver to dependency finder.
-     */
-    sb_stdin = newStringBuf();
-    for (i = 0; i < fi->fc; i++) {
-	appendStringBuf(sb_stdin, fi->dnl[fi->dil[i]]);
-	appendLineStringBuf(sb_stdin, fi->bnl[i]);
-    }
-
-    for (dm = depMsgs; dm->msg != NULL; dm++) {
-	int tag, tagflags;
-	char * s;
-	int xx;
-
-	tag = (dm->ftag > 0) ? dm->ftag : dm->ntag;
-	tagflags = 0;
-	s = NULL;
-
-	switch(tag) {
-	case RPMTAG_PROVIDEFLAGS:
-	    if (!pkg->autoProv)
-		continue;
-	    failnonzero = 1;
-	    tagflags = RPMSENSE_FIND_PROVIDES;
-	    /*@switchbreak@*/ break;
-	case RPMTAG_REQUIREFLAGS:
-	    if (!pkg->autoReq)
-		continue;
-	    failnonzero = 0;
-	    tagflags = RPMSENSE_FIND_REQUIRES;
-	    /*@switchbreak@*/ break;
-	default:
-	    continue;
-	    /*@notreached@*/ /*@switchbreak@*/ break;
-	}
-
-	xx = rpmfcExec(dm->argv, sb_stdin, &sb_stdout, failnonzero);
-	if (xx == -1)
-	    continue;
-
-	s = rpmExpand(dm->argv[0], NULL);
-	rpmMessage(RPMMESS_NORMAL, _("Finding  %s: %s\n"), dm->msg,
-		(s ? s : ""));
-	s = _free(s);
-
-	if (sb_stdout == NULL) {
-	    rc = RPMERR_EXEC;
-	    rpmError(rc, _("Failed to find %s:\n"), dm->msg);
-	    break;
-	}
-
-	/* Parse dependencies into header */
-	tagflags &= ~RPMSENSE_MULTILIB;
-
-	rc = parseRCPOT(spec, pkg, getStringBuf(sb_stdout), tag, 0, tagflags);
-	sb_stdout = freeStringBuf(sb_stdout);
-
-	if (rc) {
-	    rpmError(rc, _("Failed to find %s:\n"), dm->msg);
-	    break;
-	}
-    }
-
-    sb_stdin = freeStringBuf(sb_stdin);
-    return rc;
-}
-/*@=bounds@*/
-
-/**
- */
-static void printDepMsg(DepMsg_t * dm, int count, const char ** names,
-		const char ** versions, int *flags)
-	/*@*/
-{
-    int hasVersions = (versions != NULL);
-    int hasFlags = (flags != NULL);
-    int bingo = 0;
-    int i;
-
-    for (i = 0; i < count; i++, names++, versions++, flags++) {
-	if (hasFlags && !((*flags & dm->mask) ^ dm->xor))
-	    continue;
-	if (bingo == 0) {
-	    rpmMessage(RPMMESS_NORMAL, "%s:", (dm->msg ? dm->msg : ""));
-	    bingo = 1;
-	}
-	rpmMessage(RPMMESS_NORMAL, " %s", *names);
-
-	if (hasVersions && !(*versions != NULL && **versions != '\0'))
-	    continue;
-	if (!(hasFlags && (*flags && RPMSENSE_SENSEMASK)))
-	    continue;
-
-	rpmMessage(RPMMESS_NORMAL, " ");
-	if (*flags & RPMSENSE_LESS)
-	    rpmMessage(RPMMESS_NORMAL, "<");
-	if (*flags & RPMSENSE_GREATER)
-	    rpmMessage(RPMMESS_NORMAL, ">");
-	if (*flags & RPMSENSE_EQUAL)
-	    rpmMessage(RPMMESS_NORMAL, "=");
-
-	rpmMessage(RPMMESS_NORMAL, " %s", *versions);
-    }
-    if (bingo)
-	rpmMessage(RPMMESS_NORMAL, "\n");
-}
-
-/**
- */
-static void printDeps(Header h)
-	/*@*/
-{
-    HGE_t hge = (HGE_t)headerGetEntryMinMemory;
-    HFD_t hfd = headerFreeData;
-    const char ** names = NULL;
-    rpmTagType dnt = -1;
-    const char ** versions = NULL;
-    rpmTagType dvt = -1;
-    int * flags = NULL;
-    DepMsg_t * dm;
-    int count, xx;
-
-    for (dm = depMsgs; dm->msg != NULL; dm++) {
-	switch (dm->ntag) {
-	case 0:
-	    names = hfd(names, dnt);
-	    /*@switchbreak@*/ break;
-	case -1:
-	    /*@switchbreak@*/ break;
-	default:
-	    names = hfd(names, dnt);
-	    if (!hge(h, dm->ntag, &dnt, (void **) &names, &count))
-		continue;
-	    /*@switchbreak@*/ break;
-	}
-	switch (dm->vtag) {
-	case 0:
-	    versions = hfd(versions, dvt);
-	    /*@switchbreak@*/ break;
-	case -1:
-	    /*@switchbreak@*/ break;
-	default:
-	    versions = hfd(versions, dvt);
-	    xx = hge(h, dm->vtag, &dvt, (void **) &versions, NULL);
-	    /*@switchbreak@*/ break;
-	}
-	switch (dm->ftag) {
-	case 0:
-	    flags = NULL;
-	    /*@switchbreak@*/ break;
-	case -1:
-	    /*@switchbreak@*/ break;
-	default:
-	    xx = hge(h, dm->ftag, NULL, (void **) &flags, NULL);
-	    /*@switchbreak@*/ break;
-	}
-	/*@-noeffect@*/
-	printDepMsg(dm, count, names, versions, flags);
-	/*@=noeffect@*/
-    }
-    names = hfd(names, dnt);
-    versions = hfd(versions, dvt);
-}
-
-/**
  * Check packaged file list against what's in the build root.
  * @param fileList	packaged file list
  * @return		-1 if skipped, 0 on OK, 1 on error
@@ -2607,11 +2353,8 @@ int processBinaryFiles(Spec spec, int installSpecialDoc, int test)
 	if ((rc = processPackageFiles(spec, pkg, installSpecialDoc, test)))
 	    res = rc;
 
-	(void) generateDepends(spec, pkg, pkg->cpioList);
+	(void) rpmfcGenerateDepends(spec, pkg);
 
-	/*@-noeffect@*/
-	printDeps(pkg->header);
-	/*@=noeffect@*/
     }
 
     /* Now we have in fileList list of files from all packages.
diff --git a/build/rpmfc.c b/build/rpmfc.c
index b347c2ee5..0747e9f87 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -1,4 +1,3 @@
-/*@-bounds@*/
 #include "system.h"
 
 #include <signal.h>	/* getOutputFrom() */
@@ -7,6 +6,9 @@
 #include <argv.h>
 #include <rpmfc.h>
 
+#include <rpmds.h>
+#include <rpmfi.h>
+
 #if HAVE_GELF_H
 #include <gelf.h>
 #endif
@@ -18,6 +20,9 @@
 /*@unchecked@*/
 int _rpmfc_debug;
 
+/**
+ */
+/*@-bounds@*/	/* LCL: internal error */
 static int rpmfcExpandAppend(/*@out@*/ ARGV_t * argvp, const ARGV_t av)
 	/*@globals rpmGlobalMacroContext @*/
 	/*@modifies *argvp, rpmGlobalMacroContext @*/
@@ -34,7 +39,7 @@ static int rpmfcExpandAppend(/*@out@*/ ARGV_t * argvp, const ARGV_t av)
     *argvp = argv;
     return 0;
 }
-
+/*@=bounds@*/
 
 /*@-boundswrite@*/
 /** \ingroup rpmbuild
@@ -268,6 +273,11 @@ static int rpmfcSaveArg(/*@out@*/ ARGV_t * argvp, const char * key)
 }
 
 /**
+ * Run per-interpreter dependency helper.
+ * @param fc		file classifier
+ * @param deptype	'P' == Provides:, 'R' == Requires:, helper
+ * @param nsdep		class name for interpreter (e.g. "perl")
+ * @return		0 on success
  */
 /*@-bounds@*/
 static int rpmfcHelper(rpmfc fc, unsigned char deptype, const char * nsdep)
@@ -447,6 +457,7 @@ int rpmfcColoring(const char * fmstr)
     return fcolor;
 }
 
+/*@-bounds@*/
 void rpmfcPrint(const char * msg, rpmfc fc, FILE * fp)
 {
     int fcolor;
@@ -533,6 +544,7 @@ rpmfc rpmfcFree(rpmfc fc)
     fc = _free(fc);
     return NULL;
 }
+/*@=bounds@*/
 
 rpmfc rpmfcNew(void)
 {
@@ -540,6 +552,11 @@ rpmfc rpmfcNew(void)
     return fc;
 }
 
+/**
+ * Extract script dependencies.
+ * @param fc		file classifier
+ * @return		0 on success
+ */
 static int rpmfcSCRIPT(rpmfc fc)
 	/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
 	/*@modifies fc, rpmGlobalMacroContext, fileSystem, internalState @*/
@@ -626,6 +643,11 @@ static int rpmfcSCRIPT(rpmfc fc)
     return 0;
 }
 
+/**
+ * Extract Elf dependencies.
+ * @param fc		file classifier
+ * @return		0 on success
+ */
 static int rpmfcELF(rpmfc fc)
 	/*@globals fileSystem, internalState @*/
 	/*@modifies fc, fileSystem, internalState @*/
@@ -853,6 +875,8 @@ typedef struct rpmfcApplyTbl_s {
     int colormask;
 } * rpmfcApplyTbl;
 
+/**
+ */
 /*@unchecked@*/
 static struct rpmfcApplyTbl_s rpmfcApplyTable[] = {
     { rpmfcELF,		RPMFC_ELF },
@@ -990,9 +1014,338 @@ assert(se != NULL);
     }
 
     fcav = argvFree(fcav);
+
     /* XXX TODO dump fmagic baggage. */
 
     return 0;
 }
 
-/*@=bounds@*/
+/**
+ */
+typedef struct DepMsg_s * DepMsg_t;
+
+/**
+ */
+struct DepMsg_s {
+/*@observer@*/ /*@null@*/
+    const char * msg;
+/*@observer@*/
+    const char * argv[4];
+    rpmTag ntag;
+    rpmTag vtag;
+    rpmTag ftag;
+    int mask;
+    int xor;
+};
+
+/**
+ */
+/*@unchecked@*/
+static struct DepMsg_s depMsgs[] = {
+  { "Provides",		{ "%{?__find_provides}", NULL, NULL, NULL },
+	RPMTAG_PROVIDENAME, RPMTAG_PROVIDEVERSION, RPMTAG_PROVIDEFLAGS,
+	0, -1 },
+#ifdef	DYING
+  { "PreReq",		{ NULL, NULL, NULL, NULL },
+	RPMTAG_REQUIRENAME, RPMTAG_REQUIREVERSION, RPMTAG_REQUIREFLAGS,
+	RPMSENSE_PREREQ, 0 },
+  { "Requires(interp)",	{ NULL, "interp", NULL, NULL },
+	-1, -1, RPMTAG_REQUIREFLAGS,
+	_notpre(RPMSENSE_INTERP), 0 },
+#else
+  { "Requires(interp)",	{ NULL, "interp", NULL, NULL },
+	RPMTAG_REQUIRENAME, RPMTAG_REQUIREVERSION, RPMTAG_REQUIREFLAGS,
+	_notpre(RPMSENSE_INTERP), 0 },
+#endif
+  { "Requires(rpmlib)",	{ NULL, "rpmlib", NULL, NULL },
+	-1, -1, RPMTAG_REQUIREFLAGS,
+	_notpre(RPMSENSE_RPMLIB), 0 },
+  { "Requires(verify)",	{ NULL, "verify", NULL, NULL },
+	-1, -1, RPMTAG_REQUIREFLAGS,
+	RPMSENSE_SCRIPT_VERIFY, 0 },
+  { "Requires(pre)",	{ NULL, "pre", NULL, NULL },
+	-1, -1, RPMTAG_REQUIREFLAGS,
+	_notpre(RPMSENSE_SCRIPT_PRE), 0 },
+  { "Requires(post)",	{ NULL, "post", NULL, NULL },
+	-1, -1, RPMTAG_REQUIREFLAGS,
+	_notpre(RPMSENSE_SCRIPT_POST), 0 },
+  { "Requires(preun)",	{ NULL, "preun", NULL, NULL },
+	-1, -1, RPMTAG_REQUIREFLAGS,
+	_notpre(RPMSENSE_SCRIPT_PREUN), 0 },
+  { "Requires(postun)",	{ NULL, "postun", NULL, NULL },
+	-1, -1, RPMTAG_REQUIREFLAGS,
+	_notpre(RPMSENSE_SCRIPT_POSTUN), 0 },
+  { "Requires",		{ "%{?__find_requires}", NULL, NULL, NULL },
+	-1, -1, RPMTAG_REQUIREFLAGS,	/* XXX inherit name/version arrays */
+	RPMSENSE_PREREQ, RPMSENSE_PREREQ },
+  { "Conflicts",	{ "%{?__find_conflicts}", NULL, NULL, NULL },
+	RPMTAG_CONFLICTNAME, RPMTAG_CONFLICTVERSION, RPMTAG_CONFLICTFLAGS,
+	0, -1 },
+  { "Obsoletes",	{ "%{?__find_obsoletes}", NULL, NULL, NULL },
+	RPMTAG_OBSOLETENAME, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS,
+	0, -1 },
+  { NULL,		{ NULL, NULL, NULL, NULL },	0, 0, 0, 0, 0 }
+};
+
+/*@unchecked@*/
+static DepMsg_t DepMsgs = depMsgs;
+
+/**
+ */
+static void printDeps(Header h)
+	/*@modifies h @*/
+{
+    DepMsg_t dm;
+    rpmds ds = NULL;
+    int scareMem = 0;
+    const char * DNEVR;
+    int_32 Flags;
+    int bingo = 0;
+
+    for (dm = DepMsgs; dm->msg != NULL; dm++) {
+	if (dm->ntag != -1) {
+	    ds = rpmdsFree(ds);
+	    ds = rpmdsNew(h, dm->ntag, scareMem);
+	}
+	if (dm->ftag == 0)
+	    continue;
+
+	ds = rpmdsInit(ds);
+	if (ds == NULL)
+	    continue;	/* XXX can't happen */
+
+	bingo = 0;
+	while (rpmdsNext(ds) >= 0) {
+
+	    Flags = rpmdsFlags(ds);
+	
+	    if (!((Flags & dm->mask) ^ dm->xor))
+		/*@innercontinue@*/ continue;
+	    if (bingo == 0) {
+		rpmMessage(RPMMESS_NORMAL, "%s:", (dm->msg ? dm->msg : ""));
+		bingo = 1;
+	    }
+	    if ((DNEVR = rpmdsDNEVR(ds)) == NULL)
+		/*@innercontinue@*/ continue;	/* XXX can't happen */
+	    rpmMessage(RPMMESS_NORMAL, " %s", DNEVR+2);
+	}
+	if (bingo)
+	    rpmMessage(RPMMESS_NORMAL, "\n");
+    }
+    ds = rpmdsFree(ds);
+}
+
+/**
+ */
+static int rpmfcGenerateDependsHelper(const Spec spec, Package pkg, rpmfi fi)
+	/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+        /*@modifies fi, rpmGlobalMacroContext, fileSystem, internalState @*/
+{
+    StringBuf sb_stdin;
+    StringBuf sb_stdout;
+    DepMsg_t dm;
+    int failnonzero = 0;
+    int rc = 0;
+
+    /*
+     * Create file manifest buffer to deliver to dependency finder.
+     */
+    sb_stdin = newStringBuf();
+    fi = rpmfiInit(fi, 0);
+    if (fi != NULL)
+    while (rpmfiNext(fi) >= 0)
+	appendLineStringBuf(sb_stdin, rpmfiFN(fi));
+
+    for (dm = DepMsgs; dm->msg != NULL; dm++) {
+	int tag, tagflags;
+	char * s;
+	int xx;
+
+	tag = (dm->ftag > 0) ? dm->ftag : dm->ntag;
+	tagflags = 0;
+	s = NULL;
+
+	switch(tag) {
+	case RPMTAG_PROVIDEFLAGS:
+	    if (!pkg->autoProv)
+		continue;
+	    failnonzero = 1;
+	    tagflags = RPMSENSE_FIND_PROVIDES;
+	    /*@switchbreak@*/ break;
+	case RPMTAG_REQUIREFLAGS:
+	    if (!pkg->autoReq)
+		continue;
+	    failnonzero = 0;
+	    tagflags = RPMSENSE_FIND_REQUIRES;
+	    /*@switchbreak@*/ break;
+	default:
+	    continue;
+	    /*@notreached@*/ /*@switchbreak@*/ break;
+	}
+
+	xx = rpmfcExec(dm->argv, sb_stdin, &sb_stdout, failnonzero);
+	if (xx == -1)
+	    continue;
+
+	s = rpmExpand(dm->argv[0], NULL);
+	rpmMessage(RPMMESS_NORMAL, _("Finding  %s: %s\n"), dm->msg,
+		(s ? s : ""));
+	s = _free(s);
+
+	if (sb_stdout == NULL) {
+	    rc = RPMERR_EXEC;
+	    rpmError(rc, _("Failed to find %s:\n"), dm->msg);
+	    break;
+	}
+
+	/* Parse dependencies into header */
+	tagflags &= ~RPMSENSE_MULTILIB;
+
+	rc = parseRCPOT(spec, pkg, getStringBuf(sb_stdout), tag, 0, tagflags);
+	sb_stdout = freeStringBuf(sb_stdout);
+
+	if (rc) {
+	    rpmError(rc, _("Failed to find %s:\n"), dm->msg);
+	    break;
+	}
+    }
+
+    sb_stdin = freeStringBuf(sb_stdin);
+
+    return rc;
+}
+
+int rpmfcGenerateDepends(const Spec spec, Package pkg)
+{
+    rpmfi fi = pkg->cpioList;
+    rpmfc fc = NULL;
+    rpmds ds;
+    const char * DNEVR;
+    int scareMem = 0;
+    ARGV_t av;
+    int ac = rpmfiFC(fi);
+    const void ** p;
+    int c;
+    int rc = 0;
+    int xx;
+
+    /* Skip packages with no files. */
+    if (ac <= 0)
+	return 0;
+
+    /* Skip packages that have dependency generation disabled. */
+    if (! (pkg->autoReq || pkg->autoProv))
+	return 0;
+
+    /* If new-fangled dependency generation is disabled ... */
+    if (!rpmExpandNumeric("%{?_classify_file_types}")) {
+	/* ... then generate dependencies using %{__find_requires} et al. */
+	rc = rpmfcGenerateDependsHelper(spec, pkg, fi);
+/*@-noeffect@*/
+	printDeps(pkg->header);
+/*@=noeffect@*/
+	return rc;
+    }
+
+    /* Extract absolute file paths in argv format. */
+    av = xcalloc(ac+1, sizeof(*av));
+
+    fi = rpmfiInit(fi, 0);
+    if (fi != NULL)
+    while ((c = rpmfiNext(fi)) >= 0)
+	av[c] = xstrdup(rpmfiFN(fi));
+    av[ac] = NULL;
+
+    /* Build file class dictionary. */
+    fc = rpmfcNew();
+    xx = rpmfcClassify(fc, av);
+
+    /* Copy (and delete) manually generated dependencies to dictionary. */
+    ds = rpmdsNew(pkg->header, RPMTAG_PROVIDENAME, scareMem);
+    ds = rpmdsInit(ds);
+    if (ds != NULL)
+    while (rpmdsNext(ds) >= 0) {
+	DNEVR = rpmdsDNEVR(ds);
+	if (DNEVR == NULL)
+	    continue;
+	xx = rpmfcSaveArg(&fc->provides, DNEVR+2);
+    }
+    ds = rpmdsFree(ds);
+
+    ds = rpmdsNew(pkg->header, RPMTAG_REQUIRENAME, scareMem);
+    ds = rpmdsInit(ds);
+    if (ds != NULL)
+    while (rpmdsNext(ds) >= 0) {
+	DNEVR = rpmdsDNEVR(ds);
+	if (DNEVR == NULL)
+	    continue;
+	xx = rpmfcSaveArg(&fc->requires, DNEVR+2);
+    }
+    ds = rpmdsFree(ds);
+
+    /* Build file/package dependency dictionary. */
+    xx = rpmfcApply(fc);
+
+    /* Add per-file colors(#files) */
+    p = (const void **) argiData(fc->fcolor);
+    c = argiCount(fc->fcolor);
+assert(ac == c);
+    if (p != NULL)
+	xx = headerAddEntry(pkg->header, RPMTAG_FILECOLOR, RPM_INT32_TYPE,
+			p, c);
+
+    /* Add classes(#classes) */
+    p = (const void **) argvData(fc->cdict);
+    c = argvCount(fc->cdict);
+    if (p != NULL)
+	xx = headerAddEntry(pkg->header, RPMTAG_CLASSDICT, RPM_STRING_ARRAY_TYPE,
+			p, c);
+
+    /* Add per-file classes(#files) */
+    p = (const void **) argiData(fc->fcdictx);
+    c = argiCount(fc->fcdictx);
+assert(ac == c);
+    if (p != NULL)
+	xx = headerAddEntry(pkg->header, RPMTAG_FILECLASS, RPM_INT32_TYPE,
+			p, c);
+
+    /* Add dependency dictionary(#dependencies) */
+    p = (const void **) argvData(fc->ddict);
+    c = argvCount(fc->ddict);
+    if (p != NULL)
+	xx = headerAddEntry(pkg->header, RPMTAG_DEPENDSDICT, RPM_STRING_ARRAY_TYPE,
+			p, c);
+
+    /* Add per-file dependency (start,number) pairs (#files) */
+    p = (const void **) argiData(fc->fddictx);
+    c = argiCount(fc->fddictx);
+assert(ac == c);
+    if (p != NULL)
+	xx = headerAddEntry(pkg->header, RPMTAG_FILEDEPENDSX, RPM_INT32_TYPE,
+			p, c);
+
+    p = (const void **) argiData(fc->fddictn);
+    c = argiCount(fc->fddictn);
+assert(ac == c);
+    if (p != NULL)
+	xx = headerAddEntry(pkg->header, RPMTAG_FILEDEPENDSN, RPM_INT32_TYPE,
+			p, c);
+
+/*@-noeffect@*/
+    printDeps(pkg->header);
+/*@=noeffect@*/
+
+#ifdef	NOTYET
+if (fc != NULL) {
+char buf[BUFSIZ];
+sprintf(buf, "final: files %d cdict[%d] %d%% ddictx[%d]", fc->nfiles, argvCount(fc->cdict), ((100 * fc->fknown)/fc->nfiles), argiCount(fc->ddictx));
+rpmfcPrint(buf, fc, NULL);
+}
+#endif
+
+    /* Clean up. */
+    fc = rpmfcFree(fc);
+    av = argvFree(av);
+
+    return rc;
+}
diff --git a/build/rpmfc.h b/build/rpmfc.h
index 9bdc6285e..144d19a1e 100644
--- a/build/rpmfc.h
+++ b/build/rpmfc.h
@@ -8,8 +8,12 @@
 extern int _rpmfc_debug;
 /*@=exportlocal@*/
 
+/**
+ */
 typedef struct rpmfc_s * rpmfc;
 
+/**
+ */
 struct rpmfc_s {
     int nfiles;		/*!< no. of files */
     int fknown;		/*!< no. of classified files */
@@ -34,6 +38,8 @@ struct rpmfc_s {
 
 };
 
+/**
+ */
 enum FCOLOR_e {
     RPMFC_BLACK			= 0,
     RPMFC_ELF32			= (1 <<  0),
@@ -70,6 +76,8 @@ enum FCOLOR_e {
 };
 typedef	enum FCOLOR_e FCOLOR_t;
 
+/**
+ */
 struct rpmfcTokens_s {
 /*@observer@*/
     const char * token;
@@ -98,34 +106,55 @@ int rpmfcColoring(const char * fmstr)
 /*@=exportlocal@*/
 
 /**
+ * @param fc		file classifier
  */
 void rpmfcPrint(const char * msg, rpmfc fc, FILE * fp)
 	/*@globals fileSystem @*/
 	/*@modifies *fp, fileSystem @*/;
 /**
+ * Destroy a file classifier.
+ * @param fc		file classifier
+ * @return		NULL always
  */
 /*@null@*/
 rpmfc rpmfcFree(/*@only@*/ /*@null@*/ rpmfc fc)
 	/*@modifies fc @*/;
 
 /**
+ * Create a file classifier.
+ * @return		new file classifier
  */
 rpmfc rpmfcNew(void)
 	/*@*/;
 
 /**
  * Build file class dictionary and mappings.
+ * @param fc		file classifier
+ * @return		0 on success
  */
 int rpmfcClassify(rpmfc fc, ARGV_t argv)
 	/*@globals global_fmagic, fileSystem, internalState @*/
 	/*@modifies fc, global_fmagic, fileSystem, internalState @*/;
 
 /**
- * BUild file/package dependency dictionary and mappings.
+ * Build file/package dependency dictionary and mappings.
+ * @param fc		file classifier
+ * @return		0 on success
  */
 int rpmfcApply(rpmfc fc)
 	/*@modifies fc @*/;
 
+/**
+ * Generate package dependencies.
+ * @param spec		spec file control
+ * @param pkg		package control
+ * @return		0 on success
+ */
+int rpmfcGenerateDepends(const Spec spec, Package pkg)
+	/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+	/*@modifies pkg->cpioList, pkg->header,
+		rpmGlobalMacroContext, fileSystem, internalState @*/;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/build/rpmspec.h b/build/rpmspec.h
index 9145a64ba..89bdf2e17 100644
--- a/build/rpmspec.h
+++ b/build/rpmspec.h
@@ -220,7 +220,7 @@ spectag stashSt(Spec spec, Header h, int tag, const char * lang)
 
 /** \ingroup rpmbuild
  * @param spec		spec file control structure
- * @param pkg
+ * @param pkg		package control
  * @param field
  * @param tag
  */
diff --git a/file/file.h b/file/file.h
index c06da7d3a..8051ba34b 100644
--- a/file/file.h
+++ b/file/file.h
@@ -154,7 +154,7 @@ struct fmagic_s {
 
 typedef /*@abstract@*/ struct fmagic_s * fmagic;
 
-/*unchecked@*/
+/*@unchecked@*/
 extern fmagic global_fmagic;
 
 /*@unchecked@*//*@observer@*/
diff --git a/lib/rpmal.c b/lib/rpmal.c
index 68bbc02c5..30dbb7201 100644
--- a/lib/rpmal.c
+++ b/lib/rpmal.c
@@ -598,6 +598,7 @@ void rpmalMakeIndex(rpmal al)
 	if (alp->provides != NULL)
 	    ai->size += rpmdsCount(alp->provides);
     }
+    if (ai->size == 0) return;
 
     ai->index = xrealloc(ai->index, ai->size * sizeof(*ai->index));
     ai->k = 0;
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 021461821..02d91a088 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -395,6 +395,10 @@ typedef enum rpmTag_e {
     RPMTAG_CACHEPKGMTIME	= 1139,
     RPMTAG_FILECOLOR		= 1140,
     RPMTAG_FILECLASS		= 1141,
+    RPMTAG_CLASSDICT		= 1142,
+    RPMTAG_FILEDEPENDSX		= 1143,
+    RPMTAG_FILEDEPENDSN		= 1144,
+    RPMTAG_DEPENDSDICT		= 1145,
 /*@-enummemuse@*/
     RPMTAG_FIRSTFREE_TAG	/*!< internal */
 /*@=enummemuse@*/
diff --git a/po/cs.po b/po/cs.po
index a1f52493f..9d3ddbbd2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -505,84 +505,74 @@ msgstr "Soubor mus� za��nat na \"/\": %s\n"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Nelze m�chat speci�ln� %%doc s ostatn�m� formami: %s\n"
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Soubor uveden dvakr�t: %s\n"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Symbolick� linka ukazuje na BuildRoot: %s -> %s\n"
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Soubor nesouhlas� s prefixem (%s): %s\n"
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Soubor nenalezen: %s\n"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Soubor pot�ebuje �vodn� \"/\": %s\n"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Glob nen� dovolen: %s\n"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Soubor nenalezen globem: %s\n"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Nemohu otev��t %%files soubor %s: %s\n"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "��dek: %s\n"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "�patn� soubor: %s: %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "�patn� vlastn�k/skupina: %s\n"
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "Hled�m   %s: (pou�it %s)...\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, c-format
-msgid "Failed to find %s:\n"
-msgstr "Selhalo vyhled�n� %s:\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "rozbalov�n� arch�vu selhalo %s%s: %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Zpracov�v�m soubory: %s-%s-%s\n"
@@ -2377,12 +2367,12 @@ msgstr "z�znam %u nelze p�e��st\n"
 msgid "package %s is not installed\n"
 msgstr "bal��ek %s nen� nainstalov�n\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "�patn� soubor: %s: %s\n"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s ANO (p�id�no poskytuje)\n"
@@ -3819,6 +3809,13 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "Hled�m   %s: (pou�it %s)...\n"
+
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "Selhalo vyhled�n� %s:\n"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "pou��t lze jen jeden z parametr� --prefix nebo --relocate"
 
diff --git a/po/da.po b/po/da.po
index 2d419c91d..0d4064075 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -500,84 +500,74 @@ msgstr "Fil skal begynde med \"/\": %s\n"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Kan ikke blande special-%%doc med andre former: %s\n"
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Fil angivet to gange: %s\n"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Symbolsk l�nke peger p� BuildRoot: %s -> %s\n"
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Fil passer ikke til pr�fiks (%s): %s\n"
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Fil ikke fundet: %s\n"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Fil kr�ver foranstillet \"/\": %s\n"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "linie %d: Filnavn ikke tilladt: %s\n"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Fil ikke fundet med glob: %s\n"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunne ikke �bne '%%files'-fil %s: %s\n"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "linie: %s\n"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ugyldig fil: %s: %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Ugyldig ejer/gruppe: %s\n"
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "Finder %s: (benytter %s)...\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, c-format
-msgid "Failed to find %s:\n"
-msgstr "Kunne ikke finde %s:\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Genneml�ber filer: %s-%s-%s\n"
@@ -2390,12 +2380,12 @@ msgstr "post %d kunne ikke l�ses\n"
 msgid "package %s is not installed\n"
 msgstr "pakken %s er ikke installeret\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "ugyldig db-fil %s\n"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s JA (tilf�jede 'provide')\n"
@@ -3830,6 +3820,13 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "Finder %s: (benytter %s)...\n"
+
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "Kunne ikke finde %s:\n"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "kun �n af --prefix eller --relocate kan bruges"
 
diff --git a/po/de.po b/po/de.po
index 8b260ab47..7cc5ee68b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -573,82 +573,70 @@ msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1147
+#: build/files.c:1148
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1535
+#: build/files.c:1523
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Verschiebungen m�ssen mit einem �/� beginnen"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Paket %s wird nicht in %s aufgef�hrt"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Fehler: kann Datei %s nicht �ffnen\n"
 
 # , c-format
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: build/files.c:2258
+#: build/files.c:2246
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-# , c-format
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "�ffnen von %s fehlgeschlagen: %s"
-
-# , c-format
-#: build/files.c:2416 build/files.c:2427
-#, fuzzy, c-format
-msgid "Failed to find %s:\n"
-msgstr "anlegen von %s fehlgeschlagen\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -656,7 +644,7 @@ msgid ""
 msgstr ""
 
 # , c-format
-#: build/files.c:2605
+#: build/files.c:2351
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "�ffnen von %s fehlgeschlagen: %s"
@@ -2558,12 +2546,12 @@ msgid "package %s is not installed\n"
 msgstr "Paket %s ist nicht installiert\n"
 
 # , c-format
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "�ffnen von %s fehlgeschlagen: %s"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr ""
 
@@ -4025,6 +4013,16 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+# , c-format
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "�ffnen von %s fehlgeschlagen: %s"
+
+# , c-format
+#, fuzzy
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "anlegen von %s fehlgeschlagen\n"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr ""
 #~ "nur eines der Argumente --prefix oder --relocate darf angegeben werden"
diff --git a/po/fi.po b/po/fi.po
index 7621acede..bc89a519d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
@@ -515,84 +515,74 @@ msgstr "siirtojen pit�� alkaa /-merkill�"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Tiedostoa ei l�ytynyt palvelimelta"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "siirtojen pit�� alkaa /-merkill�"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "paketti %s ei ole %s:ss�"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Tiedostoa ei l�ytynyt palvelimelta"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "en voinut avata %s: %s"
-
-#: build/files.c:2416 build/files.c:2427
-#, fuzzy, c-format
-msgid "Failed to find %s:\n"
-msgstr "%s:n luonti ep�onnistui\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "virhe etsitt�ess� pakettia %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "en voinut avata %s: %s"
@@ -2435,12 +2425,12 @@ msgstr "tietuetta %d ei voitu lukea\n"
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr ""
 
@@ -3879,6 +3869,14 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "en voinut avata %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "%s:n luonti ep�onnistui\n"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "vain toinen --prefix tai --relocate voidaan antaa"
 
diff --git a/po/fr.po b/po/fr.po
index faeb9a0b1..4de0c9c08 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -536,84 +536,74 @@ msgstr "les arguments de --root (-r) doivent commencer par un /"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "les arguments de --root (-r) doivent commencer par un /"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, fuzzy, c-format
-msgid "Failed to find %s:\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "La construction a chou.\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2474,12 +2464,12 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr ""
 
@@ -3905,6 +3895,14 @@ msgid "DIRECTORY"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "impossible d'ouvrir: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "impossible d'ouvrir: %s\n"
+
+#, fuzzy
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "un seul mode majeur peut tre spcifi"
 
diff --git a/po/gl.po b/po/gl.po
index 9056b998f..5c32b3e43 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -485,84 +485,74 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2410
-#, c-format
-msgid "Finding  %s: %s\n"
-msgstr ""
-
-#: build/files.c:2416 build/files.c:2427
-#, c-format
-msgid "Failed to find %s:\n"
-msgstr ""
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2301,11 +2291,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr ""
 
diff --git a/po/is.po b/po/is.po
index 261c3c2ef..612947475 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -488,84 +488,74 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Skr�in er tv�tekin: %s\n"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Skr�in fannst ekki: %s\n"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Gat ekki opna� PreUn skr�: %s\n"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Skr�in fannst ekki me� 'glob': %s\n"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Gat ekki opna� %%files skr�na %s: %s\n"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "l�na: %s\n"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "�gild skr� %s: %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "Skr� %s: %s\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, c-format
-msgid "Failed to find %s:\n"
-msgstr "gat ekki fundi� %s:\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2328,11 +2318,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr ""
 
@@ -3742,6 +3732,13 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "Skr� %s: %s\n"
+
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "gat ekki fundi� %s:\n"
+
 #~ msgid "Couldn't exec %s: %s\n"
 #~ msgstr "Gat ekki keyrt %s: %s\n"
 
diff --git a/po/ja.po b/po/ja.po
index 5d186d81e..c48ba714d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -530,84 +530,74 @@ msgstr "�ե������ \"/\" ����Ϥޤ�ʤ���Фʤ�ޤ���: %s"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "¾�Υե���������̤� %%doc �򺮤��뤳�ȤϤǤ��ޤ���: %s"
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "�ե����뤬2��ɽ������Ƥ��ޤ�: %s"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "�ե������ prefix (%s) �Ȱ��פ��ޤ���: %s"
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "�ե����뤬���Ĥ���ޤ���: %s"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "�ե��������Ƭ�� \"/\" ��ɬ�פǤ�: %s"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "%d ����: �С������ϵ��Ĥ���Ƥ��ޤ���: %s"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "�ե����뤬���Ĥ���ޤ���(by glob): %s"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%%files �򥪡��ץ�Ǥ��ޤ���: %s"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "����: %s"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "�ե����� %s: %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "�����ʽ�ͭ��/���롼��: %s\n"
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "%s ��õ���Ƥ��ޤ�: (%s ����Ѥ��Ƥ��ޤ�)...\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, fuzzy, c-format
-msgid "Failed to find %s:\n"
-msgstr "%s �򸫤Ĥ���Τ˼��Ԥ��ޤ���:"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "�ѥå����� %s ��õ����\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "�ե�����ν�����: %s-%s-%s\n"
@@ -2471,12 +2461,12 @@ msgstr "�쥳���� %d ���ɤळ�Ȥ��Ǥ��ޤ���Ǥ���\n"
 msgid "package %s is not installed\n"
 msgstr "�ѥå����� %s �ϥ��󥹥ȡ��뤵��Ƥ��ޤ���\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "�����ʥե�����ξ���: %s"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %s �� provide �˲ä��뤳�Ȥˤ�ä�������ޤ���\n"
@@ -3929,6 +3919,14 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "%s ��õ���Ƥ��ޤ�: (%s ����Ѥ��Ƥ��ޤ�)...\n"
+
+#, fuzzy
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "%s �򸫤Ĥ���Τ˼��Ԥ��ޤ���:"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "--prefix �⤷���� --relocate �Τ����줫�Τ߻��ѤǤ��ޤ�"
 
diff --git a/po/ko.po b/po/ko.po
index b0ca369b9..e0d9e3e15 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -499,84 +499,74 @@ msgstr "������ �ݵ�� \"/\" �� �����ؾ���: %s\n"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Ư�� %%doc�� �ٸ� ���İ� �Բ� ����� �� ����: %s\n"
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "���� ����� �ߺ���: %s\n"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "BuildRoot�� �ɺ�����ũ��: %s -> %s\n"
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "������ prefix (%s)�� ��ġ���� ����: %s\n"
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, c-format
 msgid "File not found: %s\n"
 msgstr "������ ã�� �� ����: %s\n"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "������ \"/\" �� �����ؾ���: %s\n"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Glob�� ����� �� ����: %s\n"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "glob���� ������ ã�� �� ����: %s\n"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%s ������ %%files�� �� �� ����: %s\n"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "��: %s\n"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "�߸��� ����: %s: %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "�߸��� ������/�׷�: %s\n"
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "%s(��)�� ã�� ��: (%s ���)...\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, c-format
-msgid "Failed to find %s:\n"
-msgstr "%s(��)�� ã�µ� ������:\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "��ī�̺긦 Ǫ�µ� ������%s%s: %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "���� ó�� ��: %s-%s-%s\n"
@@ -2366,12 +2356,12 @@ msgstr "���(record) ��ȣ %u(��)�� ���� �� �����ϴ�\n"
 msgid "package %s is not installed\n"
 msgstr "%s ��Ű���� ��ġ�Ǿ� ���� �ʽ��ϴ�\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "�߸��� db ���� %s\n"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s �� (������ �߰���)\n"
@@ -3808,6 +3798,13 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "%s(��)�� ã�� ��: (%s ���)...\n"
+
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "%s(��)�� ã�µ� ������:\n"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "--prefix �Ǵ� --relocate �ɼ� �� �ϳ��� ����� �� �ֽ��ϴ�"
 
diff --git a/po/no.po b/po/no.po
index 265f4067c..3ed59708a 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -499,84 +499,74 @@ msgstr "Filen m� begynne med \"/\": %s\n"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Kan ikke blande spesiell %%doc med andre skjema: %s\n"
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Fil listet to ganger: %s\n"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Symbolsk lenke peker til BuildRoot: %s -> %s\n"
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Fil ikke funnet: %s\n"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "linje %d: Filnavn ikke tillatt: %s\n"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunne ikke �pne spec fil %s: %s\n"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "Installerer %s\n"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ugyldig fil %s: %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Ugyldig eier/gruppe: %s\n"
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "Fil %s: %s\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, c-format
-msgid "Failed to find %s:\n"
-msgstr "Klarte ikke � finne %s:\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "ingen pakke utl�ser %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2355,11 +2345,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr "pakke %s er ikke installert\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr ""
 
@@ -3774,6 +3764,13 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "Fil %s: %s\n"
+
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "Klarte ikke � finne %s:\n"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "kune en av --prefix eller --relocate kan brukes"
 
diff --git a/po/pl.po b/po/pl.po
index 86c69efc2..0cb223dd3 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe� Dzieko�ski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -521,84 +521,74 @@ msgstr "Plik musi si� zaczyna� od \"/\": %s"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Nie mo�na miesza� specjalnej %%doc z innymi formami: %s"
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Plik podany dwukrotnie: %s"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Plik nie zgadza si� z prefiksem (%s): %s"
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Nie znaleziono pliku: %s"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Plik musi si� zaczyna� od \"/\": %s"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "linia %d: Wersja niedozwolona: %s"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Nie znaleziono pliku: %s"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Nie mo�na otworzy� %%files pliku: %s"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "linia: %s"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "plik %s: %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "B��dny u�ytkownik/grupa: %s\n"
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "Wyszukiwanie wymaganych zasob�w...\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, fuzzy, c-format
-msgid "Failed to find %s:\n"
-msgstr "Wyszukiwanie nie powiod�o si�"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "poszukiwanie pakietu %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Przetwarzanie plik�w: %s\n"
@@ -2435,12 +2425,12 @@ msgstr "nie mo�na odczyta� rekordu %d\n"
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "b��dny status pliku: %s"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr ""
 
@@ -3874,6 +3864,14 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "Wyszukiwanie wymaganych zasob�w...\n"
+
+#, fuzzy
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "Wyszukiwanie nie powiod�o si�"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "nie mo�na jednocze�nie u�y� --prefix i --relocate"
 
diff --git a/po/pt.po b/po/pt.po
index e2f4384a5..76a6581da 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: Jos� Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
@@ -507,84 +507,74 @@ msgstr "O ficheiro tem de come�ar por \"/\": %s\n"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "N�o � poss�vel misturar o %%doc especial com outras formas: %s\n"
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Ficheiro listado duas vezes: %s\n"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "A 'symlink' aponta para a BuildRoot: %s -> %s\n"
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "O ficheiro n�o corresponde ao prefixo (%s): %s\n"
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Ficheiro n�o encontrado: %s\n"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "O ficheiro precisa de come�ar por \"/\": %s\n"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Glob n�o permitido: %s\n"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Ficheiro n�o encontrado pelo glob: %s\n"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "N�o consegui abrir o ficheiro do %%files %s: %s\n"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "linha: %s\n"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Ficheiro inv�lido: %s: %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Dono/grupo inv�lido: %s\n"
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "A procurar o %s: (usando o %s)...\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, c-format
-msgid "Failed to find %s:\n"
-msgstr "N�o consegui encontrar o %s:\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "a abertura do pacote falhou%s%s: %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "A processar os ficheiros: %s-%s-%s\n"
@@ -2378,12 +2368,12 @@ msgstr "o registo %u n�o p�de ser lido\n"
 msgid "package %s is not installed\n"
 msgstr "o pacote %s n�o est� instalado\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "ficheiro db inv�lido %s\n"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s SIM (oferecidos para adi��o)\n"
@@ -3813,6 +3803,13 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "A procurar o %s: (usando o %s)...\n"
+
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "N�o consegui encontrar o %s:\n"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "s� uma das op��es --prefix ou --relocate pode ser usada"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 65ac478e4..6f4d704ff 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -554,91 +554,79 @@ msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1147
+#: build/files.c:1148
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1535
+#: build/files.c:1523
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "argumentos para o --dbpath devem comear com uma /"
 
 # , c-format
-#: build/files.c:1783
+#: build/files.c:1771
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "no foi passado pacote para desinstalao"
 
 # , c-format
-#: build/files.c:1860
+#: build/files.c:1848
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build/files.c:2258
+#: build/files.c:2246
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-# , c-format
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "No consegui ler o arquivo spec de %s\n"
-
-# , c-format
-#: build/files.c:2416 build/files.c:2427
-#, fuzzy, c-format
-msgid "Failed to find %s:\n"
-msgstr "No consegui abrir o pipe tar: %s\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "instale pacote"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2567,12 +2555,12 @@ msgid "package %s is not installed\n"
 msgstr "no foi passado pacote para instalao"
 
 # , c-format
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr ""
 
@@ -4098,6 +4086,16 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+# , c-format
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "No consegui ler o arquivo spec de %s\n"
+
+# , c-format
+#, fuzzy
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "No consegui abrir o pipe tar: %s\n"
+
 #, fuzzy
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr ""
diff --git a/po/ro.po b/po/ro.po
index fc53d0e5d..0caf0996c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -485,84 +485,74 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2410
-#, c-format
-msgid "Finding  %s: %s\n"
-msgstr ""
-
-#: build/files.c:2416 build/files.c:2427
-#, c-format
-msgid "Failed to find %s:\n"
-msgstr ""
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2301,11 +2291,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr ""
 
diff --git a/po/rpm.pot b/po/rpm.pot
index 340b0842c..d8f254112 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -491,84 +491,74 @@ msgstr ""
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr ""
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr ""
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, c-format
 msgid "File not found: %s\n"
 msgstr ""
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr ""
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr ""
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr ""
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr ""
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr ""
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2410
-#, c-format
-msgid "Finding  %s: %s\n"
-msgstr ""
-
-#: build/files.c:2416 build/files.c:2427
-#, c-format
-msgid "Failed to find %s:\n"
-msgstr ""
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr ""
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -2307,11 +2297,11 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 msgid "(added files)"
 msgstr ""
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index eb0f46eeb..eee13fbc3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 2002-08-27 13:36-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -506,77 +506,67 @@ msgstr "���� ������ ���������� � \"/\": %s\n"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "������ ��������� ����. %%doc � ������� �������: %s\n"
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "���� ������ ������: %s\n"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "������������� ������ ��������� �� BuildRoot: %s -> %s\n"
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "���� �� ������������ �������� (%s): %s\n"
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, c-format
 msgid "File not found: %s\n"
 msgstr "���� �� ������: %s\n"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "���� ������ ���������� � \"/\": %s\n"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Glob �� �����������: %s\n"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "���� �� ������: %s\n"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "���������� ������� ���� %%files %s: %s\n"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "������: %s\n"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "�������� ���� %s: %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "�������� ���� ��������/������: %s\n"
 
-#: build/files.c:2410
-#, c-format
-msgid "Finding  %s: %s\n"
-msgstr "���� �����  %s: %s\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, c-format
-msgid "Failed to find %s:\n"
-msgstr "���������� ����� %s:\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "�������� �� �������������(�) ����(�): %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -585,7 +575,7 @@ msgstr ""
 "���������(�) �������������(�) (�� �� �����������(�)) ����(�):\n"
 "%s"
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "�������������� �����: %s-%s-%s\n"
@@ -2348,11 +2338,11 @@ msgstr "���������� ��������� ������ %u\n"
 msgid "package %s is not installed\n"
 msgstr "����� %s �� ����������\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 msgid "(added files)"
 msgstr "(����� ���������)"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr "(added provide)"
 
@@ -3776,6 +3766,12 @@ msgstr "������������ ���� ������ � ��������"
 msgid "DIRECTORY"
 msgstr "�������"
 
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "���� �����  %s: %s\n"
+
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "���������� ����� %s:\n"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr ""
 #~ "����� ���� ����������� ������ ���� �� ��������� --prefix ��� --relocate"
diff --git a/po/sk.po b/po/sk.po
index 8efeeb4f9..d63a7ec71 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -518,84 +518,74 @@ msgstr "S�bory musia za��na� znakom \"/\": %s"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Nie je mo�n� mie�a� �peci�lne %%doc s in�mi formami: %s"
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "S�bor zadan� dvakr�t: %s."
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "S�bor nes�hlas� s prefixom (%s): %s."
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "S�bor nebol n�jden�: %s"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "S�bor potrebuje na za�iatku \"/\": %s"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "riadok %d: V %s s� vy�adovan� verzie: %s"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "S�bor nebol n�jden�: %s"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "chybe: nie je mo�n� otvori� %%files s�bor: %s"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "riadok: %s"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "s�bor %s: %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Chybn� vlastn�k/skupina: %s\n"
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "Zis�uj� sa po�adovan� vlastnosti...\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, fuzzy, c-format
-msgid "Failed to find %s:\n"
-msgstr "Nepodarilo sa zisti� poskytovan� vlastnosti"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "vyh�ad�va sa bal�k %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Spracov�vaj� sa s�bory: %s\n"
@@ -2433,12 +2423,12 @@ msgstr "z�znam %d nie je mo�n� pre��ta�\n"
 msgid "package %s is not installed\n"
 msgstr "bal�k %s nie je nain�talovan�\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "chybn� stav s�boru: %s"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr ""
 
@@ -3870,6 +3860,14 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "Zis�uj� sa po�adovan� vlastnosti...\n"
+
+#, fuzzy
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "Nepodarilo sa zisti� poskytovan� vlastnosti"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "mo�e by� pou�it� iba jedna z volieb --prefix a --relocate"
 
diff --git a/po/sl.po b/po/sl.po
index bdbfae8e0..4552b6476 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.329 2002/12/02 15:05:14 jbj Exp $
+# $Id: sl.po,v 1.330 2002/12/03 02:57:31 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -517,84 +517,74 @@ msgstr "Ime datoteke se mora za�eti z \"/\": %s"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Posebnih %%doc ni mo�no me�ati z ostalimi oblikami: %s"
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Datoteka je navedena dvakrat: %s"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, fuzzy, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Simbolna povezava ka�e na BuildRoot: %s -> %s"
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Datoteka se ne ujema s predpono (%s): %s"
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Datoteke ni mogo�e najti: %s"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Datoteki manjka uvodni \"/\": %s"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "vrstica %d: Razli�ica ni dovoljena: %s"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datoteke ni mo�no najti z raz�iritvijo metaznakov v imenu: %s"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Datoteke %s iz %%files ni mo�no odpreti: %s"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "vrstica: %s"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Po�kodovana datoteka: %s: %s"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Neobstoje� lastnik/skupina: %s\n"
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "Iskanje  %s: (z uporabo %s)...\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, fuzzy, c-format
-msgid "Failed to find %s:\n"
-msgstr "Neuspe�no iskanje %s:"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "i��emo paket %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Obdeloavnje datotek: %s-%s-%s\n"
@@ -2433,12 +2423,12 @@ msgstr "zapisa %d ni mo�no prebrati\n"
 msgid "package %s is not installed\n"
 msgstr "paket %s ni name��en\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "po�kodovana zbirka podatkov %s"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s DA (dodane ponudbe)\n"
@@ -3877,6 +3867,14 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "Iskanje  %s: (z uporabo %s)...\n"
+
+#, fuzzy
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "Neuspe�no iskanje %s:"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "izbiri --prefix in --relocate se medsebojno izklju�ujeta"
 
diff --git a/po/sr.po b/po/sr.po
index 0a1ce255b..1ed5ce97c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -508,84 +508,74 @@ msgstr "preme�tanja moraju po�eti znakom '/'"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr ""
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, fuzzy, c-format
 msgid "File listed twice: %s\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr ""
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, fuzzy, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Neuspelo �itanje %s: %s."
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, fuzzy, c-format
 msgid "File not found: %s\n"
 msgstr "Datoteka nije prona�ena na serveru"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, fuzzy, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "preme�tanja moraju po�eti znakom '/'"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, fuzzy, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Datoteka nije prona�ena na serveru"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, fuzzy, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "gre�ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, fuzzy, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "neuspelo otvaranje %s: %s"
-
-#: build/files.c:2416 build/files.c:2427
-#, fuzzy, c-format
-msgid "Failed to find %s:\n"
-msgstr "neuspelo kreiranje %s\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "gre�ka potrage za paketom %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -2426,12 +2416,12 @@ msgstr "ne mogu da pro�itam slog %d\n"
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr ""
 
@@ -3870,6 +3860,14 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "neuspelo otvaranje %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "neuspelo kreiranje %s\n"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "samo jedno mo�ete koristiti: --prefix ili --relocate"
 
diff --git a/po/sv.po b/po/sv.po
index ab9dadb9d..6973280a2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.1\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 2002-08-19 22:26+0200\n"
 "Last-Translator: G�ran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -498,77 +498,67 @@ msgstr "Filnamn m�ste b�rja med \"/\": %s\n"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "Kan inte blanda special %%doc med andra former: %s\n"
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Filen uppr�knad tv� g�nger: %s\n"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Symbolisk l�nk pekar p� BuildRoot: %s -> %s\n"
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Filen matchar inte prefixet (%s): %s\n"
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Filen hittades inte: %s\n"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Filen beh�ver inledande \"/\": %s\n"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "Matchning inte till�tet: %s\n"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Hittade ingen fil vid matchningen: %s\n"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunde inte �ppna %%files-fil %s: %s\n"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "rad: %s\n"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Felaktig fil: %s: %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Felaktig �gare/grupp: %s\n"
 
-#: build/files.c:2410
-#, c-format
-msgid "Finding  %s: %s\n"
-msgstr "Letar upp %s: %s\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, c-format
-msgid "Failed to find %s:\n"
-msgstr "Misslyckades med att hitta %s:\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "Letar efter opackade fil(er): %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
@@ -577,7 +567,7 @@ msgstr ""
 "Installerade (men opaketerade) filer funna:\n"
 "%s"
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Bearbetar filer: %s-%s-%s\n"
@@ -2332,11 +2322,11 @@ msgstr "post %u kunde inte l�sas\n"
 msgid "package %s is not installed\n"
 msgstr "paket %s �r inte installerat\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 msgid "(added files)"
 msgstr "(lade till filer)"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 msgid "(added provide)"
 msgstr "(lade till tillhandah�llande)"
 
@@ -3751,6 +3741,12 @@ msgstr "anv�nd databas i KATALOG"
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "Letar upp %s: %s\n"
+
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "Misslyckades med att hitta %s:\n"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "enbart en av --prefix eller --relocate kan anv�ndas"
 
diff --git a/po/tr.po b/po/tr.po
index 3e44342cf..d60ee5f0c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-02 09:54-0500\n"
+"POT-Creation-Date: 2002-12-02 21:54-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -510,84 +510,74 @@ msgstr "Dosya \"/\" ile ba�lamal�: %s\n"
 msgid "Can't mix special %%doc with other forms: %s\n"
 msgstr "�zel %%doc ile di�er formlar kar��t�r�lamaz: %s\n"
 
-#: build/files.c:1147
+#: build/files.c:1148
 #, c-format
 msgid "File listed twice: %s\n"
 msgstr "Dosya iki kere g�sterildi: %s\n"
 
-#: build/files.c:1286
+#: build/files.c:1287
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s\n"
 msgstr "Sembolik ba� BuildRoot g�steriyor: %s -> %s\n"
 
-#: build/files.c:1535
+#: build/files.c:1523
 #, c-format
 msgid "File doesn't match prefix (%s): %s\n"
 msgstr "Dosya �nek (%s) ile uyumsuz: %s\n"
 
-#: build/files.c:1559
+#: build/files.c:1547
 #, c-format
 msgid "File not found: %s\n"
 msgstr "Dosya bulunamad�: %s\n"
 
-#: build/files.c:1759
+#: build/files.c:1747
 #, c-format
 msgid "File needs leading \"/\": %s\n"
 msgstr "Dosya \"/\" ile i�ermeli: %s\n"
 
-#: build/files.c:1783
+#: build/files.c:1771
 #, fuzzy, c-format
 msgid "Glob not permitted: %s\n"
 msgstr "sat�r %d: Dosya ad� uygun de�il: %s\n"
 
-#: build/files.c:1800 lib/rpminstall.c:343
+#: build/files.c:1788 lib/rpminstall.c:343
 #, c-format
 msgid "File not found by glob: %s\n"
 msgstr "Dosya glob taraf�ndan bulunamad�: %s\n"
 
-#: build/files.c:1860
+#: build/files.c:1848
 #, c-format
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%%files dosya %s dosyas�nda a��lamad�: %s\n"
 
-#: build/files.c:1871 build/pack.c:156
+#: build/files.c:1859 build/pack.c:156
 #, c-format
 msgid "line: %s\n"
 msgstr "sat�r: %s\n"
 
-#: build/files.c:2258
+#: build/files.c:2246
 #, c-format
 msgid "Bad file: %s: %s\n"
 msgstr "Dosya hatal�: %s: %s\n"
 
-#: build/files.c:2270 build/parsePrep.c:50
+#: build/files.c:2258 build/parsePrep.c:50
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr "Kullan�c�/grup hatal�: %s\n"
 
-#: build/files.c:2410
-#, fuzzy, c-format
-msgid "Finding  %s: %s\n"
-msgstr "%s aran�yor: (%s kullanarak)...\n"
-
-#: build/files.c:2416 build/files.c:2427
-#, c-format
-msgid "Failed to find %s:\n"
-msgstr "%s bulunamad�:\n"
-
-#: build/files.c:2556
+#: build/files.c:2302
 #, fuzzy, c-format
 msgid "Checking for unpackaged file(s): %s\n"
 msgstr "ar�iv paketi a��l�rken ba�ar�s�z%s%s: %s\n"
 
-#: build/files.c:2577
+#: build/files.c:2323
 #, c-format
 msgid ""
 "Installed (but unpackaged) file(s) found:\n"
 "%s"
 msgstr ""
 
-#: build/files.c:2605
+#: build/files.c:2351
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "��lenen dosyalar: %s-%s-%s\n"
@@ -2395,12 +2385,12 @@ msgstr "%u. kay�t okunamad�\n"
 msgid "package %s is not installed\n"
 msgstr "%s paketi kurulu de�il\n"
 
-#: lib/rpmal.c:693
+#: lib/rpmal.c:694
 #, fuzzy
 msgid "(added files)"
 msgstr "db dosyas� %s hatal�\n"
 
-#: lib/rpmal.c:770
+#: lib/rpmal.c:771
 #, fuzzy
 msgid "(added provide)"
 msgstr "%s: %-45s EVET (�nlem eklendi)\n"
@@ -3824,6 +3814,13 @@ msgstr ""
 msgid "DIRECTORY"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Finding  %s: %s\n"
+#~ msgstr "%s aran�yor: (%s kullanarak)...\n"
+
+#~ msgid "Failed to find %s:\n"
+#~ msgstr "%s bulunamad�:\n"
+
 #~ msgid "only one of --prefix or --relocate may be used"
 #~ msgstr "--prefix ve --relocate se�eneklerinden sadece biri kullan�labilir"
 
diff --git a/rpm.spec.in b/rpm.spec.in
index 4883d0cf5..ea0bc8cc3 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -16,7 +16,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.17
+Release: 0.18
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -459,6 +459,9 @@ exit 0
 %{__prefix}/include/popt.h
 
 %changelog
+* Tue Dec  2 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.18
+- internal automagic dependency generation (disabled for now).
+
 * Mon Dec  1 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.17
 - late rpmts reference causes premature free (#78862).