- fix: initialize pretransaction argv (segfault).

- fix: check rpmlib features w/o database (and check earlier as well).

CVS patchset: 3943
CVS date: 2000/07/13 23:30:41

diff --git a/CHANGES b/CHANGES
index f1265f1..9dd971e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -84,6 +84,8 @@
        - fix: remove verbose database +++/--- messages to conform to doco.
        - compare versions if doing --freshen.
        - add S_ISLNK pre-transaction syscall test.
+       - fix: initialize pretransaction argv (segfault).
+       - fix: check rpmlib features w/o database (and check earlier as well).
 
 3.0.4 -> 3.0.5
        - handle version 4 packaging as input.

diff --git a/lib/depends.c b/lib/depends.c
index 2246f28..6a2a017 100644 (file)
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -975,6 +975,19 @@ static int unsatisfiedDepend(rpmTransactionSet rpmdep,
     }
   }
 
+    /*
+     * New features in rpm packaging implicitly add versioned dependencies
+     * on rpmlib provides. The dependencies look like "rpmlib(YaddaYadda)".
+     * Check those dependencies now.
+     */
+     if (!strncmp(keyName, "rpmlib(", sizeof("rpmlib(")-1)) {
+       if (rpmCheckRpmlibProvides(keyName, keyEVR, keyFlags)) {
+           rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (rpmlib provides)\n"),
+                       keyType, keyDepend+2);
+           goto exit;
+       }
+    }
+
     if (alSatisfiesDepend(&rpmdep->addedPackages, keyType, keyDepend, keyName, keyEVR, keyFlags)) {
        goto exit;
     }
@@ -1025,18 +1038,6 @@ static int unsatisfiedDepend(rpmTransactionSet rpmdep,
        rpmdbFreeIterator(mi);
 #endif
 
-       /*
-        * New features in rpm packaging implicitly add versioned dependencies
-        * on rpmlib provides. The dependencies look like "rpmlib(YaddaYadda)".
-        * Check those dependencies now.
-        */
-       if (!strncmp(keyName, "rpmlib(", sizeof("rpmlib(")-1)) {
-           if (rpmCheckRpmlibProvides(keyName, keyEVR, keyFlags)) {
-               rpmMessage(RPMMESS_DEBUG, _("%s: %-45s YES (rpmlib provides)\n"),
-                       keyType, keyDepend+2);
-               goto exit;
-           }
-       }
     }
 
     if (suggestion)

diff --git a/lib/fileutil.c b/lib/fileutil.c
index 69d5689..b0082d2 100644 (file)
--- a/lib/fileutil.c
+++ b/lib/fileutil.c
@@ -23,7 +23,7 @@ int ncmds = sizeof(cmds)/sizeof(cmds[0]);
 
 int rpmSyscall(const char * cmd, int noexec)
 {
-    const char ** argv;
+    const char ** argv = NULL;
     int argc;
     struct stat st;
     int i, j;

diff --git a/po/cs.po b/po/cs.po
index c3f7371..f125039 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -2428,49 +2428,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib provides)\n"
+msgstr "¾ádný balíèek nevlastní soubor %s\n"
+
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1005
+#: lib/depends.c:1018
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "¾ádný balíèek nevlastní soubor %s\n"
 
-#: lib/depends.c:1035
-#, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
-msgstr "¾ádný balíèek nevlastní soubor %s\n"
-
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "¾ádný balíèek nevlastní soubor %s\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "polo¾ka 'vy¾aduje' balíèku %s není splnìna: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balíèek %s koliduje: %s\n"
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "smyèka v øetìzu podmínek: %s"

diff --git a/po/da.po b/po/da.po
index bdf4191..6d12ff0 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -2273,49 +2273,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/de.po b/po/de.po
index 7835801..4fd5a70 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -2520,49 +2520,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib provides)\n"
+msgstr "die Datei »%s« gehört zu keinem Paket\n"
+
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1005
+#: lib/depends.c:1018
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:1035
-#, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
-msgstr "die Datei »%s« gehört zu keinem Paket\n"
-
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/es.po b/po/es.po
index 4f8d1de..b0db1ec 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-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"
@@ -2258,49 +2258,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/fi.po b/po/fi.po
index ed3d1f5..82ad633 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -2460,49 +2460,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib provides)\n"
+msgstr "tiedostoa %s ei omista mikään paketti\n"
+
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1005
+#: lib/depends.c:1018
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:1035
-#, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
-msgstr "tiedostoa %s ei omista mikään paketti\n"
-
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "silmukka edellytysten ketjussa: %s"

