fix: avoid segfault using --prefix until ewt fixes.

add --define "%foo %bar" option.
dump macros to same fd as --showrc uses.
add %GNUconfigure for full-blown package regeneration.
fix: RPM_ARCH/RPM_OS had wrong values.
fix: create ppc directories correctly.

CVS patchset: 2922
CVS date: 1999/03/28 00:47:40

1 files changed, 307 insertions, 294 deletions

diff --git a/po/rpm.pot b/po/rpm.pot
index 5643b75b5..296d28dfc 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:176 ../rpm.c:260
+#: ../rpm.c:179 ../rpm.c:263
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-27 12:31-0500\n"
+"POT-Creation-Date: 1999-03-27 18:14-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:270 ../rpm.c:449
+#: ../build.c:270 ../rpm.c:454
 msgid "remove build tree when done"
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr ""
 msgid "remove sources and specfile when done"
 msgstr ""
 
-#: ../build.c:278 ../rpm.c:447
+#: ../build.c:278 ../rpm.c:452
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
@@ -382,1063 +382,1076 @@ msgstr ""
 msgid "no copyright!\n"
 msgstr ""
 
-#: ../rpm.c:153
+#: ../rpm.c:156
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: ../rpm.c:164
+#: ../rpm.c:167
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: ../rpm.c:168
+#: ../rpm.c:171
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: ../rpm.c:169
+#: ../rpm.c:172
 msgid ""
 "This may be freely redistributed under the terms of the GNU Public License"
 msgstr ""
 
-#: ../rpm.c:178
+#: ../rpm.c:181
 msgid "usage: rpm {--help}"
 msgstr ""
 
-#: ../rpm.c:179
+#: ../rpm.c:182
 msgid "       rpm {--version}"
 msgstr ""
 
-#: ../rpm.c:180
+#: ../rpm.c:183
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:181
+#: ../rpm.c:184
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: ../rpm.c:182
+#: ../rpm.c:185
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: ../rpm.c:183
+#: ../rpm.c:186
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:184
+#: ../rpm.c:187
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:185
+#: ../rpm.c:188
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: ../rpm.c:186
+#: ../rpm.c:189
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 
-#: ../rpm.c:187 ../rpm.c:196 ../rpm.c:205
+#: ../rpm.c:190 ../rpm.c:199 ../rpm.c:208
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: ../rpm.c:188 ../rpm.c:198
+#: ../rpm.c:191 ../rpm.c:201
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: ../rpm.c:189
+#: ../rpm.c:192
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: ../rpm.c:190
+#: ../rpm.c:193
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: ../rpm.c:191
+#: ../rpm.c:194
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: ../rpm.c:192
+#: ../rpm.c:195
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:193
+#: ../rpm.c:196
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:194
+#: ../rpm.c:197
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: ../rpm.c:195
+#: ../rpm.c:198
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: ../rpm.c:197
+#: ../rpm.c:200
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: ../rpm.c:199
+#: ../rpm.c:202
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: ../rpm.c:200
+#: ../rpm.c:203
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: ../rpm.c:201
+#: ../rpm.c:204
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: ../rpm.c:202
+#: ../rpm.c:205
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:203
+#: ../rpm.c:206
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: ../rpm.c:204
+#: ../rpm.c:207
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 
-#: ../rpm.c:206
+#: ../rpm.c:209
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: ../rpm.c:207
+#: ../rpm.c:210
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: ../rpm.c:208
+#: ../rpm.c:211
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:209
+#: ../rpm.c:212
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: ../rpm.c:210
+#: ../rpm.c:213
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: ../rpm.c:211
+#: ../rpm.c:214
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: ../rpm.c:212
+#: ../rpm.c:215
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: ../rpm.c:213
+#: ../rpm.c:216
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:214
+#: ../rpm.c:217
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: ../rpm.c:215
+#: ../rpm.c:218
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr ""
 
-#: ../rpm.c:216
+#: ../rpm.c:219
 msgid ""
 "       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
 msgstr ""
 
-#: ../rpm.c:217
+#: ../rpm.c:220
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr ""
 
-#: ../rpm.c:218
+#: ../rpm.c:221
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: ../rpm.c:219
+#: ../rpm.c:222
 msgid "                        [--rmsource] specfile"
 msgstr ""
 
-#: ../rpm.c:220
+#: ../rpm.c:223
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr ""
 
