Remove build modes from rpm, use rpmb and/or popt glue instead.

CVS patchset: 3754
CVS date: 2000/05/26 18:51:11

1 files changed, 375 insertions, 354 deletions

diff --git a/po/rpm.pot b/po/rpm.pot
index 3481d920c..8a29a11bc 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-24 13:46-0400\n"
+"POT-Creation-Date: 2000-05-26 14:39-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"
@@ -65,59 +65,107 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: build.c:349
+#: build.c:386
 msgid "buildroot already specified"
 msgstr ""
 
-#: build.c:356
-msgid "--buildarch has been obsoleted.  Use the --target option instead.\n"
+#: build.c:412
+msgid "build through %%prep stage from spec file"
 msgstr ""
 
-#: build.c:360
-msgid "--buildos has been obsoleted.  Use the --target option instead.\n"
+#: build.c:414
+msgid "build through %%build stage from spec file"
 msgstr ""
 
-#: build.c:382
-msgid "override build architecture"
+#: build.c:416
+msgid "build through %%install stage from spec file"
 msgstr ""
 
-#: build.c:384
-msgid "override build operating system"
+#: build.c:418
+msgid "verify %%files section from spec file"
 msgstr ""
 
-#: build.c:386
+#: build.c:420
+msgid "build source and binary package from spec file"
+msgstr ""
+
+#: build.c:422
+msgid "build binary package from spec file"
+msgstr ""
+
+#: build.c:424
+msgid "build source package from spec file"
+msgstr ""
+
+#: build.c:427
+msgid "build through %%prep stage from tar ball"
+msgstr ""
+
+#: build.c:429
+msgid "build through %%build stage from tar ball"
+msgstr ""
+
+#: build.c:431
+msgid "build through %%install stage from tar ball"
+msgstr ""
+
+#: build.c:433
+msgid "verify %%files section from tar ball"
+msgstr ""
+
+#: build.c:435
+msgid "build source and binary package from tar ball"
+msgstr ""
+
+#: build.c:437
+msgid "build binary package from tar ball"
+msgstr ""
+
+#: build.c:439
+msgid "build source package from tar ball"
+msgstr ""
+
+#: build.c:442
+msgid "build binary package from source package"
+msgstr ""
+
+#: build.c:444
+msgid "build through %%install stage from source package"
+msgstr ""
+
+#: build.c:447
 msgid "override build root"
 msgstr ""
 
-#: build.c:388 rpm.c:514
+#: build.c:449 rpm.c:485
 msgid "remove build tree when done"
 msgstr ""
 
-#: build.c:390
+#: build.c:451
 msgid "do not execute any stages of the build"
 msgstr ""
 
-#: build.c:392
+#: build.c:453
 msgid "do not accept I18N msgstr's from specfile"
 msgstr ""
 
-#: build.c:394 rpm.c:516
+#: build.c:455 rpm.c:487
 msgid "remove sources when done"
 msgstr ""
 
-#: build.c:396
+#: build.c:457
 msgid "remove specfile when done"
 msgstr ""
 
-#: build.c:398 rpm.c:512
+#: build.c:459 rpm.c:483
 msgid "skip straight to specified stage (only for c,i)"
 msgstr ""
 
-#: build.c:400
+#: build.c:461
 msgid "override target platform"
 msgstr ""
 
-#: build.c:402
+#: build.c:463
 msgid "lookup I18N strings in specfile catalog"
 msgstr ""
 
@@ -163,1067 +211,1025 @@ msgstr ""
 msgid "no copyright!\n"
 msgstr ""
 
-#: rpm.c:211
+#: rpm.c:182
 #, c-format
 msgid "rpm: %s\n"
 msgstr ""
 
-#: rpm.c:222
+#: rpm.c:193
 #, c-format
 msgid "RPM version %s\n"
 msgstr ""
 
-#: rpm.c:226
+#: rpm.c:197
 msgid "Copyright (C) 1998 - Red Hat Software"
 msgstr ""
 
-#: rpm.c:227
+#: rpm.c:198
 msgid "This may be freely redistributed under the terms of the GNU GPL"
 msgstr ""
 
-#: rpm.c:235
+#: rpm.c:206
 msgid "Usage: rpm {--help}"
 msgstr ""
 
-#: rpm.c:236
+#: rpm.c:207
 msgid "       rpm {--version}"
 msgstr ""
 
-#: rpm.c:237
+#: rpm.c:208
 msgid "       rpm {--initdb}   [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:238
+#: rpm.c:209
 msgid ""
 "       rpm {--install -i} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:239
+#: rpm.c:210
 msgid "                        [--replacepkgs] [--replacefiles] [--root <dir>]"
 msgstr ""
 
-#: rpm.c:240
+#: rpm.c:211
 msgid "                        [--excludedocs] [--includedocs] [--noscripts]"
 msgstr ""
 
-#: rpm.c:241
+#: rpm.c:212
 msgid ""
 "                        [--rcfile <file>] [--ignorearch] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:242
