- fix: multiple relocations (#67596).

- add --build/--program-prefix, delete libtoolize, from %configure.

CVS patchset: 5529
CVS date: 2002/06/28 13:04:38

1 files changed, 134 insertions, 119 deletions

diff --git a/po/es.po b/po/es.po
index e4e39e3bc..560037500 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-06-27 12:12-0400\n"
+"POT-Creation-Date: 2002-06-28 08:45-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"
@@ -118,7 +118,7 @@ msgstr ""
 msgid "use <dir> as the top level directory"
 msgstr ""
 
-#: rpmqv.c:129 lib/poptI.c:218
+#: rpmqv.c:129 lib/poptI.c:221
 msgid "<dir>"
 msgstr ""
 
@@ -206,225 +206,225 @@ msgstr ""
 msgid "Usage: %s {--help}\n"
 msgstr ""
 
-#: rpmqv.c:605
+#: rpmqv.c:610
 msgid "The --rcfile option has been eliminated.\n"
 msgstr ""
 
-#: rpmqv.c:606
+#: rpmqv.c:611
 msgid "Use \"--macros <file:...>\" instead.\n"
 msgstr ""
 
-#: rpmqv.c:612
+#: rpmqv.c:617
 #, c-format
 msgid "Internal error in argument processing (%d) :-(\n"
 msgstr ""
 
-#: rpmqv.c:653 rpmqv.c:659 rpmqv.c:665 rpmqv.c:703
+#: rpmqv.c:658 rpmqv.c:664 rpmqv.c:670 rpmqv.c:708
 msgid "only one major mode may be specified"
 msgstr ""
 
-#: rpmqv.c:682
+#: rpmqv.c:687
 msgid "one type of query/verify may be performed at a time"
 msgstr ""
 
-#: rpmqv.c:686
+#: rpmqv.c:691
 msgid "unexpected query flags"
 msgstr ""
 
-#: rpmqv.c:689
+#: rpmqv.c:694
 msgid "unexpected query format"
 msgstr ""
 
-#: rpmqv.c:692
+#: rpmqv.c:697
 msgid "unexpected query source"
 msgstr ""
 
-#: rpmqv.c:733
+#: rpmqv.c:738
 msgid "--dbpath given for operation that does not use a database"
 msgstr ""
 
-#: rpmqv.c:739
+#: rpmqv.c:744
 msgid "only installation, upgrading, rmsource and rmspec may be forced"
 msgstr ""
 
-#: rpmqv.c:741
+#: rpmqv.c:746
 msgid "files may only be relocated during package installation"
 msgstr ""
 
-#: rpmqv.c:744
+#: rpmqv.c:749
 msgid "only one of --prefix or --relocate may be used"
 msgstr ""
 
-#: rpmqv.c:747
+#: rpmqv.c:752
 msgid ""
 "--relocate and --excludepath may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:750
+#: rpmqv.c:755
 msgid "--prefix may only be used when installing new packages"
 msgstr ""
 
-#: rpmqv.c:753
+#: rpmqv.c:758
 msgid "arguments to --prefix must begin with a /"
 msgstr ""
 
-#: rpmqv.c:756
+#: rpmqv.c:761
 msgid "--hash (-h) may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:760
+#: rpmqv.c:765
 msgid "--percent may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:765
+#: rpmqv.c:770
 msgid "--replacefiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:769
+#: rpmqv.c:774
 msgid "--replacepkgs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:773
+#: rpmqv.c:778
 msgid "--excludedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:777
+#: rpmqv.c:782
 msgid "--includedocs may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:781
+#: rpmqv.c:786
 msgid "only one of --excludedocs and --includedocs may be specified"
 msgstr ""
 
-#: rpmqv.c:785
+#: rpmqv.c:790
 msgid "--ignorearch may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:789
+#: rpmqv.c:794
 msgid "--ignoreos may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:794
+#: rpmqv.c:799
 msgid "--ignoresize may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:798
+#: rpmqv.c:803
 msgid "--allmatches may only be specified during package erasure"
 msgstr ""
 
-#: rpmqv.c:802
+#: rpmqv.c:807
 msgid "--allfiles may only be specified during package installation"
 msgstr ""
 
-#: rpmqv.c:807
+#: rpmqv.c:812
 msgid "--justdb may only be specified during package installation and erasure"
 msgstr ""
 
-#: rpmqv.c:812
+#: rpmqv.c:817
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:817
+#: rpmqv.c:822
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
 msgstr ""
 
-#: rpmqv.c:821
+#: rpmqv.c:826
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
 msgstr ""
 
-#: rpmqv.c:826
+#: rpmqv.c:831
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
 msgstr ""
 
-#: rpmqv.c:831
+#: rpmqv.c:836
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
 msgstr ""
 
-#: rpmqv.c:843
+#: rpmqv.c:848
 msgid "arguments to --root (-r) must begin with a /"
 msgstr ""
 
-#: rpmqv.c:867
+#: rpmqv.c:872
 msgid "no files to sign\n"
 msgstr ""
 
-#: rpmqv.c:872
+#: rpmqv.c:877
 #, c-format
 msgid "cannot access file %s\n"
 msgstr ""
 
-#: rpmqv.c:891
+#: rpmqv.c:896
 msgid "pgp not found: "
 msgstr ""
 
-#: rpmqv.c:896
+#: rpmqv.c:901
 msgid "Enter pass phrase: "
 msgstr ""
 
-#: rpmqv.c:898
+#: rpmqv.c:903
 msgid "Pass phrase check failed\n"
 msgstr ""
 
-#: rpmqv.c:902
+#: rpmqv.c:907
 msgid "Pass phrase is good.\n"
 msgstr ""
 
-#: rpmqv.c:907
+#: rpmqv.c:912
 #, c-format
 msgid "Invalid %%_signature spec in macro file.\n"
 msgstr ""
 
-#: rpmqv.c:914
+#: rpmqv.c:919
 msgid "--sign may only be used during package building"
 msgstr ""
 
-#: rpmqv.c:931
+#: rpmqv.c:936
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:964
+#: rpmqv.c:969
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1032
+#: rpmqv.c:1037
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1034
+#: rpmqv.c:1039
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1056
+#: rpmqv.c:1061
 msgid "no packages given for erase"
 msgstr ""
 
-#: rpmqv.c:1097
+#: rpmqv.c:1102
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1113
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1126
+#: rpmqv.c:1131
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1134
+#: rpmqv.c:1139
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1150
+#: rpmqv.c:1155
 msgid "no arguments given"
 msgstr ""
 
@@ -1569,7 +1569,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:597
+#: lib/package.c:174 lib/rpmchecksig.c:180 lib/rpmchecksig.c:605
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1583,27 +1583,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:613
+#: lib/package.c:204 lib/rpmchecksig.c:198 lib/rpmchecksig.c:621
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:618
+#: lib/package.c:208 lib/rpmchecksig.c:202 lib/rpmchecksig.c:626
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:254 lib/rpmchecksig.c:516
+#: lib/package.c:254 lib/rpmchecksig.c:524
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:689
+#: lib/package.c:289 lib/package.c:314 lib/package.c:344 lib/rpmchecksig.c:697
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:545
+#: lib/package.c:356 lib/rpmchecksig.c:122 lib/rpmchecksig.c:553
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -1612,219 +1612,219 @@ msgstr ""
 msgid "exclude paths must begin with a /"
 msgstr ""
 
-#: lib/poptI.c:63
+#: lib/poptI.c:65
 msgid "relocations must begin with a /"
 msgstr ""
 
-#: lib/poptI.c:65
+#: lib/poptI.c:68
 msgid "relocations must contain a ="
 msgstr ""
 
-#: lib/poptI.c:68
+#: lib/poptI.c:71
 msgid "relocations must have a / following the ="
 msgstr ""
 
-#: lib/poptI.c:82
+#: lib/poptI.c:85
 msgid "rollback takes a time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:89
+#: lib/poptI.c:92
 msgid "malformed rollback time/date stamp argument"
 msgstr ""
 
-#: lib/poptI.c:109
+#: lib/poptI.c:112
 msgid "install all files, even configurations which might otherwise be skipped"
 msgstr ""
 
-#: lib/poptI.c:113
+#: lib/poptI.c:116
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
 msgstr ""
 
-#: lib/poptI.c:119 lib/poptI.c:174
+#: lib/poptI.c:122 lib/poptI.c:177
 msgid "do not execute package scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:123
+#: lib/poptI.c:126
 msgid "relocate files in non-relocateable package"
 msgstr ""
 
-#: lib/poptI.c:126
+#: lib/poptI.c:129
 msgid "save erased package files by renaming into sub-directory"
 msgstr ""
 
-#: lib/poptI.c:129
+#: lib/poptI.c:132
 msgid "erase (uninstall) package"
 msgstr ""
 
-#: lib/poptI.c:129
+#: lib/poptI.c:132
 msgid "<package>+"
 msgstr ""
 
-#: lib/poptI.c:132
+#: lib/poptI.c:135
 msgid "do not install documentation"
 msgstr ""
 
-#: lib/poptI.c:134
+#: lib/poptI.c:137
 msgid "skip files with leading component <path> "
 msgstr ""
 
-#: lib/poptI.c:135
+#: lib/poptI.c:138
 msgid "<path>"
 msgstr ""
 
-#: lib/poptI.c:138
+#: lib/poptI.c:141
 msgid "short hand for --replacepkgs --replacefiles"
 msgstr ""
 
-#: lib/poptI.c:141
+#: lib/poptI.c:144
 msgid "upgrade package(s) if already installed"
 msgstr ""
 
-#: lib/poptI.c:142 lib/poptI.c:158 lib/poptI.c:239
+#: lib/poptI.c:145 lib/poptI.c:161 lib/poptI.c:242
 msgid "<packagefile>+"
 msgstr ""
 
-#: lib/poptI.c:144
+#: lib/poptI.c:147
 msgid "print hash marks as package installs (good with -v)"
 msgstr ""
 
-#: lib/poptI.c:147
+#: lib/poptI.c:150
 msgid "don't verify package architecture"
 msgstr ""
 
-#: lib/poptI.c:150
+#: lib/poptI.c:153
 msgid "don't verify package operating system"
 msgstr ""
 
-#: lib/poptI.c:153
+#: lib/poptI.c:156
 msgid "don't check disk space before installing"
 msgstr ""
 
-#: lib/poptI.c:155
+#: lib/poptI.c:158
 msgid "install documentation"
 msgstr ""
 
-#: lib/poptI.c:158
+#: lib/poptI.c:161
 msgid "install package(s)"
 msgstr ""
 
-#: lib/poptI.c:160
+#: lib/poptI.c:163
 msgid "update the database, but do not modify the filesystem"
 msgstr ""
 
-#: lib/poptI.c:162
+#: lib/poptI.c:165
 msgid "do not verify package dependencies"
 msgstr ""
 
-#: lib/poptI.c:165
+#: lib/poptI.c:168
 msgid "do not reorder package installation to satisfy dependencies"
 msgstr ""
 
-#: lib/poptI.c:170
+#: lib/poptI.c:173
 msgid "do not suggest missing dependency resolution(s)"
 msgstr ""
 
-#: lib/poptI.c:177
+#: lib/poptI.c:180
 #, c-format
 msgid "do not execute %%pre scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:180
+#: lib/poptI.c:183
 #, c-format
 msgid "do not execute %%post scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:183
+#: lib/poptI.c:186
 #, c-format
 msgid "do not execute %%preun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:186
+#: lib/poptI.c:189
 #, c-format
 msgid "do not execute %%postun scriptlet (if any)"
 msgstr ""
 
-#: lib/poptI.c:189 lib/poptQV.c:273 lib/poptQV.c:310
+#: lib/poptI.c:192 lib/poptQV.c:273 lib/poptQV.c:310
 msgid "don't verify package digest(s)"
 msgstr ""
 
-#: lib/poptI.c:191 lib/poptQV.c:276 lib/poptQV.c:312
+#: lib/poptI.c:194 lib/poptQV.c:276 lib/poptQV.c:312
 msgid "don't verify package signature(s)"
 msgstr ""
 
-#: lib/poptI.c:195
+#: lib/poptI.c:198
 msgid "do not execute any scriptlet(s) triggered by this package"
 msgstr ""
 
-#: lib/poptI.c:198
+#: lib/poptI.c:201
 #, c-format
 msgid "do not execute any %%triggerprein scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:201
+#: lib/poptI.c:204
 #, c-format
 msgid "do not execute any %%triggerin scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:204
+#: lib/poptI.c:207
 #, c-format
 msgid "do not execute any %%triggerun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:207
+#: lib/poptI.c:210
 #, c-format
 msgid "do not execute any %%triggerpostun scriptlet(s)"
 msgstr ""
 
-#: lib/poptI.c:211
+#: lib/poptI.c:214
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
 msgstr ""
 
-#: lib/poptI.c:215
+#: lib/poptI.c:218
 msgid "print percentages as package installs"
 msgstr ""
 
-#: lib/poptI.c:217
+#: lib/poptI.c:220
 msgid "relocate the package to <dir>, if relocatable"
 msgstr ""
 
-#: lib/poptI.c:220
+#: lib/poptI.c:223
 msgid "relocate files from path <old> to <new>"
 msgstr ""
 
-#: lib/poptI.c:221
+#: lib/poptI.c:224
 msgid "<old>=<new>"
 msgstr ""
 
-#: lib/poptI.c:224
+#: lib/poptI.c:227
 msgid "save erased package files by repackaging"
 msgstr ""
 
-#: lib/poptI.c:227
+#: lib/poptI.c:230
 msgid "install even if the package replaces installed files"
 msgstr ""
 
-#: lib/poptI.c:230
+#: lib/poptI.c:233
 msgid "reinstall if the package is already present"
 msgstr ""
 
-#: lib/poptI.c:232
+#: lib/poptI.c:235
 msgid "deinstall new, reinstall old, package(s), back to <date>"
 msgstr ""
 
-#: lib/poptI.c:233
+#: lib/poptI.c:236
 msgid "<date>"
 msgstr ""
 
-#: lib/poptI.c:235
+#: lib/poptI.c:238
 msgid "don't install, but tell if it would work or not"
 msgstr ""
 
-#: lib/poptI.c:238
+#: lib/poptI.c:241
 msgid "upgrade package(s)"
 msgstr ""
 
@@ -2267,37 +2267,52 @@ msgstr ""
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:530
+#: lib/rpmchecksig.c:386
+#, c-format
+msgid "%s: import read failed.\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:391
+#, c-format
+msgid "%s: not an armored public key.\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:396
+#, c-format
+msgid "%s: base64 encode failed.\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:538
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:603
+#: lib/rpmchecksig.c:611
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:851
+#: lib/rpmchecksig.c:859
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:852 lib/rpmchecksig.c:866
+#: lib/rpmchecksig.c:860 lib/rpmchecksig.c:874
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:854 lib/rpmchecksig.c:868
+#: lib/rpmchecksig.c:862 lib/rpmchecksig.c:876
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:855 lib/rpmchecksig.c:869
+#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:857 lib/rpmchecksig.c:871
+#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:865
+#: lib/rpmchecksig.c:873
 msgid "OK"
 msgstr ""