-#: ../rpm.c:221
+#: ../rpm.c:224
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: ../rpm.c:222
+#: ../rpm.c:225
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: ../rpm.c:223
+#: ../rpm.c:226
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: ../rpm.c:224
+#: ../rpm.c:227
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: ../rpm.c:225
+#: ../rpm.c:228
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: ../rpm.c:226
+#: ../rpm.c:229
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: ../rpm.c:227
+#: ../rpm.c:230
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: ../rpm.c:228
+#: ../rpm.c:231
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: ../rpm.c:262
+#: ../rpm.c:265
 msgid "usage:"
 msgstr ""
 
-#: ../rpm.c:264
+#: ../rpm.c:267
 msgid "print this message"
 msgstr ""
 
-#: ../rpm.c:266
+#: ../rpm.c:269
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: ../rpm.c:267
+#: ../rpm.c:270
 msgid "   all modes support the following arguments:"
 msgstr ""
 
-#: ../rpm.c:268
+#: ../rpm.c:271
 msgid "      --rcfile <file>     "
 msgstr ""
 
-#: ../rpm.c:269
+#: ../rpm.c:272
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: ../rpm.c:271
+#: ../rpm.c:274
 msgid "be a little more verbose"
 msgstr ""
 
-#: ../rpm.c:273
+#: ../rpm.c:276
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: ../rpm.c:275
+#: ../rpm.c:278
 msgid "query mode"
 msgstr ""
 
-#: ../rpm.c:276 ../rpm.c:338 ../rpm.c:400 ../rpm.c:428
+#: ../rpm.c:279 ../rpm.c:341 ../rpm.c:405 ../rpm.c:433
 msgid "      --root <dir>        "
 msgstr ""
 
-#: ../rpm.c:277 ../rpm.c:339 ../rpm.c:401 ../rpm.c:429 ../rpm.c:491
+#: ../rpm.c:280 ../rpm.c:342 ../rpm.c:406 ../rpm.c:434 ../rpm.c:496
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: ../rpm.c:278 ../rpm.c:336 ../rpm.c:366 ../rpm.c:416 ../rpm.c:488
+#: ../rpm.c:281 ../rpm.c:339 ../rpm.c:369 ../rpm.c:421 ../rpm.c:493
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: ../rpm.c:279 ../rpm.c:337 ../rpm.c:367 ../rpm.c:417 ../rpm.c:489
+#: ../rpm.c:282 ../rpm.c:340 ../rpm.c:370 ../rpm.c:422 ../rpm.c:494
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: ../rpm.c:280
+#: ../rpm.c:283
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: ../rpm.c:281
+#: ../rpm.c:284
 msgid "use <qfmt> as the header format (implies -i)"
 msgstr ""
 
-#: ../rpm.c:282
+#: ../rpm.c:285
 msgid ""
 "   install, upgrade and query (with -p) allow ftp URL's to be used in place"
 msgstr ""
 
-#: ../rpm.c:283
+#: ../rpm.c:286
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: ../rpm.c:284
+#: ../rpm.c:287
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: ../rpm.c:285
+#: ../rpm.c:288
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: ../rpm.c:286
+#: ../rpm.c:289
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: ../rpm.c:287
+#: ../rpm.c:290
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: ../rpm.c:288
+#: ../rpm.c:291
 msgid "      --httpproxy <host>   "
 msgstr ""
 
-#: ../rpm.c:289
+#: ../rpm.c:292
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: ../rpm.c:290
+#: ../rpm.c:293
 msgid "      --httpport <port>    "
 msgstr ""
 
-#: ../rpm.c:291
+#: ../rpm.c:294
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: ../rpm.c:292
+#: ../rpm.c:295
 msgid "      Package specification options:"
 msgstr ""
 
-#: ../rpm.c:294
+#: ../rpm.c:297
 msgid "query all packages"
 msgstr ""
 
-#: ../rpm.c:295
+#: ../rpm.c:298
 msgid "        -f <file>+        "
 msgstr ""
 
-#: ../rpm.c:296
+#: ../rpm.c:299
 msgid "query package owning <file>"
 msgstr ""
 