+#: rpm.c:213
 msgid ""
 "                        [--prefix <dir>] [--ignoreos] [--nodeps] [--allfiles]"
 msgstr ""
 
-#: rpm.c:243
+#: rpm.c:214
 msgid ""
 "                        [--ftpproxy <host>] [--ftpport <port>] [--justdb]"
 msgstr ""
 
-#: rpm.c:244 rpm.c:253 rpm.c:262
+#: rpm.c:215 rpm.c:224 rpm.c:233
 msgid "                        [--httpproxy <host>] [--httpport <port>] "
 msgstr ""
 
-#: rpm.c:245 rpm.c:255
+#: rpm.c:216 rpm.c:226
 msgid "                        [--noorder] [--relocate oldpath=newpath]"
 msgstr ""
 
-#: rpm.c:246
+#: rpm.c:217
 msgid ""
 "                        [--badreloc] [--notriggers] [--excludepath <path>]"
 msgstr ""
 
-#: rpm.c:247
+#: rpm.c:218
 msgid "                        [--ignoresize] file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:248
+#: rpm.c:219
 msgid ""
 "       rpm {--upgrade -U} [-v] [--hash -h] [--percent] [--force] [--test]"
 msgstr ""
 
-#: rpm.c:249
+#: rpm.c:220
 msgid "                        [--oldpackage] [--root <dir>] [--noscripts]"
 msgstr ""
 
-#: rpm.c:250
+#: rpm.c:221
 msgid ""
 "                        [--excludedocs] [--includedocs] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:251
+#: rpm.c:222
 msgid ""
 "                        [--ignorearch]  [--dbpath <dir>] [--prefix <dir>] "
 msgstr ""
 
-#: rpm.c:252
+#: rpm.c:223
 msgid "                        [--ftpproxy <host>] [--ftpport <port>]"
 msgstr ""
 
-#: rpm.c:254
+#: rpm.c:225
 msgid "                        [--ignoreos] [--nodeps] [--allfiles] [--justdb]"
 msgstr ""
 
-#: rpm.c:256
+#: rpm.c:227
 msgid ""
 "                        [--badreloc] [--excludepath <path>] [--ignoresize]"
 msgstr ""
 
-#: rpm.c:257
+#: rpm.c:228
 msgid "                        file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:258
+#: rpm.c:229
 msgid "       rpm {--query -q} [-afpg] [-i] [-l] [-s] [-d] [-c] [-v] [-R]"
 msgstr ""
 
-#: rpm.c:259
+#: rpm.c:230
 msgid "                        [--scripts] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:260
+#: rpm.c:231
 msgid "                        [--whatprovides] [--whatrequires] [--requires]"
 msgstr ""
 
-#: rpm.c:261
+#: rpm.c:232
 msgid ""
 "                        [--triggeredby] [--ftpuseport] [--ftpproxy <host>]"
 msgstr ""
 
-#: rpm.c:263
+#: rpm.c:234
 msgid ""
 "                        [--ftpport <port>] [--provides] [--triggers] [--dump]"
 msgstr ""
 
-#: rpm.c:264
+#: rpm.c:235
 msgid "                        [--changelog] [--dbpath <dir>] [targets]"
 msgstr ""
 
-#: rpm.c:265
+#: rpm.c:236
 msgid "       rpm {--verify -V -y} [-afpg] [--root <dir>] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:266
+#: rpm.c:237
 msgid ""
 "                        [--dbpath <dir>] [--nodeps] [--nofiles] [--noscripts]"
 msgstr ""
 
-#: rpm.c:267
+#: rpm.c:238
 msgid "                        [--nomd5] [targets]"
 msgstr ""
 
-#: rpm.c:268
+#: rpm.c:239
 msgid "       rpm {--setperms} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:269
+#: rpm.c:240
 msgid "       rpm {--setugids} [-afpg] [target]"
 msgstr ""
 
-#: rpm.c:270
+#: rpm.c:241
 msgid "       rpm {--freshen -F} file1.rpm ... fileN.rpm"
 msgstr ""
 
-#: rpm.c:271
+#: rpm.c:242
 msgid "       rpm {--erase -e} [--root <dir>] [--noscripts] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:272
+#: rpm.c:243
 msgid "                        [--dbpath <dir>] [--nodeps] [--allmatches]"
 msgstr ""
 
-#: rpm.c:273
+#: rpm.c:244
 msgid ""
 "                        [--justdb] [--notriggers] rpackage1 ... packageN"
 msgstr ""
 
-#: rpm.c:274
+#: rpm.c:245
 msgid ""
-"       rpm {-b|t}[plciba] [-v] [--short-circuit] [--clean] [--rcfile  <file>]"
+"       rpm {-b|t}[plcibas] [-v] [--short-circuit] [--clean] [--rcfile  "
+"<file>]"
 msgstr ""
 
-#: rpm.c:275
+#: rpm.c:246
 msgid "                        [--sign] [--nobuild] [--timecheck <s>] ]"
 msgstr ""
 
