From ca9dc63de974d1335dce533d310ffbb11812fce0 Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Tue, 16 Mar 1999 20:04:26 +0000
Subject: [PATCH] Fix newSpec in "rpm -q --specfile --specedit"

CVS patchset: 2892
CVS date: 1999/03/16 20:04:26
---
 GROUPS              |  29 +++
 aclocal.m4          |   4 +-
 build/parseSpec.c   |  11 +-
 checksig.c          |   8 +-
 checksig.h          |   4 +-
 configure.in        |   1 +
 convertdb.c         |   1 +
 lib/install.c       |   1 -
 lib/rpmrc.c         |  32 ++-
 lib/transaction.c   |  11 +-
 misc/Makefile.am    |  14 +-
 misc/basename.c     |  13 ++
 po/rpm.pot          | 574 ++++++++++++++++++++++++++--------------------------
 rpm.c               |   9 +-
 rpm.spec            |   4 +-
 scripts/Makefile.in |   9 +-
 tools/rpmgettext.c  |   7 -
 17 files changed, 383 insertions(+), 349 deletions(-)
 create mode 100644 GROUPS
 create mode 100644 misc/basename.c

diff --git a/GROUPS b/GROUPS
new file mode 100644
index 0000000..b0612a7
--- /dev/null
+++ b/GROUPS
@@ -0,0 +1,29 @@
+Amusements/Games
+Amusements/Graphics
+Applications/Archiving
+Applications/Communications
+Applications/Databases
+Applications/Editors
+Applications/Emulators
+Applications/Engineering
+Applications/File
+Applications/Internet
+Applications/Multimedia
+Applications/Productivity
+Applications/Publishing
+Applications/System
+Applications/Text
+Development/Debuggers
+Development/Languages
+Development/Libraries
+Development/System
+Development/Tools
+Documentation
+System Environment/Base
+System Environment/Daemons
+System Environment/Kernel
+System Environment/Libraries
+System Environment/Shells
+User Interface/Desktops
+User Interface/X
+User Interface/X Hardware Support
diff --git a/aclocal.m4 b/aclocal.m4
index 704371a..064de27 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4a
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -21,6 +21,8 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define])
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AC_PROG_INSTALL])
+dnl We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
diff --git a/build/parseSpec.c b/build/parseSpec.c
index 3dee03f..2880c1c 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -379,12 +379,8 @@ int parseSpec(Spec *specp, const char *specFile, const char *buildRoot,
 	}
 
 	if (parsePart == PART_BUILDARCHITECTURES) {
-#if 0	/* XXX W2DO??? */
 	    spec->buildArchitectureSpecs =
 		malloc(sizeof(Spec) * spec->buildArchitectureCount);
-#else
-	    spec->buildArchitectureSpecs = newSpec();
-#endif
 	    index = 0;
 	    for (x = 0; x < spec->buildArchitectureCount; x++) {
 		if (rpmMachineScore(RPM_MACHTABLE_BUILDARCH,
@@ -411,7 +407,12 @@ int parseSpec(Spec *specp, const char *specFile, const char *buildRoot,
 		return RPMERR_BADSPEC;
 	    }
 
-	    /* XXX HACK: swap BuildArch sl/st with child */
+	    /* XXX HACK: Swap sl/st with child.
+	     * The restart of the parse when encountering BuildArch
+	     * causes problems for "rpm -q --specfile --specedit"
+	     * which needs to keep track of the entire spec file.
+	     */
+
 	    if (spec->sl && spec->st) {
 		Spec nspec = *spec->buildArchitectureSpecs;
 		struct speclines *sl = spec->sl;
diff --git a/checksig.c b/checksig.c
index 33c21f6..5456ab0 100644
--- a/checksig.c
+++ b/checksig.c
@@ -8,13 +8,13 @@
 #include "rpmlead.h"
 #include "signature.h"
 
-int doReSign(int add, char *passPhrase, char **argv)
+int doReSign(int add, char *passPhrase, const char **argv)
 {
     FD_t fd, ofd;
     int count;
     struct rpmlead lead;
     unsigned short sigtype;
-    char *rpm;
+    const char *rpm;
     const char *sigtarget;
     char tmprpm[1024];
     unsigned char buffer[8192];
@@ -142,12 +142,12 @@ int doReSign(int add, char *passPhrase, char **argv)
     return 0;
 }
 
-int doCheckSig(int flags, char **argv)
+int doCheckSig(int flags, const char **argv)
 {
     FD_t fd, ofd;
     int res, res2, res3;
     struct rpmlead lead;
-    char *rpm;
+    const char *rpm;
     char result[1024];
     const char * sigtarget;
     unsigned char buffer[8192];
diff --git a/checksig.h b/checksig.h
index 597b09c..10bba13 100644
--- a/checksig.h
+++ b/checksig.h
@@ -5,8 +5,8 @@
 #define CHECKSIG_MD5 (1 << 1)
 #define CHECKSIG_GPG (1 << 2)
 
-int doCheckSig(int flags, char **argv);
-int doReSign(int add, char *passPhrase, char **argv);
+int doCheckSig(int flags, const char **argv);
+int doReSign(int add, char *passPhrase, const char **argv);
 
 #define ADD_SIGNATURE 1
 #define NEW_SIGNATURE 0
diff --git a/configure.in b/configure.in
index 082c465..a2b02ad 100644
--- a/configure.in
+++ b/configure.in
@@ -416,6 +416,7 @@ AC_REPLACE_FUNCS(strdup strerror strtol strtoul strspn strstr)
 
 dnl XXX stpcpy/stpncpy needed by rpmgettext
 AC_REPLACE_FUNCS(stpcpy stpncpy strcasecmp strncasecmp strcspn)
+AC_REPLACE_FUNCS(basename)
 
 AC_CHECK_FUNCS(setlocale)
 
diff --git a/convertdb.c b/convertdb.c
index 2545474..3a3405b 100644
--- a/convertdb.c
+++ b/convertdb.c
@@ -7,6 +7,7 @@
 #include "falloc.h"
 #include "oldrpmdb.h"
 #include "oldheader.h"
+#include "lib/rpmdb.h"
 
 int convertDB(void);
 
diff --git a/lib/install.c b/lib/install.c
index 913b4b5..cbb4a10 100644
--- a/lib/install.c
+++ b/lib/install.c
@@ -115,7 +115,6 @@ static int assembleFileList(Header h, struct fileMemory * mem,
     struct fileInfo * file;
     int fileCount;
     int i;
-    char * chptr;
 
     if (!headerGetEntry(h, RPMTAG_FILENAMES, NULL, (void **) &mem->names, 
 		        fileCountPtr))
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index 7ff2508..374929d 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -1053,32 +1053,31 @@ int rpmGetBooleanVar(int var) {
     return 0;
 }
 
-void rpmSetVar(int var, const char *val) {
-    freeRpmVar(&values[var]);
-
-    values[var].arch = NULL;
-    values[var].next = NULL;
-
-    if (val)
-	values[var].value = strdup(val);
-    else
-	values[var].value = NULL;
-}
-
 /* this doesn't free the passed pointer! */
 static void freeRpmVar(struct rpmvarValue * orig) {
     struct rpmvarValue * next, * var = orig;
 
     while (var) {
 	next = var->next;
-	if (var->arch) free(var->arch);
-	if (var->value) free(var->value);
+	if (var->arch) {
+	    free(var->arch);
+	    var->arch = NULL;
+	}
+	if (var->value) {
+	    free(var->value);
+	    var->value = NULL;
+	}
 
 	if (var != orig) free(var);
 	var = next;
     }
 }
 
+void rpmSetVar(int var, const char *val) {
+    freeRpmVar(&values[var]);
+    values[var].value = (val ? strdup(val) : NULL);
+}
+
 static void rpmSetVarArch(int var, char * val, char * arch) {
     struct rpmvarValue * next = values + var;
 
@@ -1106,10 +1105,7 @@ static void rpmSetVarArch(int var, char * val, char * arch) {
     }
 
     next->value = strdup(val);
-    if (arch)
-	next->arch = strdup(arch);
-    else
-	next->arch = NULL;
+    next->arch = (arch ? strdup(arch) : NULL);
 }
 
 void rpmSetTables(int archTable, int osTable) {
diff --git a/lib/transaction.c b/lib/transaction.c
index 862b094..990be7a 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -17,7 +17,8 @@ struct fileInfo {
     enum fileActions * actions;
     fingerPrint * fps;
     uint_32 * fflags;
-    char ** fl, ** fmd5s;
+    const char ** fl;
+    char ** fmd5s;
     uint_16 * fmodes;
     Header h;
     int fc;
@@ -32,7 +33,7 @@ struct fileInfo {
 
 static rpmProblemSet psCreate(void);
 static void psAppend(rpmProblemSet probs, rpmProblemType type, 
-		     const void * key, Header h, char * str1, 
+		     const void * key, Header h, const char * str1, 
 		     Header altHeader);
 static int archOkay(Header h);
 static int osOkay(Header h);
@@ -42,7 +43,7 @@ static Header relocateFileList(struct availablePackage * alp,
 			       int allowBadRelocate);
 static int psTrim(rpmProblemSet filter, rpmProblemSet target);
 static int sharedCmp(const void * one, const void * two);
-static enum fileActions decideFileFate(char * filespec, short dbMode, 
+static enum fileActions decideFileFate(const char * filespec, short dbMode, 
 				char * dbMd5, char * dbLink, short newMode, 
 				char * newMd5, char * newLink, int newFlags,
 				int brokenMd5);
@@ -519,7 +520,7 @@ static rpmProblemSet psCreate(void) {
 }
 
 static void psAppend(rpmProblemSet probs, rpmProblemType type, 
-		     const void * key, Header h, char * str1, Header altH) {
+		     const void * key, Header h, const char * str1, Header altH) {
     if (probs->numProblems == probs->numProblemsAlloced) {
 	if (probs->numProblemsAlloced)
 	    probs->numProblemsAlloced *= 2;
@@ -797,7 +798,7 @@ static int sharedCmp(const void * one, const void * two) {
     return 0;
 }
 
-static enum fileActions decideFileFate(char * filespec, short dbMode, 
+static enum fileActions decideFileFate(const char * filespec, short dbMode, 
 				char * dbMd5, char * dbLink, short newMode, 
 				char * newMd5, char * newLink, int newFlags,
 				int brokenMd5) {
diff --git a/misc/Makefile.am b/misc/Makefile.am
index b590e46..38f9155 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -5,13 +5,13 @@ AUTOMAKE_OPTIONS = 1.4 foreign
 INCLUDES = -I$(top_srcdir) @INCPATH@
 
 EXTRA_DIST = \
-	alloca.c	error.c		fakefork.c	fnmatch.c	\
-	getcwd.c	getmntent.c	getwd.c		glob.c		\
-	inet_aton.c	memcmp.c	mktime.c	myrealloc.c	\
-	putenv.c	realpath.c	stpcpy.c	stpncpy.c	\
-	strcasecmp.c	strncasecmp.c	strcspn.c	strdup.c	\
-	strerror.c	strftime.c	strcspn.c	strstr.c	\
-	strtol.c	strtoul.c
+	alloca.c	basename.c	error.c		fakefork.c	\
+	fnmatch.c	getcwd.c	getmntent.c	getwd.c		\
+	glob.c		inet_aton.c	memcmp.c	mktime.c	\
+	myrealloc.c	putenv.c	realpath.c	stpcpy.c	\
+	stpncpy.c	strcasecmp.c	strncasecmp.c	strcspn.c	\
+	strdup.c	strerror.c	strftime.c	strcspn.c	\
+	strstr.c	strtol.c	strtoul.c
 
 noinst_HEADERS = \
 	error.h		fnmatch.h	glob.h				\
diff --git a/misc/basename.c b/misc/basename.c
new file mode 100644
index 0000000..7fea76e
--- /dev/null
+++ b/misc/basename.c
@@ -0,0 +1,13 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+
+char *
+basename(const char *file)
+{
+	char *fn = strrchr(file, '/');
+	return fn ? fn+1 : (char *)file;
+}
diff --git a/po/rpm.pot b/po/rpm.pot
index 6721587..88211ca 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -2,12 +2,12 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: ../rpm.c:177 ../rpm.c:261
+#: ../rpm.c:174 ../rpm.c:258
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-13 18:59-0500\n"
+"POT-Creation-Date: 1999-03-16 13:56-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -70,7 +70,7 @@ msgstr ""
 msgid "override build root"
 msgstr ""
 
-#: ../build.c:266 ../rpm.c:450
+#: ../build.c:266 ../rpm.c:447
 msgid "remove build tree when done"
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr ""
 msgid "remove sources and specfile when done"
 msgstr ""
 
-#: ../build.c:274 ../rpm.c:448
+#: ../build.c:274 ../rpm.c:445
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
@@ -175,32 +175,32 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ../convertdb.c:37
+#: ../convertdb.c:38
 msgid "RPM database already exists"
 msgstr ""
 
-#: ../convertdb.c:42
+#: ../convertdb.c:43
 msgid "Old db is missing"
 msgstr ""
 
-#: ../convertdb.c:53
+#: ../convertdb.c:54
 msgid "failed to create RPM database /var/lib/rpm"
 msgstr ""
 
-#: ../convertdb.c:59
+#: ../convertdb.c:60
 msgid "Old db is corrupt"
 msgstr ""
 
-#: ../convertdb.c:68
+#: ../convertdb.c:69
 #, c-format
 msgid "oldrpmdbGetPackageInfo failed &olddb = %p olddb.packages = %p\n"
 msgstr ""
 
-#: ../convertdb.c:200
+#: ../convertdb.c:201
 msgid "rpmconvert: no arguments expected"
 msgstr ""
 
-#: ../convertdb.c:206
+#: ../convertdb.c:207
 msgid "rpmconvert 1.0 - converting database in /var/lib/rpm\n"
 msgstr ""
 
@@ -374,1043 +374,1043 @@ msgstr ""
 msgid "no copyright!\n"
 msgstr ""
 
-#: ../rpm.c:154
+#: ../rpm.c:151
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: ../rpm.c:165
+#: ../rpm.c:162
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: ../rpm.c:169
+#: ../rpm.c:166
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: ../rpm.c:170
+#: ../rpm.c:167
 msgid ""
 "This may be freely redistributed under the terms of the GNU Public License"
 msgstr ""
 
-#: ../rpm.c:179
+#: ../rpm.c:176
 msgid "usage: rpm {--help}"
 msgstr ""
 
-#: ../rpm.c:180
+#: ../rpm.c:177
 msgid "       rpm {--version}"
 msgstr ""
 
-#: ../rpm.c:181
+#: ../rpm.c:178
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:182
+#: ../rpm.c:179
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: ../rpm.c:183
+#: ../rpm.c:180
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: ../rpm.c:184
+#: ../rpm.c:181
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:185
+#: ../rpm.c:182
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:186
+#: ../rpm.c:183
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: ../rpm.c:187
+#: ../rpm.c:184
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 
-#: ../rpm.c:188 ../rpm.c:197 ../rpm.c:206
+#: ../rpm.c:185 ../rpm.c:194 ../rpm.c:203
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: ../rpm.c:189 ../rpm.c:199
+#: ../rpm.c:186 ../rpm.c:196
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: ../rpm.c:190
+#: ../rpm.c:187
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: ../rpm.c:191
+#: ../rpm.c:188
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: ../rpm.c:192
+#: ../rpm.c:189
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: ../rpm.c:193
+#: ../rpm.c:190
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:194
+#: ../rpm.c:191
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:195
+#: ../rpm.c:192
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: ../rpm.c:196
+#: ../rpm.c:193
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: ../rpm.c:198
+#: ../rpm.c:195
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: ../rpm.c:200
+#: ../rpm.c:197
 msgid ""
 "                        [--badreloc] [--excludepath <path>] file1.rpm ..."
 msgstr ""
 
-#: ../rpm.c:201
+#: ../rpm.c:198
 msgid "                        fileN.rpm"
 msgstr ""
 
-#: ../rpm.c:202
+#: ../rpm.c:199
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: ../rpm.c:203
+#: ../rpm.c:200
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:204
+#: ../rpm.c:201
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: ../rpm.c:205
+#: ../rpm.c:202
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 
-#: ../rpm.c:207
+#: ../rpm.c:204
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: ../rpm.c:208
+#: ../rpm.c:205
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: ../rpm.c:209
+#: ../rpm.c:206
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:210
+#: ../rpm.c:207
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:211
+#: ../rpm.c:208
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: ../rpm.c:212
+#: ../rpm.c:209
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: ../rpm.c:213
+#: ../rpm.c:210
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: ../rpm.c:214
+#: ../rpm.c:211
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:215
+#: ../rpm.c:212
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: ../rpm.c:216
+#: ../rpm.c:213
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr ""
 
-#: ../rpm.c:217
+#: ../rpm.c:214
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 
-#: ../rpm.c:218
+#: ../rpm.c:215
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr ""
 
-#: ../rpm.c:219
+#: ../rpm.c:216
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: ../rpm.c:220
+#: ../rpm.c:217
 msgid "                        [--rmsource] specfile"
 msgstr ""
 
-#: ../rpm.c:221
+#: ../rpm.c:218
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr ""
 
-#: ../rpm.c:222
+#: ../rpm.c:219
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: ../rpm.c:223
+#: ../rpm.c:220
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: ../rpm.c:224
+#: ../rpm.c:221
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: ../rpm.c:225
+#: ../rpm.c:222
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: ../rpm.c:226
+#: ../rpm.c:223
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:227
+#: ../rpm.c:224
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: ../rpm.c:228
+#: ../rpm.c:225
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:229
+#: ../rpm.c:226
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: ../rpm.c:263
+#: ../rpm.c:260
 msgid "usage:"
 msgstr ""
 
-#: ../rpm.c:265
+#: ../rpm.c:262
 msgid "print this message"
 msgstr ""
 
-#: ../rpm.c:267
+#: ../rpm.c:264
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: ../rpm.c:268
+#: ../rpm.c:265
 msgid "   all modes support the following arguments:"
 msgstr ""
 
-#: ../rpm.c:269
+#: ../rpm.c:266
 msgid "      --rcfile <file>     "
 msgstr ""
 
-#: ../rpm.c:270
+#: ../rpm.c:267
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: ../rpm.c:272
+#: ../rpm.c:269
 msgid "be a little more verbose"
 msgstr ""
 
-#: ../rpm.c:274
+#: ../rpm.c:271
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: ../rpm.c:276
+#: ../rpm.c:273
 msgid "query mode"
 msgstr ""
 
-#: ../rpm.c:277 ../rpm.c:339 ../rpm.c:401 ../rpm.c:429
+#: ../rpm.c:274 ../rpm.c:336 ../rpm.c:398 ../rpm.c:426
 msgid "      --root <dir>        "
 msgstr ""
 
-#: ../rpm.c:278 ../rpm.c:340 ../rpm.c:402 ../rpm.c:430 ../rpm.c:492
+#: ../rpm.c:275 ../rpm.c:337 ../rpm.c:399 ../rpm.c:427 ../rpm.c:489
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: ../rpm.c:279 ../rpm.c:337 ../rpm.c:367 ../rpm.c:417 ../rpm.c:489
+#: ../rpm.c:276 ../rpm.c:334 ../rpm.c:364 ../rpm.c:414 ../rpm.c:486
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: ../rpm.c:280 ../rpm.c:338 ../rpm.c:368 ../rpm.c:418 ../rpm.c:490
+#: ../rpm.c:277 ../rpm.c:335 ../rpm.c:365 ../rpm.c:415 ../rpm.c:487
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: ../rpm.c:281
+#: ../rpm.c:278
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: ../rpm.c:282
+#: ../rpm.c:279
 msgid "use <qfmt> as the header format (implies -i)"
 msgstr ""
 
-#: ../rpm.c:283
+#: ../rpm.c:280
 msgid ""
 "   install, upgrade and query (with -p) allow ftp URL's to be used in place"
 msgstr ""
 
-#: ../rpm.c:284
+#: ../rpm.c:281
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: ../rpm.c:285
+#: ../rpm.c:282
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: ../rpm.c:286
+#: ../rpm.c:283
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: ../rpm.c:287
+#: ../rpm.c:284
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: ../rpm.c:288
+#: ../rpm.c:285
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: ../rpm.c:289
+#: ../rpm.c:286
 msgid "      --httpproxy <host>   "
 msgstr ""
 
-#: ../rpm.c:290
+#: ../rpm.c:287
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: ../rpm.c:291
+#: ../rpm.c:288
 msgid "      --httpport <port>    "
 msgstr ""
 
-#: ../rpm.c:292
+#: ../rpm.c:289
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: ../rpm.c:293
+#: ../rpm.c:290
 msgid "      Package specification options:"
 msgstr ""
 
-#: ../rpm.c:295
+#: ../rpm.c:292
 msgid "query all packages"
 msgstr ""
 
-#: ../rpm.c:296
+#: ../rpm.c:293
 msgid "        -f <file>+        "
 msgstr ""
 
-#: ../rpm.c:297
+#: ../rpm.c:294
 msgid "query package owning <file>"
 msgstr ""
 
-#: ../rpm.c:298
+#: ../rpm.c:295
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: ../rpm.c:299
+#: ../rpm.c:296
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: ../rpm.c:300
+#: ../rpm.c:297
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: ../rpm.c:301
+#: ../rpm.c:298
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: ../rpm.c:302
+#: ../rpm.c:299
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: ../rpm.c:303
+#: ../rpm.c:300
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: ../rpm.c:304
+#: ../rpm.c:301
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: ../rpm.c:305
+#: ../rpm.c:302
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: ../rpm.c:306
+#: ../rpm.c:303
 msgid "      Information selection options:"
 msgstr ""
 
-#: ../rpm.c:308
+#: ../rpm.c:305
 msgid "display package information"
 msgstr ""
 
-#: ../rpm.c:310
+#: ../rpm.c:307
 msgid "display the package's change log"
 msgstr ""
 
-#: ../rpm.c:312
+#: ../rpm.c:309
 msgid "display package file list"
 msgstr ""
 
-#: ../rpm.c:314
+#: ../rpm.c:311
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: ../rpm.c:316
+#: ../rpm.c:313
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: ../rpm.c:318
+#: ../rpm.c:315
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: ../rpm.c:320
+#: ../rpm.c:317
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: ../rpm.c:322
+#: ../rpm.c:319
 msgid "list capabilities package provides"
 msgstr ""
 
-#: ../rpm.c:323
+#: ../rpm.c:320
 msgid "        --requires"
 msgstr ""
 
-#: ../rpm.c:325
+#: ../rpm.c:322
 msgid "list package dependencies"
 msgstr ""
 
-#: ../rpm.c:327
+#: ../rpm.c:324
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: ../rpm.c:329
+#: ../rpm.c:326
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: ../rpm.c:333
+#: ../rpm.c:330
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: ../rpm.c:334
+#: ../rpm.c:331
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: ../rpm.c:336
+#: ../rpm.c:333
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: ../rpm.c:342 ../rpm.c:388 ../rpm.c:422
+#: ../rpm.c:339 ../rpm.c:385 ../rpm.c:419
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: ../rpm.c:344
+#: ../rpm.c:341
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: ../rpm.c:346
+#: ../rpm.c:343
 msgid "do not verify file attributes"
 msgstr ""
 
-#: ../rpm.c:349
+#: ../rpm.c:346
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: ../rpm.c:352
+#: ../rpm.c:349
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: ../rpm.c:356
+#: ../rpm.c:353
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: ../rpm.c:357
+#: ../rpm.c:354
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: ../rpm.c:358
+#: ../rpm.c:355
 msgid "install package"
 msgstr ""
 
-#: ../rpm.c:359
+#: ../rpm.c:356
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: ../rpm.c:360
+#: ../rpm.c:357
 msgid "skip files in path <path>"
 msgstr ""
 
-#: ../rpm.c:361
+#: ../rpm.c:358
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: ../rpm.c:362
+#: ../rpm.c:359
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: ../rpm.c:364
+#: ../rpm.c:361
 msgid "relocate files even though the package doesn't allow it"
 msgstr ""
 
-#: ../rpm.c:365
+#: ../rpm.c:362
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: ../rpm.c:366
+#: ../rpm.c:363
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: ../rpm.c:370
+#: ../rpm.c:367
 msgid "do not install documentation"
 msgstr ""
 
-#: ../rpm.c:372
+#: ../rpm.c:369
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: ../rpm.c:375
+#: ../rpm.c:372
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: ../rpm.c:377
+#: ../rpm.c:374
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: ../rpm.c:380
+#: ../rpm.c:377
 msgid "don't verify package architecture"
 msgstr ""
 
-#: ../rpm.c:382
+#: ../rpm.c:379
 msgid "don't verify package operating system"
 msgstr ""
 
-#: ../rpm.c:384
+#: ../rpm.c:381
 msgid "install documentation"
 msgstr ""
 
-#: ../rpm.c:386 ../rpm.c:420
+#: ../rpm.c:383 ../rpm.c:417
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: ../rpm.c:390 ../rpm.c:424
+#: ../rpm.c:387 ../rpm.c:421
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: ../rpm.c:392
+#: ../rpm.c:389
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: ../rpm.c:394 ../rpm.c:428
+#: ../rpm.c:391 ../rpm.c:425
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: ../rpm.c:396
+#: ../rpm.c:393
 msgid "print percentages as package installs"
 msgstr ""
 
-#: ../rpm.c:398
+#: ../rpm.c:395
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: ../rpm.c:400
+#: ../rpm.c:397
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: ../rpm.c:404
+#: ../rpm.c:401
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: ../rpm.c:406
+#: ../rpm.c:403
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: ../rpm.c:407
+#: ../rpm.c:404
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: ../rpm.c:408
+#: ../rpm.c:405
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: ../rpm.c:410
+#: ../rpm.c:407
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: ../rpm.c:412
+#: ../rpm.c:409
 msgid "    --erase <package>"
 msgstr ""
 
-#: ../rpm.c:414
+#: ../rpm.c:411
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: ../rpm.c:416
+#: ../rpm.c:413
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: ../rpm.c:426
+#: ../rpm.c:423
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: ../rpm.c:432
+#: ../rpm.c:429
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: ../rpm.c:433
+#: ../rpm.c:430
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: ../rpm.c:434
+#: ../rpm.c:431
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: ../rpm.c:436
+#: ../rpm.c:433
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: ../rpm.c:438
+#: ../rpm.c:435
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: ../rpm.c:440
+#: ../rpm.c:437
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: ../rpm.c:442
+#: ../rpm.c:439
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: ../rpm.c:444
+#: ../rpm.c:441
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: ../rpm.c:446
+#: ../rpm.c:443
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: ../rpm.c:452
+#: ../rpm.c:449
 msgid "remove sources and spec file when done"
 msgstr ""
 
-#: ../rpm.c:454
+#: ../rpm.c:451
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: ../rpm.c:455
+#: ../rpm.c:452
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: ../rpm.c:456
+#: ../rpm.c:453
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: ../rpm.c:457
+#: ../rpm.c:454
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: ../rpm.c:458
+#: ../rpm.c:455
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: ../rpm.c:460
+#: ../rpm.c:457
 msgid "do not execute any stages"
 msgstr ""
 
-#: ../rpm.c:461
+#: ../rpm.c:458
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: ../rpm.c:462
+#: ../rpm.c:459
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: ../rpm.c:464
+#: ../rpm.c:461
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: ../rpm.c:465
+#: ../rpm.c:462
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: ../rpm.c:466
+#: ../rpm.c:463
 msgid "    --rmsource <spec>     "
 msgstr ""
 
-#: ../rpm.c:467
+#: ../rpm.c:464
 msgid "remove sources and spec file"
 msgstr ""
 
-#: ../rpm.c:468
+#: ../rpm.c:465
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: ../rpm.c:469
+#: ../rpm.c:466
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: ../rpm.c:470
+#: ../rpm.c:467
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: ../rpm.c:471
+#: ../rpm.c:468
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: ../rpm.c:472
+#: ../rpm.c:469
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: ../rpm.c:473
+#: ../rpm.c:470
 msgid "add a signature to a package"
 msgstr ""
 
-#: ../rpm.c:475
+#: ../rpm.c:472
 msgid "    --checksig <pkg>+     "
 msgstr ""
 
-#: ../rpm.c:476
+#: ../rpm.c:473
 msgid "verify package signature"
 msgstr ""
 
-#: ../rpm.c:478
+#: ../rpm.c:475
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: ../rpm.c:480
+#: ../rpm.c:477
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: ../rpm.c:482
+#: ../rpm.c:479
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: ../rpm.c:484
+#: ../rpm.c:481
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: ../rpm.c:486
+#: ../rpm.c:483
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: ../rpm.c:488
+#: ../rpm.c:485
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: ../rpm.c:620 ../rpm.c:626 ../rpm.c:633 ../rpm.c:639 ../rpm.c:648
-#: ../rpm.c:655 ../rpm.c:702 ../rpm.c:708 ../rpm.c:772 ../rpm.c:780
-#: ../rpm.c:787 ../rpm.c:796 ../rpm.c:803 ../rpm.c:811 ../rpm.c:838
-#: ../rpm.c:890 ../rpm.c:897
+#: ../rpm.c:617 ../rpm.c:623 ../rpm.c:630 ../rpm.c:636 ../rpm.c:645
+#: ../rpm.c:652 ../rpm.c:699 ../rpm.c:705 ../rpm.c:769 ../rpm.c:777
+#: ../rpm.c:784 ../rpm.c:793 ../rpm.c:800 ../rpm.c:808 ../rpm.c:835
+#: ../rpm.c:887 ../rpm.c:894
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: ../rpm.c:641
+#: ../rpm.c:638
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: ../rpm.c:643
+#: ../rpm.c:640
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: ../rpm.c:659
+#: ../rpm.c:656
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 
-#: ../rpm.c:663
+#: ../rpm.c:660
 msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 
-#: ../rpm.c:715 ../rpm.c:722 ../rpm.c:730 ../rpm.c:738 ../rpm.c:748
-#: ../rpm.c:756 ../rpm.c:764 ../rpm.c:904
+#: ../rpm.c:712 ../rpm.c:719 ../rpm.c:727 ../rpm.c:735 ../rpm.c:745
+#: ../rpm.c:753 ../rpm.c:761 ../rpm.c:901
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: ../rpm.c:819
+#: ../rpm.c:816
 msgid "arguments to --dbpath must begin with a /"
 msgstr ""
 
-#: ../rpm.c:844
+#: ../rpm.c:841
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: ../rpm.c:846
+#: ../rpm.c:843
 msgid "relocations must contain a ="
 msgstr ""
 
-#: ../rpm.c:849
+#: ../rpm.c:846
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: ../rpm.c:858
+#: ../rpm.c:855
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: ../rpm.c:867
+#: ../rpm.c:864
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: ../rpm.c:917
+#: ../rpm.c:914
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: ../rpm.c:922
+#: ../rpm.c:919
 msgid "--timecheck may only be used during package builds"
 msgstr ""
 
-#: ../rpm.c:925 ../rpm.c:928
+#: ../rpm.c:922 ../rpm.c:925
 msgid "unexpected query specifiers"
 msgstr ""
 
-#: ../rpm.c:932
+#: ../rpm.c:929
 msgid "unexpected query source"
 msgstr ""
 
-#: ../rpm.c:937
+#: ../rpm.c:934
 msgid "only installation, upgrading and rmsource may be forced"
 msgstr ""
 
-#: ../rpm.c:940
+#: ../rpm.c:937
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: ../rpm.c:943
+#: ../rpm.c:940
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: ../rpm.c:946
+#: ../rpm.c:943
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: ../rpm.c:949
+#: ../rpm.c:946
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: ../rpm.c:952
+#: ../rpm.c:949
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: ../rpm.c:955
+#: ../rpm.c:952
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:959
+#: ../rpm.c:956
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:963
+#: ../rpm.c:960
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:967
+#: ../rpm.c:964
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:971
+#: ../rpm.c:968
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:975
+#: ../rpm.c:972
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:979
+#: ../rpm.c:976
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: ../rpm.c:983
+#: ../rpm.c:980
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:987
+#: ../rpm.c:984
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:991
+#: ../rpm.c:988
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: ../rpm.c:995
+#: ../rpm.c:992
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:999
+#: ../rpm.c:996
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: ../rpm.c:1004
+#: ../rpm.c:1001
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: ../rpm.c:1008
+#: ../rpm.c:1005
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: ../rpm.c:1013
+#: ../rpm.c:1010
 msgid ""
 "--nodeps may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: ../rpm.c:1017
+#: ../rpm.c:1014
 msgid "--nofiles may only be specified during package verification"
 msgstr ""
 
-#: ../rpm.c:1022
+#: ../rpm.c:1019
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: ../rpm.c:1027
+#: ../rpm.c:1024
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: ../rpm.c:1032
+#: ../rpm.c:1029
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: ../rpm.c:1036
+#: ../rpm.c:1033
 msgid "--clean may only be used with -b and -t"
 msgstr ""
 
-#: ../rpm.c:1039
+#: ../rpm.c:1036
 msgid "--rmsource may only be used with -b and -t"
 msgstr ""
 
-#: ../rpm.c:1042
+#: ../rpm.c:1039
 msgid "--short-circuit may only be used during package building"
 msgstr ""
 
-#: ../rpm.c:1046
+#: ../rpm.c:1043
 msgid "--short-circuit may only be used with -bc, -bi, -bs, -tc -ti, or -ts"
 msgstr ""
 
-#: ../rpm.c:1052
+#: ../rpm.c:1049
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: ../rpm.c:1057
+#: ../rpm.c:1054
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 
-#: ../rpm.c:1063
+#: ../rpm.c:1060
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr ""
 
-#: ../rpm.c:1067
+#: ../rpm.c:1064
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: ../rpm.c:1070
+#: ../rpm.c:1067
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: ../rpm.c:1073
+#: ../rpm.c:1070
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: ../rpm.c:1103
+#: ../rpm.c:1100
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: ../rpm.c:1117
+#: ../rpm.c:1114
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: ../rpm.c:1120
+#: ../rpm.c:1117
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: ../rpm.c:1132
+#: ../rpm.c:1129
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: ../rpm.c:1148
+#: ../rpm.c:1145
 msgid "exec failed\n"
 msgstr ""
 
-#: ../rpm.c:1167
+#: ../rpm.c:1164
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: ../rpm.c:1178
+#: ../rpm.c:1175
 msgid "no packages given for signature check"
 msgstr ""
 
-#: ../rpm.c:1186
+#: ../rpm.c:1183
 msgid "no packages given for signing"
 msgstr ""
 
-#: ../rpm.c:1195
+#: ../rpm.c:1192
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: ../rpm.c:1252
+#: ../rpm.c:1249
 msgid "no spec files given for build"
 msgstr ""
 
-#: ../rpm.c:1254
+#: ../rpm.c:1251
 msgid "no tar files given for build"
 msgstr ""
 
-#: ../rpm.c:1267
+#: ../rpm.c:1264
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: ../rpm.c:1315
+#: ../rpm.c:1312
 msgid "no packages given for install"
 msgstr ""
 
-#: ../rpm.c:1337
+#: ../rpm.c:1334
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: ../rpm.c:1343
+#: ../rpm.c:1340
 msgid "no arguments given for query"
 msgstr ""
 
-#: ../rpm.c:1361
+#: ../rpm.c:1358
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -2152,11 +2152,11 @@ msgstr ""
 msgid "Timecheck value must be an integer: %s"
 msgstr ""
 
-#: ../build/parseSpec.c:410
+#: ../build/parseSpec.c:406
 msgid "No buildable architectures"
 msgstr ""
 
-#: ../build/parseSpec.c:450
+#: ../build/parseSpec.c:451
 msgid "Package has no %%description: %s"
 msgstr ""
 
@@ -2389,92 +2389,92 @@ msgstr ""
 msgid "source package expected, binary found"
 msgstr ""
 
-#: ../lib/install.c:156 ../lib/uninstall.c:111
+#: ../lib/install.c:155 ../lib/uninstall.c:111
 #, c-format
 msgid "   file: %s action: %s\n"
 msgstr ""
 
-#: ../lib/install.c:173
+#: ../lib/install.c:172
 #, c-format
 msgid "user %s does not exist - using root"
 msgstr ""
 
-#: ../lib/install.c:181
+#: ../lib/install.c:180
 #, c-format
 msgid "group %s does not exist - using root"
 msgstr ""
 
-#: ../lib/install.c:205
+#: ../lib/install.c:204
 msgid "instchangelog value in rpmrc should be a number, but isn't"
 msgstr ""
 
-#: ../lib/install.c:271
+#: ../lib/install.c:270
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: ../lib/install.c:329
+#: ../lib/install.c:328
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: ../lib/install.c:334
+#: ../lib/install.c:333
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: ../lib/install.c:364
+#: ../lib/install.c:363
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: ../lib/install.c:400
+#: ../lib/install.c:399
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: ../lib/install.c:404 ../lib/install.c:741 ../lib/uninstall.c:337
+#: ../lib/install.c:403 ../lib/install.c:740 ../lib/uninstall.c:337
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: ../lib/install.c:487
+#: ../lib/install.c:486
 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:595
+#: ../lib/install.c:594
 #, c-format
 msgid "unpacking of archive failed%s%s: %s"
 msgstr ""
 
-#: ../lib/install.c:596
+#: ../lib/install.c:595
 msgid " on file "
 msgstr ""
 
-#: ../lib/install.c:635
+#: ../lib/install.c:634
 msgid "installing a source package\n"
 msgstr ""
 
-#: ../lib/install.c:641 ../lib/install.c:647
+#: ../lib/install.c:640 ../lib/install.c:646
 #, c-format
 msgid "cannot write to %s"
 msgstr ""
 
-#: ../lib/install.c:652
+#: ../lib/install.c:651
 #, c-format
 msgid "sources in: %s\n"
 msgstr ""
 
-#: ../lib/install.c:653
+#: ../lib/install.c:652
 #, c-format
 msgid "spec file in: %s\n"
 msgstr ""
 
-#: ../lib/install.c:686 ../lib/install.c:718
+#: ../lib/install.c:685 ../lib/install.c:717
 msgid "source package contains no .spec file"
 msgstr ""
 
-#: ../lib/install.c:739
+#: ../lib/install.c:738
 #, c-format
 msgid "renaming %s to %s\n"
 msgstr ""
@@ -3006,12 +3006,12 @@ msgstr ""
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: ../lib/rpmrc.c:1214
+#: ../lib/rpmrc.c:1210
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: ../lib/rpmrc.c:1215
+#: ../lib/rpmrc.c:1211
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""
 
@@ -3137,17 +3137,17 @@ msgstr ""
 msgid "Invalid signature spec in rc file"
 msgstr ""
 
-#: ../lib/transaction.c:721
+#: ../lib/transaction.c:722
 #, c-format
 msgid "relocating %s to %s\n"
 msgstr ""
 
-#: ../lib/transaction.c:727
+#: ../lib/transaction.c:728
 #, c-format
 msgid "excluding %s\n"
 msgstr ""
 
-#: ../lib/transaction.c:815
+#: ../lib/transaction.c:816
 #, c-format
 msgid "%s skipped due to missingok flag\n"
 msgstr ""
diff --git a/rpm.c b/rpm.c
index ebd3e9d..b3b84cc 100755
--- a/rpm.c
+++ b/rpm.c
@@ -147,9 +147,6 @@ static struct poptOption optionsTable[] = {
  { 0, 0, 0, 0, 0,	NULL, NULL }
 };
 
-
-static void argerror(char * desc);
-
 static void argerror(char * desc) {
     fprintf(stderr, _("rpm: %s\n"), desc);
     exit(EXIT_FAILURE);
@@ -508,8 +505,8 @@ int main(int argc, char ** argv) {
     char * cookie = NULL;
     char * optArg;
     pid_t pipeChild = 0;
-    char * pkg;
-    char * errString;
+    const char * pkg;
+    char * errString = NULL;
     poptContext optCon;
     char * infoCommand[] = { "--info", NULL };
     char * installCommand[] = { "--install", NULL };
@@ -1093,7 +1090,7 @@ int main(int argc, char ** argv) {
     if (signIt) {
         if (bigMode == MODE_REBUILD || bigMode == MODE_BUILD ||
 	    bigMode == MODE_RESIGN || bigMode == MODE_TARBUILD) {
-	    char ** argv;
+	    const char ** argv;
 	    struct stat sb;
 	    int errors = 0;
 
diff --git a/rpm.spec b/rpm.spec
index c82ea87..6acface 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 2.92
 Version: %{version}
-Release: 8
+Release: 9
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -58,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc RPM-PGP-KEY CHANGES groups
+%doc RPM-PGP-KEY CHANGES GROUPS
 %doc docs/*
 /bin/rpm
 /usr/bin/rpm2cpio
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index accef67..6d75fbb 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -48,9 +48,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -192,7 +193,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -221,7 +222,7 @@ uninstall: uninstall-am
 all-am: Makefile $(SCRIPTS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(configdir)
 
diff --git a/tools/rpmgettext.c b/tools/rpmgettext.c
index 27c3020..832152b 100644
--- a/tools/rpmgettext.c
+++ b/tools/rpmgettext.c
@@ -42,13 +42,6 @@ int gentran = 0;
 
 int specedit = 0;
 
-static inline char *
-basename(const char *file)
-{
-	char *fn = strrchr(file, '/');
-	return fn ? fn+1 : (char *)file;
-}
-
 static const char *
 getTagString(int tval)
 {
-- 
2.7.4