-#: ../rpm.c:297
+#: ../rpm.c:300
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: ../rpm.c:298
+#: ../rpm.c:301
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: ../rpm.c:299
+#: ../rpm.c:302
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: ../rpm.c:300
+#: ../rpm.c:303
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: ../rpm.c:301
+#: ../rpm.c:304
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: ../rpm.c:302
+#: ../rpm.c:305
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: ../rpm.c:303
+#: ../rpm.c:306
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: ../rpm.c:304
+#: ../rpm.c:307
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: ../rpm.c:305
+#: ../rpm.c:308
 msgid "      Information selection options:"
 msgstr ""
 
-#: ../rpm.c:307
+#: ../rpm.c:310
 msgid "display package information"
 msgstr ""
 
-#: ../rpm.c:309
+#: ../rpm.c:312
 msgid "display the package's change log"
 msgstr ""
 
-#: ../rpm.c:311
+#: ../rpm.c:314
 msgid "display package file list"
 msgstr ""
 
-#: ../rpm.c:313
+#: ../rpm.c:316
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: ../rpm.c:315
+#: ../rpm.c:318
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: ../rpm.c:317
+#: ../rpm.c:320
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: ../rpm.c:319
+#: ../rpm.c:322
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: ../rpm.c:321
+#: ../rpm.c:324
 msgid "list capabilities package provides"
 msgstr ""
 
-#: ../rpm.c:322
+#: ../rpm.c:325
 msgid "        --requires"
 msgstr ""
 
-#: ../rpm.c:324
+#: ../rpm.c:327
 msgid "list package dependencies"
 msgstr ""
 
-#: ../rpm.c:326
+#: ../rpm.c:329
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: ../rpm.c:328
+#: ../rpm.c:331
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: ../rpm.c:332
+#: ../rpm.c:335
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: ../rpm.c:333
+#: ../rpm.c:336
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: ../rpm.c:335
+#: ../rpm.c:338
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: ../rpm.c:341 ../rpm.c:387 ../rpm.c:421
+#: ../rpm.c:344 ../rpm.c:392 ../rpm.c:426
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: ../rpm.c:343
+#: ../rpm.c:346
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: ../rpm.c:345
+#: ../rpm.c:348
 msgid "do not verify file attributes"
 msgstr ""
 
-#: ../rpm.c:348
+#: ../rpm.c:351
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: ../rpm.c:351
+#: ../rpm.c:354
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: ../rpm.c:355
+#: ../rpm.c:358
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: ../rpm.c:356
+#: ../rpm.c:359
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: ../rpm.c:357
+#: ../rpm.c:360
 msgid "install package"
 msgstr ""
 
-#: ../rpm.c:358
+#: ../rpm.c:361
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: ../rpm.c:359
+#: ../rpm.c:362
 msgid "skip files in path <path>"
 msgstr ""
 
-#: ../rpm.c:360
+#: ../rpm.c:363
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: ../rpm.c:361
+#: ../rpm.c:364
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: ../rpm.c:363
+#: ../rpm.c:366
 msgid "relocate files even though the package doesn't allow it"
 msgstr ""
 
-#: ../rpm.c:364
+#: ../rpm.c:367
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: ../rpm.c:365
+#: ../rpm.c:368
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: ../rpm.c:369
+#: ../rpm.c:372
 msgid "do not install documentation"
 msgstr ""
 
-#: ../rpm.c:371
+#: ../rpm.c:374
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: ../rpm.c:374
+#: ../rpm.c:377
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: ../rpm.c:376
+#: ../rpm.c:379
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: ../rpm.c:379
+#: ../rpm.c:382
 msgid "don't verify package architecture"
 msgstr ""
 
-#: ../rpm.c:381
+#: ../rpm.c:384
+msgid "don't check disk space before installing"
+msgstr ""
+
+#: ../rpm.c:386
 msgid "don't verify package operating system"
 msgstr ""
 
-#: ../rpm.c:383
+#: ../rpm.c:388
 msgid "install documentation"
 msgstr ""
 
-#: ../rpm.c:385 ../rpm.c:419
+#: ../rpm.c:390 ../rpm.c:424
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: ../rpm.c:389 ../rpm.c:423
+#: ../rpm.c:394 ../rpm.c:428
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: ../rpm.c:391
+#: ../rpm.c:396
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: ../rpm.c:393 ../rpm.c:427
+#: ../rpm.c:398 ../rpm.c:432
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: ../rpm.c:395
+#: ../rpm.c:400
 msgid "print percentages as package installs"
 msgstr ""
 