-#: rpm.c:276
+#: rpm.c:247
 msgid "                        [--target=platform1[,platform2...]]"
 msgstr ""
 
-#: rpm.c:277
+#: rpm.c:248
 msgid "                        [--rmsource] [--rmspec] specfile"
 msgstr ""
 
-#: rpm.c:278
+#: rpm.c:249
 msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
 msgstr ""
 
-#: rpm.c:279
+#: rpm.c:250
 msgid ""
 "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: rpm.c:280
+#: rpm.c:251
 msgid ""
 "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
 msgstr ""
 
-#: rpm.c:281
+#: rpm.c:252
 msgid "       rpm {--resign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:282
+#: rpm.c:253
 msgid "       rpm {--addsign} [--rcfile <file>] package1 package2 ... packageN"
 msgstr ""
 
-#: rpm.c:283
+#: rpm.c:254
 msgid ""
 "       rpm {--checksig -K} [--nopgp] [--nogpg] [--nomd5] [--rcfile <file>]"
 msgstr ""
 
-#: rpm.c:284
+#: rpm.c:255
 msgid "                           package1 ... packageN"
 msgstr ""
 
-#: rpm.c:285
+#: rpm.c:256
 msgid "       rpm {--rebuilddb} [--rcfile <file>] [--dbpath <dir>]"
 msgstr ""
 
-#: rpm.c:286
+#: rpm.c:257
 msgid "       rpm {--querytags}"
 msgstr ""
 
-#: rpm.c:320
+#: rpm.c:291
 msgid "Usage:"
 msgstr ""
 
-#: rpm.c:322
+#: rpm.c:293
 msgid "print this message"
 msgstr ""
 
-#: rpm.c:324
+#: rpm.c:295
 msgid "print the version of rpm being used"
 msgstr ""
 
-#: rpm.c:327
+#: rpm.c:298
 msgid "   All modes support the following arguments:"
 msgstr ""
 
-#: rpm.c:328
+#: rpm.c:299
 msgid "    --define '<name> <body>'"
 msgstr ""
 
-#: rpm.c:329
+#: rpm.c:300
 msgid "define macro <name> with value <body>"
 msgstr ""
 
-#: rpm.c:330
+#: rpm.c:301
 msgid "    --eval '<name>+'      "
 msgstr ""
 
-#: rpm.c:331
+#: rpm.c:302
 msgid "print the expansion of macro <name> to stdout"
 msgstr ""
 
-#: rpm.c:332
+#: rpm.c:303
 msgid "    --pipe <cmd>          "
 msgstr ""
 
-#: rpm.c:333
+#: rpm.c:304
 msgid "send stdout to <cmd>"
 msgstr ""
 
-#: rpm.c:334
+#: rpm.c:305
 msgid "    --rcfile <file>       "
 msgstr ""
 
-#: rpm.c:335
+#: rpm.c:306
 msgid "use <file> instead of /etc/rpmrc and $HOME/.rpmrc"
 msgstr ""
 
-#: rpm.c:337
+#: rpm.c:308
 msgid "display final rpmrc and macro configuration"
 msgstr ""
 
-#: rpm.c:339
+#: rpm.c:310
 msgid "be a little more verbose"
 msgstr ""
 
-#: rpm.c:341
+#: rpm.c:312
 msgid "be incredibly verbose (for debugging)"
 msgstr ""
 
-#: rpm.c:344
+#: rpm.c:315
 msgid "   Install, upgrade and query (with -p) allow URL's to be used in place"
 msgstr ""
 
-#: rpm.c:345
+#: rpm.c:316
 msgid "   of file names as well as the following options:"
 msgstr ""
 
-#: rpm.c:346
+#: rpm.c:317
 msgid "      --ftpproxy <host>   "
 msgstr ""
 
-#: rpm.c:347
+#: rpm.c:318
 msgid "hostname or IP of ftp proxy"
 msgstr ""
 
-#: rpm.c:348
+#: rpm.c:319
 msgid "      --ftpport <port>    "
 msgstr ""
 
-#: rpm.c:349
+#: rpm.c:320
 msgid "port number of ftp server (or proxy)"
 msgstr ""
 
-#: rpm.c:350
+#: rpm.c:321
 msgid "      --httpproxy <host>  "
 msgstr ""
 
-#: rpm.c:351
+#: rpm.c:322
 msgid "hostname or IP of http proxy"
 msgstr ""
 
-#: rpm.c:352
+#: rpm.c:323
 msgid "      --httpport <port>   "
 msgstr ""
 
-#: rpm.c:353
+#: rpm.c:324
 msgid "port number of http server (or proxy)"
 msgstr ""
 
-#: rpm.c:357
+#: rpm.c:328
 msgid "query mode"
 msgstr ""
 
-#: rpm.c:358 rpm.c:404 rpm.c:429 rpm.c:481 rpm.c:555
+#: rpm.c:329 rpm.c:375 rpm.c:400 rpm.c:452 rpm.c:526
 msgid "      --dbpath <dir>      "
 msgstr ""
 
