diff --git a/CHANGES b/CHANGES
index ce607acb5..fddee5f09 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
 3.0.2 -> 3.0.3
 	- add --eval to find result of macro expansion.
+	- add configure scaffolding to support rpm-4.0 packages.
 
 3.0.1 -> 3.0.2
 	- eliminate armv4 entries from rpmrc (Andrew E. Mileski).
diff --git a/acconfig.h b/acconfig.h
index dfde0c6ea..1c4ed7a0d 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -129,6 +129,12 @@
 /* define if the statfs() call takes 4 arguments */
 #undef STAT_STATFS4
 
+/* define if support rpm-1.0 packages is desired */
+#undef ENABLE_V1_PACKAGES
+
+/* define if experimental support rpm-4.0 packages is desired */
+#undef ENABLE_V4_PACKAGES
+
 ^L
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:
diff --git a/configure.in b/configure.in
index 8b1e6e45b..45574daea 100644
--- a/configure.in
+++ b/configure.in
@@ -235,6 +235,28 @@ else
 	AC_MSG_RESULT(no)
 fi
 
+dnl
+dnl Check for features
+dnl
+
+### use option --disable-v1-packages to turn off support for rpm-1.x packages
+AC_MSG_CHECKING(if you want support for rpm-1.0 packages)
+AC_ARG_ENABLE(v1-packages,,
+        [  --disable-v1-packages     disable support for rpm-1.x packages],
+        [with_v1_packages=$enableval],
+        [with_v1_packages=yes])
+AC_MSG_RESULT($with_v1_packages)
+test "$with_v1_packages" = yes && AC_DEFINE(ENABLE_V1_PACKAGES)
+
+### use option --enable-v4-packages to turn on support for rpm-4.x packages
+AC_MSG_CHECKING(if you want experimental rpm-4.0 packages)
+AC_ARG_ENABLE(v4-packages,
+        [  --enable-v4-packages      compile with support for rpm-4.x packages],
+        [with_v4_packages=$enableval],
+        [with_v4_packages=no])
+AC_MSG_RESULT($with_v4_packages)
+test "$with_v4_packages" = yes && AC_DEFINE(ENABLE_V4_PACKAGES)
+
 dnl Checks for libraries.
 
 AC_CHECK_FUNC(strcasecmp, [], [
diff --git a/lib/install.c b/lib/install.c
index a6a675e66..a8e5fa055 100644
--- a/lib/install.c
+++ b/lib/install.c
@@ -94,10 +94,12 @@ int rpmInstallSourcePackage(const char * rootdir, FD_t fd,
 	return 2;
     }
 
+#if defined(ENABLE_V1_PACKAGES)
     if (major == 1) {
 	notify = NULL;
 	h = NULL;
     }
+#endif	/* ENABLE_V1_PACKAGES */
 
     if (cookie) {
 	*cookie = NULL;
diff --git a/lib/package.c b/lib/package.c
index 2559c38d5..811bec927 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -9,134 +9,9 @@
 #include "rpmlead.h"
 #include "signature.h"
 
+#if defined(ENABLE_V1_PACKAGES)
 /* 0 = success */
 /* !0 = error */
-static int readOldHeader(FD_t fd, Header * hdr, int * isSource);
-
-/* 0 = success */
-/* 1 = bad magic */
-/* 2 = error */
-static int readPackageHeaders(FD_t fd, struct rpmlead * leadPtr, 
-			      Header * sigs, Header * hdrPtr) {
-    Header hdrBlock;
-    struct rpmlead leadBlock;
-    Header * hdr;
-    struct rpmlead * lead;
-    struct oldrpmlead * oldLead;
-    int_8 arch;
-    int isSource;
-    char * defaultPrefix;
-    struct stat sb;
-    int_32 true = 1;
-
-    hdr = hdrPtr ? hdrPtr : &hdrBlock;
-    lead = leadPtr ? leadPtr : &leadBlock;
-
-    oldLead = (struct oldrpmlead *) lead;
-
-    fstat(fdFileno(fd), &sb);
-    /* if fd points to a socket, pipe, etc, sb.st_size is *always* zero */
-    if (S_ISREG(sb.st_mode) && sb.st_size < sizeof(*lead)) return 1;
-
-    if (readLead(fd, lead)) {
-	return 2;
-    }
-
-    if (lead->magic[0] != RPMLEAD_MAGIC0 || lead->magic[1] != RPMLEAD_MAGIC1 ||
-	lead->magic[2] != RPMLEAD_MAGIC2 || lead->magic[3] != RPMLEAD_MAGIC3) {
-	return 1;
-    }
-
-    if (lead->major == 1) {
-	rpmMessage(RPMMESS_DEBUG, _("package is a version one package!\n"));
-
-	if (lead->type == RPMLEAD_SOURCE) {
-	    rpmMessage(RPMMESS_DEBUG, _("old style source package -- "
-			"I'll do my best\n"));
-	    oldLead->archiveOffset = ntohl(oldLead->archiveOffset);
-	    rpmMessage(RPMMESS_DEBUG, _("archive offset is %d\n"), 
-			oldLead->archiveOffset);
-	    (void)fdLseek(fd, oldLead->archiveOffset, SEEK_SET);
-	    
-	    /* we can't put togeher a header for old format source packages,
-	       there just isn't enough information there. We'll return
-	       NULL <gulp> */
-
-	    *hdr = NULL;
-	} else {
-	    rpmMessage(RPMMESS_DEBUG, _("old style binary package\n"));
-	    readOldHeader(fd, hdr, &isSource);
-	    arch = lead->archnum;
-	    headerAddEntry(*hdr, RPMTAG_ARCH, RPM_INT8_TYPE, &arch, 1);
-	    arch = 1;		  /* old versions of RPM only supported Linux */
-	    headerAddEntry(*hdr, RPMTAG_OS, RPM_INT8_TYPE, &arch, 1);
-	}
-    } else if (lead->major == 2 || lead->major == 3) {
-	if (rpmReadSignature(fd, sigs, lead->signature_type)) {
-	   return 2;
-	}
-	*hdr = headerRead(fd, (lead->major >= 3) ?
-			  HEADER_MAGIC_YES : HEADER_MAGIC_NO);
-	if (*hdr == NULL) {
-	    if (sigs != NULL) headerFree(*sigs);
-	    return 2;
-	}
-
-	/* We switched the way we do relocateable packages. We fix some of
-	   it up here, though the install code still has to be a bit 
-	   careful. This fixup makes queries give the new values though,
-	   which is quite handy. */
-	if (headerGetEntry(*hdr, RPMTAG_DEFAULTPREFIX, NULL,
-			   (void **) &defaultPrefix, NULL)) {
-	    defaultPrefix = strcpy(alloca(strlen(defaultPrefix) + 1), 
-				   defaultPrefix);
-	    stripTrailingSlashes(defaultPrefix);
-	    headerAddEntry(*hdr, RPMTAG_PREFIXES, RPM_STRING_ARRAY_TYPE,
-			   &defaultPrefix, 1); 
-	}
-
-    /* XXX binary rpms always have RPMTAG_SOURCERPM, source rpms do not */
-        if (lead->type == RPMLEAD_SOURCE) {
-	    if (!headerIsEntry(*hdr, RPMTAG_SOURCEPACKAGE))
-	    	headerAddEntry(*hdr, RPMTAG_SOURCEPACKAGE, RPM_INT32_TYPE,
-				&true, 1);
-	}
-    } else {
-	rpmError(RPMERR_NEWPACKAGE, _("only packages with major numbers <= 3 "
-		"are supported by this version of RPM"));
-	return 2;
-    } 
-
-    if (hdrPtr == NULL) headerFree(*hdr);
-    
-    return 0;
-}
-
-/* 0 = success */
-/* 1 = bad magic */
-/* 2 = error */
-int rpmReadPackageInfo(FD_t fd, Header * signatures, Header * hdr) {
-    return readPackageHeaders(fd, NULL, signatures, hdr);
-}
-
-/* 0 = success */
-/* 1 = bad magic */
-/* 2 = error */
-int rpmReadPackageHeader(FD_t fd, Header * hdr, int * isSource, int * major,
-		  int * minor) {
-    int rc;
-    struct rpmlead lead;
-
-    rc = readPackageHeaders(fd, &lead, NULL, hdr);
-    if (rc) return rc;
-   
-    if (isSource) *isSource = lead.type == RPMLEAD_SOURCE;
-    if (major) *major = lead.major;
-    if (minor) *minor = lead.minor;
-   
-    return 0;
-}
-
 static int readOldHeader(FD_t fd, Header * hdr, int * isSource) {
     struct oldrpmHeader oldheader;
     struct oldrpmHeaderSpec spec;
@@ -312,3 +187,136 @@ static int readOldHeader(FD_t fd, Header * hdr, int * isSource) {
 
     return 0;
 }
+#endif	/* ENABLE_V1_PACKAGES */
+
+/* 0 = success */
+/* 1 = bad magic */
+/* 2 = error */
+static int readPackageHeaders(FD_t fd, struct rpmlead * leadPtr, 
+			      Header * sigs, Header * hdrPtr) {
+    Header hdrBlock;
+    struct rpmlead leadBlock;
+    Header * hdr;
+    struct rpmlead * lead;
+    int_8 arch;
+    int isSource;
+    char * defaultPrefix;
+    struct stat sb;
+    int_32 true = 1;
+
+    hdr = hdrPtr ? hdrPtr : &hdrBlock;
+    lead = leadPtr ? leadPtr : &leadBlock;
+
+    fstat(fdFileno(fd), &sb);
+    /* if fd points to a socket, pipe, etc, sb.st_size is *always* zero */
+    if (S_ISREG(sb.st_mode) && sb.st_size < sizeof(*lead)) return 1;
+
+    if (readLead(fd, lead)) {
+	return 2;
+    }
+
+    if (lead->magic[0] != RPMLEAD_MAGIC0 || lead->magic[1] != RPMLEAD_MAGIC1 ||
+	lead->magic[2] != RPMLEAD_MAGIC2 || lead->magic[3] != RPMLEAD_MAGIC3) {
+	return 1;
+    }
+
+    switch(lead->major) {
+#if defined(ENABLE_V1_PACKAGES)
+    case 1:
+	rpmMessage(RPMMESS_DEBUG, _("package is a version one package!\n"));
+
+	if (lead->type == RPMLEAD_SOURCE) {
+	    struct oldrpmlead * oldLead = (struct oldrpmlead *) lead;
+
+	    rpmMessage(RPMMESS_DEBUG, _("old style source package -- "
+			"I'll do my best\n"));
+	    oldLead->archiveOffset = ntohl(oldLead->archiveOffset);
+	    rpmMessage(RPMMESS_DEBUG, _("archive offset is %d\n"), 
+			oldLead->archiveOffset);
+	    (void)fdLseek(fd, oldLead->archiveOffset, SEEK_SET);
+	    
+	    /* we can't put togeher a header for old format source packages,
+	       there just isn't enough information there. We'll return
+	       NULL <gulp> */
+
+	    *hdr = NULL;
+	} else {
+	    rpmMessage(RPMMESS_DEBUG, _("old style binary package\n"));
+	    readOldHeader(fd, hdr, &isSource);
+	    arch = lead->archnum;
+	    headerAddEntry(*hdr, RPMTAG_ARCH, RPM_INT8_TYPE, &arch, 1);
+	    arch = 1;		  /* old versions of RPM only supported Linux */
+	    headerAddEntry(*hdr, RPMTAG_OS, RPM_INT8_TYPE, &arch, 1);
+	}
+	break;
+#endif	/* ENABLE_V1_PACKAGES */
+
+    case 2:
+    case 3:
+	if (rpmReadSignature(fd, sigs, lead->signature_type)) {
+	   return 2;
+	}
+	*hdr = headerRead(fd, (lead->major >= 3) ?
+			  HEADER_MAGIC_YES : HEADER_MAGIC_NO);
+	if (*hdr == NULL) {
+	    if (sigs != NULL) headerFree(*sigs);
+	    return 2;
+	}
+
+	/* We switched the way we do relocateable packages. We fix some of
+	   it up here, though the install code still has to be a bit 
+	   careful. This fixup makes queries give the new values though,
+	   which is quite handy. */
+	if (headerGetEntry(*hdr, RPMTAG_DEFAULTPREFIX, NULL,
+			   (void **) &defaultPrefix, NULL)) {
+	    defaultPrefix = strcpy(alloca(strlen(defaultPrefix) + 1), 
+				   defaultPrefix);
+	    stripTrailingSlashes(defaultPrefix);
+	    headerAddEntry(*hdr, RPMTAG_PREFIXES, RPM_STRING_ARRAY_TYPE,
+			   &defaultPrefix, 1); 
+	}
+
+    /* XXX binary rpms always have RPMTAG_SOURCERPM, source rpms do not */
+        if (lead->type == RPMLEAD_SOURCE) {
+	    if (!headerIsEntry(*hdr, RPMTAG_SOURCEPACKAGE))
+	    	headerAddEntry(*hdr, RPMTAG_SOURCEPACKAGE, RPM_INT32_TYPE,
+				&true, 1);
+	}
+	break;
+
+    default:
+	rpmError(RPMERR_NEWPACKAGE, _("only packages with major numbers <= 3 "
+		"are supported by this version of RPM"));
+	return 2;
+	break;
+    } 
+
+    if (hdrPtr == NULL) headerFree(*hdr);
+    
+    return 0;
+}
+
+/* 0 = success */
+/* 1 = bad magic */
+/* 2 = error */
+int rpmReadPackageInfo(FD_t fd, Header * signatures, Header * hdr) {
+    return readPackageHeaders(fd, NULL, signatures, hdr);
+}
+
+/* 0 = success */
+/* 1 = bad magic */
+/* 2 = error */
+int rpmReadPackageHeader(FD_t fd, Header * hdr, int * isSource, int * major,
+		  int * minor) {
+    int rc;
+    struct rpmlead lead;
+
+    rc = readPackageHeaders(fd, &lead, NULL, hdr);
+    if (rc) return rc;
+   
+    if (isSource) *isSource = lead.type == RPMLEAD_SOURCE;
+    if (major) *major = lead.major;
+    if (minor) *minor = lead.minor;
+   
+    return 0;
+}
diff --git a/po/rpm.pot b/po/rpm.pot
index 7bb3511c9..d80bca541 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-07-08 13:10-0400\n"
+"POT-Creation-Date: 1999-07-08 17:12-0400\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"
@@ -89,7 +89,7 @@ msgstr ""
 msgid "override build root"
 msgstr ""
 
-#: ../build.c:323 ../rpm.c:459
+#: ../build.c:323 ../rpm.c:458
 msgid "remove build tree when done"
 msgstr ""
 
@@ -109,7 +109,7 @@ msgstr ""
 msgid "remove specfile when done"
 msgstr ""
 
-#: ../build.c:333 ../rpm.c:457
+#: ../build.c:333 ../rpm.c:456
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
@@ -353,1061 +353,1061 @@ msgstr ""
 msgid "no copyright!\n"
 msgstr ""
 
-#: ../rpm.c:161
+#: ../rpm.c:160
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: ../rpm.c:172
+#: ../rpm.c:171
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: ../rpm.c:176
+#: ../rpm.c:175
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: ../rpm.c:177
+#: ../rpm.c:176
 msgid ""
 "This may be freely redistributed under the terms of the GNU Public License"
 msgstr ""
 
-#: ../rpm.c:186
+#: ../rpm.c:185
 msgid "usage: rpm {--help}"
 msgstr ""
 
-#: ../rpm.c:187
+#: ../rpm.c:186
 msgid "       rpm {--version}"
 msgstr ""
 
-#: ../rpm.c:188
+#: ../rpm.c:187
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:189
+#: ../rpm.c:188
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: ../rpm.c:190
+#: ../rpm.c:189
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: ../rpm.c:191
+#: ../rpm.c:190
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:192
+#: ../rpm.c:191
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:193
+#: ../rpm.c:192
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: ../rpm.c:194
+#: ../rpm.c:193
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 
-#: ../rpm.c:195 ../rpm.c:204 ../rpm.c:213
+#: ../rpm.c:194 ../rpm.c:203 ../rpm.c:212
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: ../rpm.c:196 ../rpm.c:206
+#: ../rpm.c:195 ../rpm.c:205
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: ../rpm.c:197
+#: ../rpm.c:196
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: ../rpm.c:198
+#: ../rpm.c:197
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: ../rpm.c:199
+#: ../rpm.c:198
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: ../rpm.c:200
+#: ../rpm.c:199
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:201
+#: ../rpm.c:200
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:202
+#: ../rpm.c:201
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: ../rpm.c:203
+#: ../rpm.c:202
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: ../rpm.c:205
+#: ../rpm.c:204
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: ../rpm.c:207
+#: ../rpm.c:206
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: ../rpm.c:208
+#: ../rpm.c:207
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: ../rpm.c:209
+#: ../rpm.c:208
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: ../rpm.c:210
+#: ../rpm.c:209
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:211
+#: ../rpm.c:210
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: ../rpm.c:212
+#: ../rpm.c:211
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 
-#: ../rpm.c:214
+#: ../rpm.c:213
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: ../rpm.c:215
+#: ../rpm.c:214
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: ../rpm.c:216
+#: ../rpm.c:215
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:217
+#: ../rpm.c:216
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:218
+#: ../rpm.c:217
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: ../rpm.c:219
+#: ../rpm.c:218
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: ../rpm.c:220
+#: ../rpm.c:219
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: ../rpm.c:221
+#: ../rpm.c:220
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:222
+#: ../rpm.c:221
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: ../rpm.c:223
+#: ../rpm.c:222
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr ""
 
-#: ../rpm.c:224
+#: ../rpm.c:223
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 
-#: ../rpm.c:225
+#: ../rpm.c:224
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr ""
 
-#: ../rpm.c:226
+#: ../rpm.c:225
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: ../rpm.c:227
+#: ../rpm.c:226
 msgid "                        [--rmsource] specfile"
 msgstr ""
 
-#: ../rpm.c:228
+#: ../rpm.c:227
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr ""
 
-#: ../rpm.c:229
+#: ../rpm.c:228
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: ../rpm.c:230
+#: ../rpm.c:229
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: ../rpm.c:231
+#: ../rpm.c:230
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: ../rpm.c:232
+#: ../rpm.c:231
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: ../rpm.c:233
+#: ../rpm.c:232
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:234
+#: ../rpm.c:233
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: ../rpm.c:235
+#: ../rpm.c:234
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:236
+#: ../rpm.c:235
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: ../rpm.c:270
+#: ../rpm.c:269
 msgid "usage:"
 msgstr ""
 
-#: ../rpm.c:272
+#: ../rpm.c:271
 msgid "print this message"
 msgstr ""
 
-#: ../rpm.c:274
+#: ../rpm.c:273
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: ../rpm.c:275
+#: ../rpm.c:274
 msgid "   all modes support the following arguments:"
 msgstr ""
 
-#: ../rpm.c:276
+#: ../rpm.c:275
 msgid "      --rcfile <file>     "
 msgstr ""
 
-#: ../rpm.c:277
+#: ../rpm.c:276
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: ../rpm.c:279
+#: ../rpm.c:278
 msgid "be a little more verbose"
 msgstr ""
 
-#: ../rpm.c:281
+#: ../rpm.c:280
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: ../rpm.c:283
+#: ../rpm.c:282
 msgid "query mode"
 msgstr ""
 
-#: ../rpm.c:284 ../rpm.c:346 ../rpm.c:410 ../rpm.c:438
+#: ../rpm.c:283 ../rpm.c:345 ../rpm.c:409 ../rpm.c:437
 msgid "      --root <dir>        "
 msgstr ""
 
-#: ../rpm.c:285 ../rpm.c:347 ../rpm.c:411 ../rpm.c:439 ../rpm.c:501
+#: ../rpm.c:284 ../rpm.c:346 ../rpm.c:410 ../rpm.c:438 ../rpm.c:500
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: ../rpm.c:286 ../rpm.c:344 ../rpm.c:374 ../rpm.c:426 ../rpm.c:498
+#: ../rpm.c:285 ../rpm.c:343 ../rpm.c:373 ../rpm.c:425 ../rpm.c:497
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: ../rpm.c:287 ../rpm.c:345 ../rpm.c:375 ../rpm.c:427 ../rpm.c:499
+#: ../rpm.c:286 ../rpm.c:344 ../rpm.c:374 ../rpm.c:426 ../rpm.c:498
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: ../rpm.c:288
+#: ../rpm.c:287
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: ../rpm.c:289
+#: ../rpm.c:288
 msgid "use <qfmt> as the header format (implies -i)"
 msgstr ""
 
-#: ../rpm.c:290
+#: ../rpm.c:289
 msgid ""
 "   install, upgrade and query (with -p) allow ftp URL's to be used in place"
 msgstr ""
 
-#: ../rpm.c:291
+#: ../rpm.c:290
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: ../rpm.c:292
+#: ../rpm.c:291
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: ../rpm.c:293
+#: ../rpm.c:292
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: ../rpm.c:294
+#: ../rpm.c:293
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: ../rpm.c:295
+#: ../rpm.c:294
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: ../rpm.c:296
+#: ../rpm.c:295
 msgid "      --httpproxy <host>   "
 msgstr ""
 
-#: ../rpm.c:297
+#: ../rpm.c:296
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: ../rpm.c:298
+#: ../rpm.c:297
 msgid "      --httpport <port>    "
 msgstr ""
 
-#: ../rpm.c:299
+#: ../rpm.c:298
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: ../rpm.c:300
+#: ../rpm.c:299
 msgid "      Package specification options:"
 msgstr ""
 
-#: ../rpm.c:302
+#: ../rpm.c:301
 msgid "query all packages"
 msgstr ""
 
-#: ../rpm.c:303
+#: ../rpm.c:302
 msgid "        -f <file>+        "
 msgstr ""
 
-#: ../rpm.c:304
+#: ../rpm.c:303
 msgid "query package owning <file>"
 msgstr ""
 
-#: ../rpm.c:305
+#: ../rpm.c:304
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: ../rpm.c:306
+#: ../rpm.c:305
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: ../rpm.c:307
+#: ../rpm.c:306
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: ../rpm.c:308
+#: ../rpm.c:307
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: ../rpm.c:309
+#: ../rpm.c:308
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: ../rpm.c:310
+#: ../rpm.c:309
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: ../rpm.c:311
+#: ../rpm.c:310
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: ../rpm.c:312
+#: ../rpm.c:311
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: ../rpm.c:313
+#: ../rpm.c:312
 msgid "      Information selection options:"
 msgstr ""
 
-#: ../rpm.c:315
+#: ../rpm.c:314
 msgid "display package information"
 msgstr ""
 
-#: ../rpm.c:317
+#: ../rpm.c:316
 msgid "display the package's change log"
 msgstr ""
 
-#: ../rpm.c:319
+#: ../rpm.c:318
 msgid "display package file list"
 msgstr ""
 
-#: ../rpm.c:321
+#: ../rpm.c:320
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: ../rpm.c:323
+#: ../rpm.c:322
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: ../rpm.c:325
+#: ../rpm.c:324
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: ../rpm.c:327
+#: ../rpm.c:326
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: ../rpm.c:329
+#: ../rpm.c:328
 msgid "list capabilities package provides"
 msgstr ""
 
-#: ../rpm.c:330
+#: ../rpm.c:329
 msgid "        --requires"
 msgstr ""
 
-#: ../rpm.c:332
+#: ../rpm.c:331
 msgid "list package dependencies"
 msgstr ""
 
-#: ../rpm.c:334
+#: ../rpm.c:333
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: ../rpm.c:336
+#: ../rpm.c:335
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: ../rpm.c:340
+#: ../rpm.c:339
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: ../rpm.c:341
+#: ../rpm.c:340
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: ../rpm.c:343
+#: ../rpm.c:342
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: ../rpm.c:349 ../rpm.c:397 ../rpm.c:431
+#: ../rpm.c:348 ../rpm.c:396 ../rpm.c:430
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: ../rpm.c:351
+#: ../rpm.c:350
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: ../rpm.c:353
+#: ../rpm.c:352
 msgid "do not verify file attributes"
 msgstr ""
 
-#: ../rpm.c:356
+#: ../rpm.c:355
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: ../rpm.c:359
+#: ../rpm.c:358
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: ../rpm.c:363
+#: ../rpm.c:362
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: ../rpm.c:364
+#: ../rpm.c:363
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: ../rpm.c:365
+#: ../rpm.c:364
 msgid "install package"
 msgstr ""
 
-#: ../rpm.c:366
+#: ../rpm.c:365
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: ../rpm.c:367
+#: ../rpm.c:366
 msgid "skip files in path <path>"
 msgstr ""
 
-#: ../rpm.c:368
+#: ../rpm.c:367
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: ../rpm.c:369
+#: ../rpm.c:368
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: ../rpm.c:371
+#: ../rpm.c:370
 msgid "relocate files even though the package doesn't allow it"
 msgstr ""
 
-#: ../rpm.c:372
+#: ../rpm.c:371
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: ../rpm.c:373
+#: ../rpm.c:372
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: ../rpm.c:377
+#: ../rpm.c:376
 msgid "do not install documentation"
 msgstr ""
 
-#: ../rpm.c:379
+#: ../rpm.c:378
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: ../rpm.c:382
+#: ../rpm.c:381
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: ../rpm.c:384
+#: ../rpm.c:383
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: ../rpm.c:387
+#: ../rpm.c:386
 msgid "don't verify package architecture"
 msgstr ""
 
-#: ../rpm.c:389
+#: ../rpm.c:388
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: ../rpm.c:391
+#: ../rpm.c:390
 msgid "don't verify package operating system"
 msgstr ""
 
-#: ../rpm.c:393
+#: ../rpm.c:392
 msgid "install documentation"
 msgstr ""
 
-#: ../rpm.c:395 ../rpm.c:429
+#: ../rpm.c:394 ../rpm.c:428
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: ../rpm.c:399 ../rpm.c:433
+#: ../rpm.c:398 ../rpm.c:432
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: ../rpm.c:401
+#: ../rpm.c:400
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: ../rpm.c:403 ../rpm.c:437
+#: ../rpm.c:402 ../rpm.c:436
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: ../rpm.c:405
+#: ../rpm.c:404
 msgid "print percentages as package installs"
 msgstr ""
 
-#: ../rpm.c:407
+#: ../rpm.c:406
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: ../rpm.c:409
+#: ../rpm.c:408
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: ../rpm.c:413
+#: ../rpm.c:412
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: ../rpm.c:415
+#: ../rpm.c:414
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: ../rpm.c:416
+#: ../rpm.c:415
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: ../rpm.c:417
+#: ../rpm.c:416
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: ../rpm.c:419
+#: ../rpm.c:418
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: ../rpm.c:421
+#: ../rpm.c:420
 msgid "    --erase <package>"
 msgstr ""
 
-#: ../rpm.c:423
+#: ../rpm.c:422
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: ../rpm.c:425
+#: ../rpm.c:424
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: ../rpm.c:435
+#: ../rpm.c:434
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: ../rpm.c:441
+#: ../rpm.c:440
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: ../rpm.c:442
+#: ../rpm.c:441
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: ../rpm.c:443
+#: ../rpm.c:442
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: ../rpm.c:445
+#: ../rpm.c:444
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: ../rpm.c:447
+#: ../rpm.c:446
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: ../rpm.c:449
+#: ../rpm.c:448
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: ../rpm.c:451
+#: ../rpm.c:450
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: ../rpm.c:453
+#: ../rpm.c:452
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: ../rpm.c:455
+#: ../rpm.c:454
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: ../rpm.c:461
+#: ../rpm.c:460
 msgid "remove sources and spec file when done"
 msgstr ""
 
-#: ../rpm.c:463
+#: ../rpm.c:462
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: ../rpm.c:464
+#: ../rpm.c:463
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: ../rpm.c:465
+#: ../rpm.c:464
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: ../rpm.c:466
+#: ../rpm.c:465
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: ../rpm.c:467
+#: ../rpm.c:466
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: ../rpm.c:469
+#: ../rpm.c:468
 msgid "do not execute any stages"
 msgstr ""
 
-#: ../rpm.c:470
+#: ../rpm.c:469
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: ../rpm.c:471
+#: ../rpm.c:470
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: ../rpm.c:473
+#: ../rpm.c:472
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: ../rpm.c:474
+#: ../rpm.c:473
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: ../rpm.c:475
+#: ../rpm.c:474
 msgid "    --rmsource <spec>     "
 msgstr ""
 
-#: ../rpm.c:476
+#: ../rpm.c:475
 msgid "remove sources and spec file"
 msgstr ""
 
-#: ../rpm.c:477
+#: ../rpm.c:476
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: ../rpm.c:478
+#: ../rpm.c:477
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: ../rpm.c:479
+#: ../rpm.c:478
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: ../rpm.c:480
+#: ../rpm.c:479
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: ../rpm.c:481
+#: ../rpm.c:480
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: ../rpm.c:482
+#: ../rpm.c:481
 msgid "add a signature to a package"
 msgstr ""
 
-#: ../rpm.c:484
+#: ../rpm.c:483
 msgid "    --checksig <pkg>+     "
 msgstr ""
 
-#: ../rpm.c:485
+#: ../rpm.c:484
 msgid "verify package signature"
 msgstr ""
 
-#: ../rpm.c:487
+#: ../rpm.c:486
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: ../rpm.c:489
+#: ../rpm.c:488
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: ../rpm.c:491
+#: ../rpm.c:490
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: ../rpm.c:493
+#: ../rpm.c:492
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: ../rpm.c:495
+#: ../rpm.c:494
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: ../rpm.c:497
+#: ../rpm.c:496
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: ../rpm.c:636 ../rpm.c:642 ../rpm.c:649 ../rpm.c:655 ../rpm.c:664
-#: ../rpm.c:671 ../rpm.c:718 ../rpm.c:724 ../rpm.c:758 ../rpm.c:764
-#: ../rpm.c:770 ../rpm.c:778 ../rpm.c:813 ../rpm.c:868 ../rpm.c:875
+#: ../rpm.c:635 ../rpm.c:641 ../rpm.c:648 ../rpm.c:654 ../rpm.c:663
+#: ../rpm.c:670 ../rpm.c:717 ../rpm.c:723 ../rpm.c:757 ../rpm.c:763
+#: ../rpm.c:769 ../rpm.c:777 ../rpm.c:812 ../rpm.c:867 ../rpm.c:874
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: ../rpm.c:657
+#: ../rpm.c:656
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: ../rpm.c:659
+#: ../rpm.c:658
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: ../rpm.c:675
+#: ../rpm.c:674
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 
-#: ../rpm.c:679
+#: ../rpm.c:678
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 
-#: ../rpm.c:731 ../rpm.c:737 ../rpm.c:744 ../rpm.c:751 ../rpm.c:882
+#: ../rpm.c:730 ../rpm.c:736 ../rpm.c:743 ../rpm.c:750 ../rpm.c:881
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: ../rpm.c:786
+#: ../rpm.c:785
 msgid "arguments to --dbpath must begin with a /"
 msgstr ""
 
-#: ../rpm.c:819
+#: ../rpm.c:818
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: ../rpm.c:821
+#: ../rpm.c:820
 msgid "relocations must contain a ="
 msgstr ""
 
-#: ../rpm.c:824
+#: ../rpm.c:823
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: ../rpm.c:833
+#: ../rpm.c:832
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: ../rpm.c:842
+#: ../rpm.c:841
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: ../rpm.c:895
+#: ../rpm.c:894
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: ../rpm.c:900
+#: ../rpm.c:899
 msgid "--timecheck may only be used during package builds"
 msgstr ""
 
-#: ../rpm.c:903
+#: ../rpm.c:902
 msgid "unexpected query flags"
 msgstr ""
 
-#: ../rpm.c:906
+#: ../rpm.c:905
 msgid "unexpected query format"
 msgstr ""
 
-#: ../rpm.c:910
+#: ../rpm.c:909
 msgid "unexpected query source"
 msgstr ""
 
-#: ../rpm.c:916
+#: ../rpm.c:915
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: ../rpm.c:919
+#: ../rpm.c:918
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: ../rpm.c:922
+#: ../rpm.c:921
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: ../rpm.c:925
+#: ../rpm.c:924
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: ../rpm.c:928
+#: ../rpm.c:927
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: ../rpm.c:931
+#: ../rpm.c:930
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: ../rpm.c:934
+#: ../rpm.c:933
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:938
+#: ../rpm.c:937
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:942
+#: ../rpm.c:941
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:946
+#: ../rpm.c:945
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:950
+#: ../rpm.c:949
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:954
+#: ../rpm.c:953
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:958
+#: ../rpm.c:957
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: ../rpm.c:962
+#: ../rpm.c:961
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:966
+#: ../rpm.c:965
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:970
+#: ../rpm.c:969
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:974
+#: ../rpm.c:973
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: ../rpm.c:978
+#: ../rpm.c:977
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:982
+#: ../rpm.c:981
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: ../rpm.c:987
+#: ../rpm.c:986
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: ../rpm.c:991
+#: ../rpm.c:990
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: ../rpm.c:997
+#: ../rpm.c:996
 msgid ""
 "--nodeps may only be specified during package building, installation, "
 "erasure, and verification"
 msgstr ""
 
-#: ../rpm.c:1002
+#: ../rpm.c:1001
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: ../rpm.c:1007
+#: ../rpm.c:1006
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: ../rpm.c:1012
+#: ../rpm.c:1011
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: ../rpm.c:1015
+#: ../rpm.c:1014
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: ../rpm.c:1020
+#: ../rpm.c:1019
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 
-#: ../rpm.c:1026
+#: ../rpm.c:1025
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr ""
 
-#: ../rpm.c:1030
+#: ../rpm.c:1029
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: ../rpm.c:1033
+#: ../rpm.c:1032
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: ../rpm.c:1036
+#: ../rpm.c:1035
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: ../rpm.c:1062
+#: ../rpm.c:1061
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: ../rpm.c:1079
+#: ../rpm.c:1078
 msgid "pgp not found: "
 msgstr ""
 
-#: ../rpm.c:1082
+#: ../rpm.c:1081
 msgid "Use `%%_signature pgp5' instead of `%%_signature pgp' in macro file.\n"
 msgstr ""
 
-#: ../rpm.c:1089
+#: ../rpm.c:1088
 msgid "pgp version 5 not found: "
 msgstr ""
 
-#: ../rpm.c:1092
+#: ../rpm.c:1091
 msgid "Use `%%_signature pgp' instead of `%%_signature pgp5' in macro file.\n"
 msgstr ""
 
-#: ../rpm.c:1098
+#: ../rpm.c:1097
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: ../rpm.c:1099
+#: ../rpm.c:1098
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: ../rpm.c:1102
+#: ../rpm.c:1101
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: ../rpm.c:1109
+#: ../rpm.c:1108
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: ../rpm.c:1114
+#: ../rpm.c:1113
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: ../rpm.c:1131
+#: ../rpm.c:1130
 msgid "exec failed\n"
 msgstr ""
 
-#: ../rpm.c:1150
+#: ../rpm.c:1149
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: ../rpm.c:1161
+#: ../rpm.c:1160
 msgid "no packages given for signature check"
 msgstr ""
 
-#: ../rpm.c:1173
+#: ../rpm.c:1172
 msgid "no packages given for signing"
 msgstr ""
 
-#: ../rpm.c:1186
+#: ../rpm.c:1185
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: ../rpm.c:1243
+#: ../rpm.c:1242
 msgid "no spec files given for build"
 msgstr ""
 
-#: ../rpm.c:1245
+#: ../rpm.c:1244
 msgid "no tar files given for build"
 msgstr ""
 
-#: ../rpm.c:1257
+#: ../rpm.c:1256
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: ../rpm.c:1306
+#: ../rpm.c:1305
 msgid "no packages given for install"
 msgstr ""
 
-#: ../rpm.c:1329
+#: ../rpm.c:1328
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: ../rpm.c:1334
+#: ../rpm.c:1333
 msgid "no arguments given for query"
 msgstr ""
 
-#: ../rpm.c:1351
+#: ../rpm.c:1350
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: ../rpm.c:1355
+#: ../rpm.c:1354
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -2364,97 +2364,97 @@ msgstr ""
 msgid "source package expected, binary found"
 msgstr ""
 
-#: ../lib/install.c:169 ../lib/uninstall.c:111
+#: ../lib/install.c:171 ../lib/uninstall.c:111
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: ../lib/install.c:186
+#: ../lib/install.c:188
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: ../lib/install.c:194
+#: ../lib/install.c:196
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: ../lib/install.c:221
+#: ../lib/install.c:223
 msgid "%%instchangelog value in macro file should be a number, but isn't"
 msgstr ""
 
-#: ../lib/install.c:289
+#: ../lib/install.c:291
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: ../lib/install.c:352
+#: ../lib/install.c:354
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: ../lib/install.c:357
+#: ../lib/install.c:359
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: ../lib/install.c:387
+#: ../lib/install.c:389
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: ../lib/install.c:423
+#: ../lib/install.c:425
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: ../lib/install.c:427 ../lib/install.c:790 ../lib/uninstall.c:337
+#: ../lib/install.c:429 ../lib/install.c:792 ../lib/uninstall.c:337
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: ../lib/install.c:507
+#: ../lib/install.c:509
 msgid "running postinstall script (if any)\n"
 msgstr ""
 
 #. this would probably be a good place to check if disk space
 #. was used up - if so, we should return a different error
-#: ../lib/install.c:613
+#: ../lib/install.c:615
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: ../lib/install.c:614
+#: ../lib/install.c:616
 msgid " on file "
 msgstr ""
 
-#: ../lib/install.c:654
+#: ../lib/install.c:656
 msgid "installing a source package\n"
 msgstr ""
 
-#: ../lib/install.c:665 ../lib/install.c:687
+#: ../lib/install.c:667 ../lib/install.c:689
 #, c-format
 msgid "cannot create %s"
 msgstr ""
 
-#: ../lib/install.c:672 ../lib/install.c:694
+#: ../lib/install.c:674 ../lib/install.c:696
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: ../lib/install.c:676
+#: ../lib/install.c:678
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: ../lib/install.c:698
+#: ../lib/install.c:700
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: ../lib/install.c:731 ../lib/install.c:767
+#: ../lib/install.c:733 ../lib/install.c:769
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: ../lib/install.c:788
+#: ../lib/install.c:790
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
@@ -2571,24 +2571,24 @@ msgstr ""
 msgid "bad file state: %s"
 msgstr ""
 
-#: ../lib/package.c:51
+#: ../lib/package.c:226
 msgid "package is a version one package!\n"
 msgstr ""
 
-#: ../lib/package.c:54
+#: ../lib/package.c:231
 msgid "old style source package -- I'll do my best\n"
 msgstr ""
 
-#: ../lib/package.c:57
+#: ../lib/package.c:234
 #, c-format
 msgid "archive offset is %d\n"
 msgstr ""
 
-#: ../lib/package.c:67
+#: ../lib/package.c:244
 msgid "old style binary package\n"
 msgstr ""
 
-#: ../lib/package.c:105
+#: ../lib/package.c:288
 msgid ""
 "only packages with major numbers <= 3 are supported by this version of RPM"
 msgstr ""