-#: ../rpm.c:397
+#: ../rpm.c:402
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: ../rpm.c:399
+#: ../rpm.c:404
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: ../rpm.c:403
+#: ../rpm.c:408
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: ../rpm.c:405
+#: ../rpm.c:410
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: ../rpm.c:406
+#: ../rpm.c:411
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: ../rpm.c:407
+#: ../rpm.c:412
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: ../rpm.c:409
+#: ../rpm.c:414
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: ../rpm.c:411
+#: ../rpm.c:416
 msgid "    --erase <package>"
 msgstr ""
 
-#: ../rpm.c:413
+#: ../rpm.c:418
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: ../rpm.c:415
+#: ../rpm.c:420
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: ../rpm.c:425
+#: ../rpm.c:430
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: ../rpm.c:431
+#: ../rpm.c:436
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: ../rpm.c:432
+#: ../rpm.c:437
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: ../rpm.c:433
+#: ../rpm.c:438
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: ../rpm.c:435
+#: ../rpm.c:440
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: ../rpm.c:437
+#: ../rpm.c:442
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: ../rpm.c:439
+#: ../rpm.c:444
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: ../rpm.c:441
+#: ../rpm.c:446
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: ../rpm.c:443
+#: ../rpm.c:448
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: ../rpm.c:445
+#: ../rpm.c:450
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: ../rpm.c:451
+#: ../rpm.c:456
 msgid "remove sources and spec file when done"
 msgstr ""
 
-#: ../rpm.c:453
+#: ../rpm.c:458
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: ../rpm.c:454
+#: ../rpm.c:459
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: ../rpm.c:455
+#: ../rpm.c:460
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: ../rpm.c:456
+#: ../rpm.c:461
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: ../rpm.c:457
+#: ../rpm.c:462
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: ../rpm.c:459
+#: ../rpm.c:464
 msgid "do not execute any stages"
 msgstr ""
 
-#: ../rpm.c:460
+#: ../rpm.c:465
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: ../rpm.c:461
+#: ../rpm.c:466
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: ../rpm.c:463
+#: ../rpm.c:468
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: ../rpm.c:464
+#: ../rpm.c:469
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: ../rpm.c:465
+#: ../rpm.c:470
 msgid "    --rmsource <spec>     "
 msgstr ""
 
-#: ../rpm.c:466
+#: ../rpm.c:471
 msgid "remove sources and spec file"
 msgstr ""
 
-#: ../rpm.c:467
+#: ../rpm.c:472
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: ../rpm.c:468
+#: ../rpm.c:473
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: ../rpm.c:469
+#: ../rpm.c:474
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: ../rpm.c:470
+#: ../rpm.c:475
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: ../rpm.c:471
+#: ../rpm.c:476
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: ../rpm.c:472
+#: ../rpm.c:477
 msgid "add a signature to a package"
 msgstr ""
 
-#: ../rpm.c:474
+#: ../rpm.c:479
 msgid "    --checksig <pkg>+     "
 msgstr ""
 
-#: ../rpm.c:475
+#: ../rpm.c:480
 msgid "verify package signature"
 msgstr ""
 
-#: ../rpm.c:477
+#: ../rpm.c:482
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: ../rpm.c:479
+#: ../rpm.c:484
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: ../rpm.c:481
+#: ../rpm.c:486
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: ../rpm.c:483
+#: ../rpm.c:488
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: ../rpm.c:485
+#: ../rpm.c:490
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: ../rpm.c:487
+#: ../rpm.c:492
 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:836
-#: ../rpm.c:888 ../rpm.c:895
+#: ../rpm.c:625 ../rpm.c:631 ../rpm.c:638 ../rpm.c:644 ../rpm.c:653
+#: ../rpm.c:660 ../rpm.c:707 ../rpm.c:713 ../rpm.c:777 ../rpm.c:785
+#: ../rpm.c:792 ../rpm.c:801 ../rpm.c:808 ../rpm.c:816 ../rpm.c:849
+#: ../rpm.c:901 ../rpm.c:908
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: ../rpm.c:641
+#: ../rpm.c:646
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: ../rpm.c:643
+#: ../rpm.c:648
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: ../rpm.c:659
+#: ../rpm.c:664
 msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
 msgstr ""
 
-#: ../rpm.c:663
+#: ../rpm.c:668
 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:902