-#: rpm.c:359 rpm.c:405 rpm.c:430 rpm.c:482 rpm.c:556
+#: rpm.c:330 rpm.c:376 rpm.c:401 rpm.c:453 rpm.c:527
 msgid "use <dir> as the directory for the database"
 msgstr ""
 
-#: rpm.c:360
+#: rpm.c:331
 msgid "      --queryformat <qfmt>"
 msgstr ""
 
-#: rpm.c:361
+#: rpm.c:332
 msgid "use <qfmt> as the header format (implies --info)"
 msgstr ""
 
-#: rpm.c:362 rpm.c:406 rpm.c:464 rpm.c:493
+#: rpm.c:333 rpm.c:377 rpm.c:435 rpm.c:464
 msgid "      --root <dir>        "
 msgstr ""
 
-#: rpm.c:363 rpm.c:407 rpm.c:465 rpm.c:494 rpm.c:558
+#: rpm.c:334 rpm.c:378 rpm.c:436 rpm.c:465 rpm.c:529
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpm.c:364
+#: rpm.c:335
 msgid "      Package specification options:"
 msgstr ""
 
-#: rpm.c:366
+#: rpm.c:337
 msgid "query all packages"
 msgstr ""
 
-#: rpm.c:367
+#: rpm.c:338
 msgid "        -f <file>+        "
 msgstr ""
 
-#: rpm.c:368
+#: rpm.c:339
 msgid "query package owning <file>"
 msgstr ""
 
-#: rpm.c:369
+#: rpm.c:340
 msgid "        -p <packagefile>+ "
 msgstr ""
 
-#: rpm.c:370
+#: rpm.c:341
 msgid "query (uninstalled) package <packagefile>"
 msgstr ""
 
-#: rpm.c:371
+#: rpm.c:342
 msgid "        --triggeredby <pkg>"
 msgstr ""
 
-#: rpm.c:372
+#: rpm.c:343
 msgid "query packages triggered by <pkg>"
 msgstr ""
 
-#: rpm.c:373
+#: rpm.c:344
 msgid "        --whatprovides <cap>"
 msgstr ""
 
-#: rpm.c:374
+#: rpm.c:345
 msgid "query packages which provide <cap> capability"
 msgstr ""
 
-#: rpm.c:375
+#: rpm.c:346
 msgid "        --whatrequires <cap>"
 msgstr ""
 
-#: rpm.c:376
+#: rpm.c:347
 msgid "query packages which require <cap> capability"
 msgstr ""
 
-#: rpm.c:377
+#: rpm.c:348
 msgid "      Information selection options:"
 msgstr ""
 
-#: rpm.c:379
+#: rpm.c:350
 msgid "display package information"
 msgstr ""
 
-#: rpm.c:381
+#: rpm.c:352
 msgid "display the package's change log"
 msgstr ""
 
-#: rpm.c:383
+#: rpm.c:354
 msgid "display package file list"
 msgstr ""
 
-#: rpm.c:385
+#: rpm.c:356
 msgid "show file states (implies -l)"
 msgstr ""
 
-#: rpm.c:387
+#: rpm.c:358
 msgid "list only documentation files (implies -l)"
 msgstr ""
 
-#: rpm.c:389
+#: rpm.c:360
 msgid "list only configuration files (implies -l)"
 msgstr ""
 
-#: rpm.c:391
+#: rpm.c:362
 msgid ""
 "show all verifiable information for each file (must be used with -l, -c, or "
 "-d)"
 msgstr ""
 
-#: rpm.c:393
+#: rpm.c:364
 msgid "list capabilities package provides"
 msgstr ""
 
-#: rpm.c:395
+#: rpm.c:366
 msgid "list package dependencies"
 msgstr ""
 
-#: rpm.c:397
+#: rpm.c:368
 msgid "print the various [un]install scripts"
 msgstr ""
 
-#: rpm.c:399
+#: rpm.c:370
 msgid "show the trigger scripts contained in the package"
 msgstr ""
 
-#: rpm.c:403
+#: rpm.c:374
 msgid ""
 "verify a package installation using the same same package specification "
 "options as -q"
 msgstr ""
 
-#: rpm.c:409 rpm.c:451 rpm.c:486
+#: rpm.c:380 rpm.c:422 rpm.c:457
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: rpm.c:411
+#: rpm.c:382
 msgid "do not verify file md5 checksums"
 msgstr ""
 
-#: rpm.c:413
+#: rpm.c:384
 msgid "do not verify file attributes"
 msgstr ""
 
-#: rpm.c:415
+#: rpm.c:386
 msgid "list the tags that can be used in a query format"
 msgstr ""
 
-#: rpm.c:418
+#: rpm.c:389
 msgid "    --install <packagefile>"
 msgstr ""
 
-#: rpm.c:419
+#: rpm.c:390
 msgid "    -i <packagefile>      "
 msgstr ""
 
-#: rpm.c:420
+#: rpm.c:391
 msgid "install package"
 msgstr ""
 