diff --git a/po/fr.po b/po/fr.po
index f1f2e34..ac7c65b 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-07-12 19:00-0400\n"
+msgstr "POT-Creation-Date: 2000-07-13 19:28-0400\n"
 
 #: build.c:25 lib/rpminstall.c:451
 #, c-format
@@ -2453,49 +2453,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/gl.po b/po/gl.po
index 4f8d1de..b0db1ec 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-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"
@@ -2258,49 +2258,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/hu.po b/po/hu.po
index 4f8d1de..b0db1ec 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-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"
@@ -2258,49 +2258,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/id.po b/po/id.po
index 4f8d1de..b0db1ec 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-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"
@@ -2258,49 +2258,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/is.po b/po/is.po
index 7ed1edf..0128994 100644 (file)
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 1.0\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "PO-Revision-Date: 2000-06-16 02:20+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -2253,49 +2253,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/it.po b/po/it.po
index 4f8d1de..b0db1ec 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-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"
@@ -2258,49 +2258,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/ja.po b/po/ja.po
index f937cca..ddba090 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -127,7 +127,7 @@ msgstr "copyright 
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.92 2000/07/12 23:19:10 jbj Exp $
+# $Id: ja.po,v 1.93 2000/07/13 23:30:42 jbj Exp $
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -2402,49 +2402,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:992
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib provides)\n"
+msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
+
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1005
+#: lib/depends.c:1018
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1019
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1035
-#, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
-msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
-
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n"
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "prerequisite ¥Á¥§¡¼¥ó¤Î¥ë¡¼¥×: %s"

diff --git a/po/ko.po b/po/ko.po
index 4f8d1de..b0db1ec 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-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"
@@ -2258,49 +2258,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/no.po b/po/no.po
index 659c2c1..16b316a 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "PO-Revision-Date: 2000-06-22 21:59+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -2283,49 +2283,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/pl.po b/po/pl.po
index d68bd15..0c9a49b 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -2403,49 +2403,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib provides)\n"
+msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
+
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1005
+#: lib/depends.c:1018
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:1035
-#, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
-msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
-
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "zale¿no¶ci pakietu %s nie zosta³y spe³nione: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakiet %s jest w konflikcie: %s\n"
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/pt.po b/po/pt.po
index 4f8d1de..b0db1ec 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-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"
@@ -2258,49 +2258,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/pt_BR.po b/po/pt_BR.po
index a646d52..9242342 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-07-12 19:00-0400\n"
+msgstr "POT-Creation-Date: 2000-07-13 19:28-0400\n"
 
 #: build.c:25 lib/rpminstall.c:451
 #, c-format
@@ -2521,49 +2521,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "não foi passado pacote para instalação"
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "não foi passado pacote para desinstalação"
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/ro.po b/po/ro.po
index f98043d..d36f215 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -2253,49 +2253,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/rpm.pot b/po/rpm.pot
index 4f8d1de..b0db1ec 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-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"
@@ -2258,49 +2258,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/po/ru.po b/po/ru.po
index 25c012b..4f95fc4 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2407,49 +2407,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib provides)\n"
+msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
+
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1005
+#: lib/depends.c:1018
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
 
-#: lib/depends.c:1035
-#, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
-msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
-
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n"
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "ÚÁÍËÎÕÔÙÊ ÃÉËÌ × ÃÅÐÏÞËÅ ÔÒÅÂÏ×ÁÎÉÊ ÄÌÑ ÕÓÔÁÎÏ×ËÉ: %s"

diff --git a/po/sk.po b/po/sk.po
index c9e9fb5..b097231 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -2410,49 +2410,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib provides)\n"
+msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
+
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1005
+#: lib/depends.c:1018
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
-#: lib/depends.c:1035
-#, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
-msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
-
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "po¾iadavka balíka %s nie je uspokojená: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balík %s koliduje: %s\n"
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "sluèka v re»azi po¾iadaviek: %s"

diff --git a/po/sl.po b/po/sl.po
index bcdfaa4..be745f3 100644 (file)
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.77 2000/07/12 23:19:11 jbj Exp $
+# $Id: sl.po,v 1.78 2000/07/13 23:30:43 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "PO-Revision-Date: 2000-02-17 22:25+01:00\n"
 "Last-Translator: Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -2395,49 +2395,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n"
 