+#: ../rpm.c:720 ../rpm.c:727 ../rpm.c:735 ../rpm.c:743 ../rpm.c:753
+#: ../rpm.c:761 ../rpm.c:769 ../rpm.c:915
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: ../rpm.c:819
+#: ../rpm.c:824
 msgid "arguments to --dbpath must begin with a /"
 msgstr ""
 
-#: ../rpm.c:842
+#. XXX FIXME
+#: ../rpm.c:834
+msgid "--prefix is broke, use --relocate /oldpath=/newpath instead"
+msgstr ""
+
+#: ../rpm.c:855
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: ../rpm.c:844
+#: ../rpm.c:857
 msgid "relocations must contain a ="
 msgstr ""
 
-#: ../rpm.c:847
+#: ../rpm.c:860
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: ../rpm.c:856
+#: ../rpm.c:869
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: ../rpm.c:865
+#: ../rpm.c:878
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: ../rpm.c:915
+#: ../rpm.c:928
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: ../rpm.c:920
+#: ../rpm.c:933
 msgid "--timecheck may only be used during package builds"
 msgstr ""
 
-#: ../rpm.c:923 ../rpm.c:926
+#: ../rpm.c:936 ../rpm.c:939
 msgid "unexpected query specifiers"
 msgstr ""
 
-#: ../rpm.c:930
+#: ../rpm.c:943
 msgid "unexpected query source"
 msgstr ""
 
-#: ../rpm.c:935
+#: ../rpm.c:948
 msgid "only installation, upgrading and rmsource may be forced"
 msgstr ""
 
-#: ../rpm.c:938
+#: ../rpm.c:951
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: ../rpm.c:941
+#: ../rpm.c:954
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: ../rpm.c:944
+#: ../rpm.c:957
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: ../rpm.c:947
+#: ../rpm.c:960
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: ../rpm.c:950
+#: ../rpm.c:963
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: ../rpm.c:953
+#: ../rpm.c:966
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:957
+#: ../rpm.c:970
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:961
+#: ../rpm.c:974
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:965
+#: ../rpm.c:978
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:969
+#: ../rpm.c:982
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:973
+#: ../rpm.c:986
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:977
+#: ../rpm.c:990
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: ../rpm.c:981
+#: ../rpm.c:994
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:985 ../rpm.c:989
+#: ../rpm.c:998
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:993
+#: ../rpm.c:1002
+msgid "--ignoresize may only be specified during package installation"
+msgstr ""
+
+#: ../rpm.c:1006
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: ../rpm.c:997
+#: ../rpm.c:1010
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: ../rpm.c:1001
+#: ../rpm.c:1014
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: ../rpm.c:1006
+#: ../rpm.c:1019
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: ../rpm.c:1010
+#: ../rpm.c:1023
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: ../rpm.c:1015
+#: ../rpm.c:1028
 msgid ""
 "--nodeps may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: ../rpm.c:1019
+#: ../rpm.c:1032
 msgid "--nofiles may only be specified during package verification"
 msgstr ""
 
-#: ../rpm.c:1024
+#: ../rpm.c:1037
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: ../rpm.c:1029
+#: ../rpm.c:1042
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: ../rpm.c:1034
+#: ../rpm.c:1047
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: ../rpm.c:1038
+#: ../rpm.c:1051
 msgid "--clean may only be used with -b and -t"
 msgstr ""
 
-#: ../rpm.c:1041
+#: ../rpm.c:1054
 msgid "--rmsource may only be used with -b and -t"
 msgstr ""
 
-#: ../rpm.c:1044
+#: ../rpm.c:1057
 msgid "--short-circuit may only be used during package building"
 msgstr ""
 
-#: ../rpm.c:1048
+#: ../rpm.c:1061
 msgid "--short-circuit may only be used with -bc, -bi, -bs, -tc -ti, or -ts"
 msgstr ""
 
-#: ../rpm.c:1054
+#: ../rpm.c:1067
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: ../rpm.c:1059
+#: ../rpm.c:1072
 msgid ""
 "ftp options can only be used during package queries, installs, and upgrades"
 msgstr ""
 
-#: ../rpm.c:1065
+#: ../rpm.c:1078
 msgid ""
 "http options can only be used during package queries, installs, and upgrades"
 msgstr ""
 