-#: rpm.c:421
+#: rpm.c:392
 msgid "      --excludepath <path>"
 msgstr ""
 
-#: rpm.c:422
+#: rpm.c:393
 msgid "skip files in path <path>"
 msgstr ""
 
-#: rpm.c:423
+#: rpm.c:394
 msgid "      --relocate <oldpath>=<newpath>"
 msgstr ""
 
-#: rpm.c:424
+#: rpm.c:395
 msgid "relocate files from <oldpath> to <newpath>"
 msgstr ""
 
-#: rpm.c:426
+#: rpm.c:397
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: rpm.c:427
+#: rpm.c:398
 msgid "      --prefix <dir>      "
 msgstr ""
 
-#: rpm.c:428
+#: rpm.c:399
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: rpm.c:432
+#: rpm.c:403
 msgid "do not install documentation"
 msgstr ""
 
-#: rpm.c:434
+#: rpm.c:405
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: rpm.c:436
+#: rpm.c:407
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: rpm.c:438
+#: rpm.c:409
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: rpm.c:441
+#: rpm.c:412
 msgid "don't verify package architecture"
 msgstr ""
 
-#: rpm.c:443
+#: rpm.c:414
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: rpm.c:445
+#: rpm.c:416
 msgid "don't verify package operating system"
 msgstr ""
 
-#: rpm.c:447
+#: rpm.c:418
 msgid "install documentation"
 msgstr ""
 
-#: rpm.c:449 rpm.c:484
+#: rpm.c:420 rpm.c:455
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: rpm.c:453 rpm.c:488
+#: rpm.c:424 rpm.c:459
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: rpm.c:455
+#: rpm.c:426
 msgid "don't execute any installation scripts"
 msgstr ""
 
-#: rpm.c:457 rpm.c:492
+#: rpm.c:428 rpm.c:463
 msgid "don't execute any scripts triggered by this package"
 msgstr ""
 
-#: rpm.c:459
+#: rpm.c:430
 msgid "print percentages as package installs"
 msgstr ""
 
-#: rpm.c:461
+#: rpm.c:432
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: rpm.c:463
+#: rpm.c:434
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: rpm.c:467
+#: rpm.c:438
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: rpm.c:470
+#: rpm.c:441
 msgid "    --upgrade <packagefile>"
 msgstr ""
 
-#: rpm.c:471
+#: rpm.c:442
 msgid "    -U <packagefile>      "
 msgstr ""
 
-#: rpm.c:472
+#: rpm.c:443
 msgid "upgrade package (same options as --install, plus)"
 msgstr ""
 
-#: rpm.c:474
+#: rpm.c:445
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: rpm.c:476
+#: rpm.c:447
 msgid "    --erase <package>"
 msgstr ""
 
-#: rpm.c:478
+#: rpm.c:449
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: rpm.c:480
+#: rpm.c:451
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: rpm.c:490
+#: rpm.c:461
 msgid "do not execute any package specific scripts"
 msgstr ""
 
-#: rpm.c:496
+#: rpm.c:467
 msgid "    -b<stage> <spec>      "
 msgstr ""
 
-#: rpm.c:497
+#: rpm.c:468
 msgid "    -t<stage> <tarball>   "
 msgstr ""
 
-#: rpm.c:498
+#: rpm.c:469
 msgid "build package, where <stage> is one of:"
 msgstr ""
 
-#: rpm.c:500
+#: rpm.c:471
 msgid "prep (unpack sources and apply patches)"
 msgstr ""
 
-#: rpm.c:502
+#: rpm.c:473
 #, c-format
 msgid "list check (do some cursory checks on %files)"
 msgstr ""
 
-#: rpm.c:504
+#: rpm.c:475
 msgid "compile (prep and compile)"
 msgstr ""
 
-#: rpm.c:506
+#: rpm.c:477
 msgid "install (prep, compile, install)"
 msgstr ""
 
-#: rpm.c:508
+#: rpm.c:479
 msgid "binary package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:510
+#: rpm.c:481
 msgid "bin/src package (prep, compile, install, package)"
 msgstr ""
 
-#: rpm.c:518
+#: rpm.c:489
 msgid "remove spec file when done"
 msgstr ""
 
-#: rpm.c:520
+#: rpm.c:491
 msgid "generate PGP/GPG signature"
 msgstr ""
 
-#: rpm.c:521
+#: rpm.c:492
 msgid "      --buildroot <dir>   "
 msgstr ""
 
-#: rpm.c:522
+#: rpm.c:493
 msgid "use <dir> as the build root"
 msgstr ""
 
-#: rpm.c:523
+#: rpm.c:494
 msgid "      --target=<platform>+"
 msgstr ""
 
-#: rpm.c:524
+#: rpm.c:495
 msgid "build the packages for the build targets platform1...platformN."
 msgstr ""
 
-#: rpm.c:526
+#: rpm.c:497
 msgid "do not execute any stages"
 msgstr ""
 
-#: rpm.c:527
+#: rpm.c:498
 msgid "      --timecheck <secs>  "
 msgstr ""
 