-#: lib/depends.c:992
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib provides)\n"
+msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n"
+
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1005
+#: lib/depends.c:1018
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %s zadovoljen ob ponudbi db.\n"
 
-#: lib/depends.c:1019
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "%s: %s zadovoljen ob paketih db.\n"
 
-#: lib/depends.c:1035
-#, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
-msgstr "%s: %s zadovoljen ob dodatnem ponudbi rpmrc.\n"
-
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s zadovoljen ob dodatnem paketu.\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s zahteva, a ni zadovoljeno: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s v sporu: %s\n"
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "zanka v predpogojevani verigi: %s"

diff --git a/po/sr.po b/po/sr.po
index e8b4c65..6985318 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -2417,49 +2417,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib provides)\n"
+msgstr "datoteka %s ne pripada nijednom paketu\n"
+
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1005
+#: lib/depends.c:1018
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:1035
-#, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
-msgstr "datoteka %s ne pripada nijednom paketu\n"
-
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s nije naveden u %s"
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "petlja u lancu: %s"

diff --git a/po/sv.po b/po/sv.po
index 08d454d..734654f 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-0400\n"
 "PO-Revision-Date: 2000-06-22 23:35+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -2312,49 +2312,49 @@ msgstr "%s: %-45s %-3s (cachad)\n"
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
 
-#: lib/depends.c:992
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib provides)\n"
+msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
+
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:1005
+#: lib/depends.c:1018
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db tillhandahållande)\n"
 
-#: lib/depends.c:1019
+#: lib/depends.c:1032
 #, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "%s: %-45s JA (db-paket)\n"
 
-#: lib/depends.c:1035
-#, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
-msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
-
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s behov inte uppfyllda: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s står i konflikt: %s\n"
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "cirkularitet i kedja av förutsättningar: %s"

diff --git a/po/tr.po b/po/tr.po
index 24d4a63..3ea032c 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-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"
@@ -2459,49 +2459,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
+#, fuzzy, c-format
+msgid "%s: %-45s YES (rpmlib provides)\n"
+msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
+
+#: lib/depends.c:1005
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1005
+#: lib/depends.c:1018
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1032
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db packages)\n"
 msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
 
-#: lib/depends.c:1035
-#, fuzzy, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
-msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
-
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s dosyasý, hiç bir pakete ait deðil\n"
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "%s paketi %s altýnda gözükmüyor"
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s paketi %s altýnda gözükmüyor"
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr "gerekenler zincirinde döngü: %s"

diff --git a/po/uk.po b/po/uk.po
index 4f8d1de..b0db1ec 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-07-12 19:00-0400\n"
+"POT-Creation-Date: 2000-07-13 19:28-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"
@@ -2258,49 +2258,49 @@ msgstr ""
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:992
+#: lib/depends.c:985
 #, c-format
-msgid "%s: %-45s YES (db files)\n"
+msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
 #: lib/depends.c:1005
 #, c-format
-msgid "%s: %-45s YES (db provides)\n"
+msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1019
+#: lib/depends.c:1018
 #, c-format
-msgid "%s: %-45s YES (db packages)\n"
+msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1035
+#: lib/depends.c:1032
 #, c-format
-msgid "%s: %-45s YES (rpmlib provides)\n"
+msgid "%s: %-45s YES (db packages)\n"
 msgstr ""
 
-#: lib/depends.c:1046
+#: lib/depends.c:1047
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1067
+#: lib/depends.c:1068
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
 
 #. requirements are not satisfied.
-#: lib/depends.c:1121
+#: lib/depends.c:1122
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1188
+#: lib/depends.c:1189
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1314
+#: lib/depends.c:1315
 #, c-format
 msgid "loop in prerequisite chain: %s"
 msgstr ""

diff --git a/rpm.spec b/rpm.spec
index c6e1d9e..8906012 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -8,7 +8,7 @@ Summary: The Red Hat package management system.
 Name: rpm
 %define version 4.0
 Version: %{version}
-Release: 0.52
+Release: 0.53
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -257,6 +257,10 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Thu Jul 13 2000 Jeff Johnson <jbj@redhat.com>
+- fix: initialize pretransaction argv (segfault).
+- fix: check rpmlib features w/o database (and check earlier as well).
+
 * Wed Jul 12 2000 Jeff Johnson <jbj@redhat.com>
 - add S_ISLNK pre-transaction syscall test.