-#: ../rpm.c:1069
+#: ../rpm.c:1082
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: ../rpm.c:1072
+#: ../rpm.c:1085
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: ../rpm.c:1075
+#: ../rpm.c:1088
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: ../rpm.c:1101
+#: ../rpm.c:1114
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: ../rpm.c:1118
+#: ../rpm.c:1131
 msgid "pgp not found: "
 msgstr ""
 
-#: ../rpm.c:1121
+#: ../rpm.c:1134
 msgid "Use `%%_signature pgp5' instead of `%%_signature pgp' in macro file.\n"
 msgstr ""
 
-#: ../rpm.c:1128
+#: ../rpm.c:1141
 msgid "pgp version 5 not found: "
 msgstr ""
 
-#: ../rpm.c:1131
+#: ../rpm.c:1144
 msgid "Use `%%_signature pgp' instead of `%%_signature pgp5' in macro file.\n"
 msgstr ""
 
-#: ../rpm.c:1138
+#: ../rpm.c:1151
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: ../rpm.c:1141
+#: ../rpm.c:1154
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: ../rpm.c:1148
+#: ../rpm.c:1161
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: ../rpm.c:1153
+#: ../rpm.c:1166
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: ../rpm.c:1170
+#: ../rpm.c:1183
 msgid "exec failed\n"
 msgstr ""
 
-#: ../rpm.c:1189
+#: ../rpm.c:1202
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: ../rpm.c:1200
+#: ../rpm.c:1213
 msgid "no packages given for signature check"
 msgstr ""
 
-#: ../rpm.c:1208
+#: ../rpm.c:1221
 msgid "no packages given for signing"
 msgstr ""
 
-#: ../rpm.c:1217
+#: ../rpm.c:1230
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: ../rpm.c:1274
+#: ../rpm.c:1287
 msgid "no spec files given for build"
 msgstr ""
 
-#: ../rpm.c:1276
+#: ../rpm.c:1289
 msgid "no tar files given for build"
 msgstr ""
 
-#: ../rpm.c:1289
+#: ../rpm.c:1302
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: ../rpm.c:1338
+#: ../rpm.c:1351
 msgid "no packages given for install"
 msgstr ""
 
-#: ../rpm.c:1360
+#: ../rpm.c:1373
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: ../rpm.c:1366
+#: ../rpm.c:1379
 msgid "no arguments given for query"
 msgstr ""
 
-#: ../rpm.c:1384
+#: ../rpm.c:1397
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -1450,32 +1463,32 @@ msgstr ""
 msgid "error reading header from package\n"
 msgstr ""
 
-#: ../url.c:139
+#: ../url.c:136
 #, c-format
 msgid "Password for %s@%s: "
 msgstr ""
 
-#: ../url.c:163 ../url.c:189
+#: ../url.c:160 ../url.c:186
 #, c-format
 msgid "error: %sport must be a number\n"
 msgstr ""
 
-#: ../url.c:274
+#: ../url.c:271
 msgid "url port must be a number\n"
 msgstr ""
 
 #. XXX PARANOIA
-#: ../url.c:311
+#: ../url.c:308
 #, c-format
 msgid "logging into %s as %s, pw %s\n"
 msgstr ""
 
-#: ../lib/rpmdb.c:168 ../url.c:425
+#: ../lib/rpmdb.c:168 ../url.c:422
 #, c-format
 msgid "failed to open %s\n"
 msgstr ""
 
-#: ../url.c:440
+#: ../url.c:437
 #, c-format
 msgid "failed to create %s\n"
 msgstr ""
@@ -2513,83 +2526,83 @@ msgstr ""
 msgid "cannot read header at %d for lookup"
 msgstr ""
 
-#: ../lib/macro.c:114
+#: ../lib/macro.c:119
 #, c-format
 msgid "======================== active %d empty %d\n"
 msgstr ""
 
 #. XXX just in case
-#: ../lib/macro.c:201
+#: ../lib/macro.c:206
 #, c-format
 msgid "%3d>%*s(empty)"
 msgstr ""
 
-#: ../lib/macro.c:236
+#: ../lib/macro.c:241
 #, c-format
 msgid "%3d<%*s(empty)\n"
 msgstr ""
 
-#: ../lib/macro.c:409
+#: ../lib/macro.c:414
 msgid "Macro %%%s has unterminated body"
 msgstr ""
 
-#: ../lib/macro.c:435
+#: ../lib/macro.c:440
 msgid "Macro %%%s has illegal name (%%define)"
 msgstr ""
 