-#: rpm.c:528
+#: rpm.c:499
 msgid "set the time check to <secs> seconds (0 disables)"
 msgstr ""
 
-#: rpm.c:530
+#: rpm.c:501
 msgid "    --rebuild <src_pkg>   "
 msgstr ""
 
-#: rpm.c:531
+#: rpm.c:502
 msgid ""
 "install source package, build binary package and remove spec file, sources, "
 "patches, and icons."
 msgstr ""
 
-#: rpm.c:532
+#: rpm.c:503
 msgid "    --recompile <src_pkg> "
 msgstr ""
 
-#: rpm.c:533
+#: rpm.c:504
 msgid "like --rebuild, but don't build any package"
 msgstr ""
 
-#: rpm.c:536
+#: rpm.c:507
 msgid "    --resign <pkg>+       "
 msgstr ""
 
-#: rpm.c:537
+#: rpm.c:508
 msgid "sign a package (discard current signature)"
 msgstr ""
 
-#: rpm.c:538
+#: rpm.c:509
 msgid "    --addsign <pkg>+      "
 msgstr ""
 
-#: rpm.c:539
+#: rpm.c:510
 msgid "add a signature to a package"
 msgstr ""
 
-#: rpm.c:540
+#: rpm.c:511
 msgid "    --checksig <pkg>+"
 msgstr ""
 
-#: rpm.c:541
+#: rpm.c:512
 msgid "    -K <pkg>+           "
 msgstr ""
 
-#: rpm.c:542
+#: rpm.c:513
 msgid "verify package signature"
 msgstr ""
 
-#: rpm.c:544
+#: rpm.c:515
 msgid "skip any PGP signatures"
 msgstr ""
 
-#: rpm.c:546
+#: rpm.c:517
 msgid "skip any GPG signatures"
 msgstr ""
 
-#: rpm.c:548
+#: rpm.c:519
 msgid "skip any MD5 signatures"
 msgstr ""
 
-#: rpm.c:552
+#: rpm.c:523
 msgid "make sure a valid database exists"
 msgstr ""
 
-#: rpm.c:554
+#: rpm.c:525
 msgid "rebuild database from existing database"
 msgstr ""
 
-#: rpm.c:562
+#: rpm.c:533
 msgid ""
 "set the file permissions to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:565
+#: rpm.c:536
 msgid ""
 "set the file owner and group to those in the package database using the same "
 "package specification options as -q"
 msgstr ""
 
-#: rpm.c:719 rpm.c:725 rpm.c:732 rpm.c:738 rpm.c:747 rpm.c:754 rpm.c:801
-#: rpm.c:807 rpm.c:841 rpm.c:847 rpm.c:853 rpm.c:861 rpm.c:912 rpm.c:967
-#: rpm.c:974
+#: rpm.c:673 rpm.c:679 rpm.c:686 rpm.c:692 rpm.c:701 rpm.c:723 rpm.c:729
+#: rpm.c:763 rpm.c:771 rpm.c:792 rpm.c:849 rpm.c:857
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpm.c:740
+#: rpm.c:694
 msgid "-u and --uninstall are deprecated and no longer work.\n"
 msgstr ""
 
-#: rpm.c:742
+#: rpm.c:696
 msgid "Use -e or --erase instead.\n"
 msgstr ""
 
-#: rpm.c:758
-msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
-msgstr ""
-
-#: rpm.c:762
-msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
-msgstr ""
-
-#: rpm.c:814 rpm.c:820 rpm.c:827 rpm.c:834 rpm.c:981
+#: rpm.c:736 rpm.c:742 rpm.c:749 rpm.c:756 rpm.c:865
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpm.c:872
-msgid "arguments to --dbpath must begin with a /"
-msgstr ""
-
-#: rpm.c:918
+#: rpm.c:798
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: rpm.c:920
+#: rpm.c:800
 msgid "relocations must contain a ="
 msgstr ""
 
-#: rpm.c:923
+#: rpm.c:803
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: rpm.c:932
+#: rpm.c:812
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: rpm.c:941
+#: rpm.c:821
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpm.c:993
-msgid "--dbpath given for operation that does not use a database"
-msgstr ""
-
-#: rpm.c:997
-msgid "--timecheck may only be used during package builds"
-msgstr ""
-
-#: rpm.c:1001
+#: rpm.c:871
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpm.c:1004
+#: rpm.c:874
 msgid "unexpected query format"
 msgstr ""
 
-#: rpm.c:1007
+#: rpm.c:877
 msgid "unexpected query source"
 msgstr ""
 
-#: rpm.c:1013
+#: rpm.c:880
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpm.c:1016
+#: rpm.c:883
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpm.c:1019
+#: rpm.c:886
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpm.c:1022
+#: rpm.c:889
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:1025
+#: rpm.c:892
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpm.c:1028
+#: rpm.c:895
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpm.c:1031
+#: rpm.c:898
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1035
+#: rpm.c:902
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1039
+#: rpm.c:906
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1043
+#: rpm.c:910
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1047
+#: rpm.c:914
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1051
+#: rpm.c:918
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1055
+#: rpm.c:922
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpm.c:1059
+#: rpm.c:926
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1063
+#: rpm.c:930
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1067
+#: rpm.c:934
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1071
+#: rpm.c:938
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpm.c:1075
+#: rpm.c:942
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpm.c:1079
+#: rpm.c:946
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpm.c:1084
+#: rpm.c:951
 msgid ""
 "--noscripts may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:1088
+#: rpm.c:955
 msgid ""
 "--notriggers may only be specified during package installation, erasure, and "
 "verification"
 msgstr ""
 
-#: rpm.c:1092
+#: rpm.c:959
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpm.c:1097
+#: rpm.c:964
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpm.c:1101
+#: rpm.c:968
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpm.c:1113
+#: rpm.c:980
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpm.c:1119
+#: rpm.c:986
 msgid "--oldpackage may only be used during upgrades"
 msgstr ""
 
-#: rpm.c:1125
-msgid ""
-"ftp options can only be used during package queries, installs, and upgrades"
-msgstr ""
-
-#: rpm.c:1131
-msgid ""
-"http options can only be used during package queries, installs, and upgrades"
-msgstr ""
-
-#: rpm.c:1136
+#: rpm.c:989
 msgid "--nopgp may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:1139
+#: rpm.c:992
 msgid "--nogpg may only be used during signature checking"
 msgstr ""
 
-#: rpm.c:1142
+#: rpm.c:995
 msgid ""
 "--nomd5 may only be used during signature checking and package verification"
 msgstr ""
 
-#: rpm.c:1172
+#: rpm.c:1006
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpm.c:1177
+#: rpm.c:1011
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpm.c:1192
+#: rpm.c:1026
 msgid "pgp not found: "
 msgstr ""
 
-#: rpm.c:1196
+#: rpm.c:1030
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpm.c:1198
+#: rpm.c:1032
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpm.c:1201
+#: rpm.c:1035
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpm.c:1206
+#: rpm.c:1040
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpm.c:1212
+#: rpm.c:1046
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpm.c:1227
+#: rpm.c:1061
 msgid "exec failed\n"
 msgstr ""
 
-#: rpm.c:1246
+#: rpm.c:1080
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpm.c:1257
+#: rpm.c:1091
 msgid "no packages given for signature check"
 msgstr ""
 
-#: rpm.c:1268
+#: rpm.c:1102
 msgid "no packages given for signing"
 msgstr ""
 
-#: rpm.c:1280
-msgid "no packages files given for rebuild"
-msgstr ""
-
-#: rpm.c:1343
-msgid "no spec files given for build"
-msgstr ""
-
-#: rpm.c:1345
-msgid "no tar files given for build"
-msgstr ""
-
-#: rpm.c:1361
+#: rpm.c:1118
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpm.c:1411
+#: rpm.c:1168
 msgid "no packages given for install"
 msgstr ""
 
-#: rpm.c:1434
+#: rpm.c:1191
 msgid "extra arguments given for query of all packages"
 msgstr ""
 
-#: rpm.c:1439
+#: rpm.c:1196
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpm.c:1456
+#: rpm.c:1213
 msgid "extra arguments given for verify of all packages"
 msgstr ""
 
-#: rpm.c:1460
+#: rpm.c:1217
 msgid "no arguments given for verify"
 msgstr ""
 
@@ -2732,63 +2738,79 @@ msgstr ""
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/query.c:761
+#: lib/query.c:770
 msgid "query package owning file"
 msgstr ""
 
-#: lib/query.c:763
+#: lib/query.c:772
 msgid "query packages in group"
 msgstr ""
 
-#: lib/query.c:765
+#: lib/query.c:774
 msgid "query a package file"
 msgstr ""
 
-#: lib/query.c:769
+#: lib/query.c:776
+msgid "rpm query mode"
+msgstr ""
+
+#: lib/query.c:780
+msgid "display known query tags"
+msgstr ""
+
+#: lib/query.c:782
 msgid "query a spec file"
 msgstr ""
 
-#: lib/query.c:771
+#: lib/query.c:784
 msgid "query the pacakges triggered by the package"
 msgstr ""
 
-#: lib/query.c:773
+#: lib/query.c:786
+msgid "rpm verify mode"
+msgstr ""
+
+#: lib/query.c:788
+msgid "rpm verify mode (legacy)"
+msgstr ""
+
+#: lib/query.c:790
 msgid "query the packages which require a capability"
 msgstr ""
 
-#: lib/query.c:775
+#: lib/query.c:792
 msgid "query the packages which provide a capability"
 msgstr ""
 
-#: lib/query.c:814
+#: lib/query.c:833
 msgid "list all configuration files"
 msgstr ""
 
-#: lib/query.c:816
+#: lib/query.c:835
 msgid "list all documentation files"
 msgstr ""
 
-#: lib/query.c:818
+#: lib/query.c:837
 msgid "dump basic file information"
 msgstr ""
 