-#: ../lib/macro.c:441
+#: ../lib/macro.c:446
 msgid "Macro %%%s has unterminated opts"
 msgstr ""
 
-#: ../lib/macro.c:446
+#: ../lib/macro.c:451
 msgid "Macro %%%s has empty body"
 msgstr ""
 
-#: ../lib/macro.c:451
+#: ../lib/macro.c:456
 msgid "Macro %%%s failed to expand"
 msgstr ""
 
-#: ../lib/macro.c:476
+#: ../lib/macro.c:481
 msgid "Macro %%%s has illegal name (%%undefine)"
 msgstr ""
 
-#: ../lib/macro.c:549
+#: ../lib/macro.c:554
 msgid "Macro %%%s (%s) was not used below level %d"
 msgstr ""
 
-#: ../lib/macro.c:631
+#: ../lib/macro.c:636
 #, c-format
 msgid "Unknown option %c in %s(%s)"
 msgstr ""
 
-#: ../lib/macro.c:793
+#: ../lib/macro.c:798
 #, c-format
 msgid "Recursion depth(%d) greater than max(%d)"
 msgstr ""
 
-#: ../lib/macro.c:849 ../lib/macro.c:865
+#: ../lib/macro.c:854 ../lib/macro.c:870
 #, c-format
 msgid "Unterminated %c: %s"
 msgstr ""
 
-#: ../lib/macro.c:894
+#: ../lib/macro.c:899
 msgid "Empty token"
 msgstr ""
 
-#: ../lib/macro.c:1016
+#: ../lib/macro.c:1021
 msgid "Macro %%%.*s not found, skipping"
 msgstr ""
 
-#: ../lib/macro.c:1088
+#: ../lib/macro.c:1097
 msgid "Target buffer overflow"
 msgstr ""
 
-#: ../lib/macro.c:1208 ../lib/macro.c:1216
+#: ../lib/macro.c:1225 ../lib/macro.c:1233
 #, c-format
 msgid "File %s: %s"
 msgstr ""
 
-#: ../lib/macro.c:1219
+#: ../lib/macro.c:1236
 #, c-format
 msgid "File %s is smaller than %d bytes"
 msgstr ""
@@ -2991,57 +3004,57 @@ msgstr ""
 msgid "Too many args in default line at %s:%d"
 msgstr ""
 
-#: ../lib/rpmrc.c:651
+#: ../lib/rpmrc.c:568
 #, c-format
 msgid "Cannot expand %s"
 msgstr ""
 
-#: ../lib/rpmrc.c:666
+#: ../lib/rpmrc.c:583
 #, c-format
 msgid "Unable to open %s for reading: %s."
 msgstr ""
 
-#: ../lib/rpmrc.c:700
+#: ../lib/rpmrc.c:617
 #, c-format
 msgid "Failed to read %s: %s."
 msgstr ""
 
-#: ../lib/rpmrc.c:731
+#: ../lib/rpmrc.c:648
 #, c-format
 msgid "missing ':' at %s:%d"
 msgstr ""
 
-#: ../lib/rpmrc.c:747 ../lib/rpmrc.c:795
+#: ../lib/rpmrc.c:664 ../lib/rpmrc.c:712
 #, c-format
 msgid "missing argument for %s at %s:%d"
 msgstr ""
 
-#: ../lib/rpmrc.c:761
+#: ../lib/rpmrc.c:678
 #, c-format
 msgid "expansion failed at %s:%d \"%s\""
 msgstr ""
 
-#: ../lib/rpmrc.c:767
+#: ../lib/rpmrc.c:684
 #, c-format
 msgid "cannot open %s at %s:%d"
 msgstr ""
 
-#: ../lib/rpmrc.c:785
+#: ../lib/rpmrc.c:702
 #, c-format
 msgid "missing architecture for %s at %s:%d"
 msgstr ""
 
-#: ../lib/rpmrc.c:852
+#: ../lib/rpmrc.c:769
 #, c-format
 msgid "bad option '%s' at %s:%d"
 msgstr ""
 
-#: ../lib/rpmrc.c:1205
+#: ../lib/rpmrc.c:1122
 #, c-format
 msgid "Unknown system: %s\n"
 msgstr ""
 
-#: ../lib/rpmrc.c:1206
+#: ../lib/rpmrc.c:1123
 msgid "Please contact rpm-list@redhat.com\n"
 msgstr ""