-#: lib/query.c:820
+#: lib/query.c:839
 msgid "list files in package"
 msgstr ""
 
-#: lib/query.c:824
+#: lib/query.c:843
 msgid "use the following query format"
 msgstr ""
 
-#: lib/query.c:826
+#: lib/query.c:845
 msgid "substitute i18n sections into spec file"
 msgstr ""
 
-#: lib/query.c:828
+#: lib/query.c:847
 msgid "display the states of the listed files"
 msgstr ""
 
-#: lib/query.c:830
+#: lib/query.c:849
 msgid "display a verbose file listing"
 msgstr ""
 
@@ -2890,13 +2912,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#. failed to open with any dbapi
-#: lib/rpmdb.c:249
+#: lib/rpmdb.c:251
 #, c-format
 msgid "dbiOpen: cannot open %s index"
 msgstr ""
 
-#: lib/rpmdb.c:257
+#: lib/rpmdb.c:259
 msgid ""
 "\n"
 "--> The database is in db%d format, not the suggested db%d format.\n"
@@ -2907,7 +2928,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:270
+#: lib/rpmdb.c:272
 msgid ""
 "\n"
 "--> The configured %%_dbapi was db%d, but the database is db%d format.\n"
@@ -2917,140 +2938,140 @@ msgid ""
 "\n"
 msgstr ""
 
-#: lib/rpmdb.c:335
+#: lib/rpmdb.c:337
 #, c-format
 msgid "error getting \"%s\" records from %s index"
 msgstr ""
 
-#: lib/rpmdb.c:452
+#: lib/rpmdb.c:454
 #, c-format
 msgid "error storing record %s into %s"
 msgstr ""
 
-#: lib/rpmdb.c:461
+#: lib/rpmdb.c:463
 #, c-format
 msgid "error removing record %s from %s"
 msgstr ""
 
-#: lib/rpmdb.c:683 lib/rpmdb.c:2192
+#: lib/rpmdb.c:685 lib/rpmdb.c:2194
 msgid "no dbpath has been set"
 msgstr ""
 
-#: lib/rpmdb.c:780
+#: lib/rpmdb.c:782
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database"
 msgstr ""
 
 #. error
-#: lib/rpmdb.c:984
+#: lib/rpmdb.c:986
 #, c-format
 msgid "cannot retrieve package \"%s\" from db"
 msgstr ""
 
-#: lib/rpmdb.c:1050 lib/rpmdb.c:1566 lib/uninstall.c:90
+#: lib/rpmdb.c:1052 lib/rpmdb.c:1568 lib/uninstall.c:90
 #, c-format
 msgid "%s: cannot read header at 0x%x"
 msgstr ""
 
-#: lib/rpmdb.c:1617
+#: lib/rpmdb.c:1619
 #, c-format
 msgid "removing 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1628
+#: lib/rpmdb.c:1630
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1637
+#: lib/rpmdb.c:1639
 #, c-format
 msgid "removing %d entries from %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:1644 lib/rpmdb.c:1867
+#: lib/rpmdb.c:1646 lib/rpmdb.c:1869
 #, c-format
 msgid "%6d %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:1780
+#: lib/rpmdb.c:1782
 msgid "cannot allocate new instance in database"
 msgstr ""
 
-#: lib/rpmdb.c:1835
+#: lib/rpmdb.c:1837
 #, c-format
 msgid "adding 0 %s entries.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1851
+#: lib/rpmdb.c:1853
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: lib/rpmdb.c:1860
+#: lib/rpmdb.c:1862
 #, c-format
 msgid "adding %d entries to %s index:\n"
 msgstr ""
 
-#: lib/rpmdb.c:2217
+#: lib/rpmdb.c:2219
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2221
+#: lib/rpmdb.c:2223
 #, c-format
 msgid "temporary database %s already exists"
 msgstr ""
 
-#: lib/rpmdb.c:2227
+#: lib/rpmdb.c:2229
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2229
+#: lib/rpmdb.c:2231
 #, c-format
 msgid "error creating directory %s: %s"
 msgstr ""
 
-#: lib/rpmdb.c:2236
+#: lib/rpmdb.c:2238
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2245
+#: lib/rpmdb.c:2247
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: lib/rpmdb.c:2268
+#: lib/rpmdb.c:2270
 #, c-format
 msgid "record number %d in database is bad -- skipping."
 msgstr ""
 
-#: lib/rpmdb.c:2300
+#: lib/rpmdb.c:2302
 #, c-format
 msgid "cannot add record originally at %d"
 msgstr ""
 
-#: lib/rpmdb.c:2318
+#: lib/rpmdb.c:2320
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: lib/rpmdb.c:2326
+#: lib/rpmdb.c:2328
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: lib/rpmdb.c:2328
+#: lib/rpmdb.c:2330
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: lib/rpmdb.c:2338
+#: lib/rpmdb.c:2340
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: lib/rpmdb.c:2340
+#: lib/rpmdb.c:2342
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""