- popt aliases for -U et al to achieve dynamic link with nptl.

CVS patchset: 5946
CVS date: 2002/12/18 16:18:33

25 files changed, 257 insertions, 235 deletions

diff --git a/CHANGES b/CHANGES
index d4aee7f91..fab099723 100644
--- a/CHANGES
+++ b/CHANGES
@@ -55,6 +55,7 @@
 	- make dependency generation "opt-out" everywhere.
 	- rebuild against glibc with fcntl fixed in libpthread.
 	- re-enable CDB locking, removing "private" from %%__dbi_cdb macro.
+	- popt aliases for -U et al to achieve dynamic link with nptl.
 
 4.0.4 -> 4.1:
 	- loosely wire beecrypt library into rpm.
diff --git a/lib/psm.c b/lib/psm.c
index 09dfcc548..1c7ba590b 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -1718,6 +1718,17 @@ psm->te->h = headerLink(fi->h);
     case PSM_PRE:
 	if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST)	break;
 
+/* XXX insure that trigger index is opened before entering chroot. */
+#ifdef	NOTYET
+{ static int oneshot = 0;
+  dbiIndex dbi;
+  if (!oneshot) {
+    dbi = dbiOpen(rpmtsGetRdb(ts), RPMTAG_TRIGGERNAME, 0);
+    oneshot++;
+  }
+}
+#endif
+
 	/* Change root directory if requested and not already done. */
 	rc = rpmpsmStage(psm, PSM_CHROOT_IN);
 
diff --git a/po/cs.po b/po/cs.po
index 8d21e0aad..2756a9585 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -715,7 +715,7 @@ msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "Nemohu otevøít %s: %s\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nemohu zapsat balíèek: %s\n"
@@ -745,7 +745,7 @@ msgstr "Nemohu pøeèíst payload z %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nemohu zapsat payload do %s: %s\n"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapsáno: %s\n"
@@ -2189,41 +2189,41 @@ msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratový kód: %d\n"
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s obsahuje %d souborù, test = %d\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n"
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "u¾ivatel %s neexistuje - pou¾it u¾ivatel root\n"
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou¾ita skupina root\n"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalování archívu selhalo %s%s: %s\n"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr " na souboru "
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nemohu otevøít %s: %s\n"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s selhalo\n"
diff --git a/po/da.po b/po/da.po
index e1c8131d2..8f2e11cae 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -712,7 +712,7 @@ msgstr "Kunne ikke læse hoved fra %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke åbne %s: %s\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
@@ -742,7 +742,7 @@ msgstr "Kunne ikke læse pakkeindhold fra %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -2202,41 +2202,41 @@ msgstr ""
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "pakke: %s-%s-%s filer test = %d\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Kunne ikke læse hoved fra %s: %s\n"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "bruger %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "gruppe %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr " for fil "
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "kunne ikke åbne %s: %s\n"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s mislykkedes\n"
diff --git a/po/de.po b/po/de.po
index 5d2aec758..46ba13955 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\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"
@@ -797,7 +797,7 @@ msgid "Could not open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
@@ -832,7 +832,7 @@ msgstr "Nicht möglich %s zu schreiben"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2359,43 +2359,43 @@ msgstr "Ausführung des Skripts fehlgeschlagen"
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
 # , c-format
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp fehlgeschlagen"
diff --git a/po/fi.po b/po/fi.po
index 463436391..9824750db 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
@@ -725,7 +725,7 @@ msgstr "%s:n kirjoitus ei onnistu"
 msgid "Could not open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
@@ -755,7 +755,7 @@ msgstr "%s:n kirjoitus ei onnistu"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2244,41 +2244,41 @@ msgstr "skriptin ajo epäonnistui"
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp epäonnistui"
diff --git a/po/fr.po b/po/fr.po
index 031a035a0..cf5152a36 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -746,7 +746,7 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -776,7 +776,7 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2283,41 +2283,41 @@ msgstr ""
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "La construction a chou.\n"
diff --git a/po/gl.po b/po/gl.po
index 2090c7d63..30005a6d3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -721,7 +721,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2115,40 +2115,40 @@ msgstr ""
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 msgid "Unable to reload signature header\n"
 msgstr ""
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 6df37a311..2be66cd11 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -698,7 +698,7 @@ msgstr "Get ekki lesið haus úr %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Get ekki ritað í pakka: %s\n"
@@ -728,7 +728,7 @@ msgstr "Get ekki lesið innihald %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Get ekki ritað innihald í %s: %s\n"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrifaði: %s\n"
@@ -2141,41 +2141,41 @@ msgstr ""
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Get ekki lesið haus úr %s: %s\n"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "gat ekki opnað %s: %s\n"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s brást\n"
diff --git a/po/ja.po b/po/ja.po
index 6981453d4..eae4c4dd6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\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"
@@ -741,7 +741,7 @@ msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s"
 msgid "Could not open %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
@@ -771,7 +771,7 @@ msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "½ñ¤­¹þ¤ßÃæ: %s\n"
@@ -2280,42 +2280,42 @@ msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 #, fuzzy
 msgid " on file "
 msgstr "¥Õ¥¡¥¤¥ë¾å"
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ¼ºÇÔ"
diff --git a/po/ko.po b/po/ko.po
index e64a4191e..caf166ee6 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -705,7 +705,7 @@ msgstr "¼­¸í(signature) Çì´õ¸¦ ´Ù½Ã Àоî¿Ã ¼ö ¾ø½À´Ï´Ù.\n"
 msgid "Could not open %s: %s\n"
 msgstr "%s(À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "ÆÐÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
@@ -735,7 +735,7 @@ msgstr "%sÀÇ payload¸¦ ÀÐÀ» ¼ö ¾øÀ½: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "ÀÛ¼º: %s\n"
@@ -2176,42 +2176,42 @@ msgstr ""
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s¿¡ %dÀÇ ÆÄÀÏÀÌ ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 "%s: %s ½ºÅ©¸³Æ²¸´(scriptlet)ÀÌ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s(À»)¸¦ »ý·«ÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "¼­¸í(signature) Çì´õ¸¦ ´Ù½Ã Àоî¿Ã ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr " ´ÙÀ½ ÆÄÀÏÀÇ "
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%2$s ÆÄÀÏÀÇ %1$s(ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s(ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n"
diff --git a/po/no.po b/po/no.po
index fc5fae6dc..3205a356a 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -709,7 +709,7 @@ msgstr "Kunne ikke åpne spec fil %s: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke åpne %s: %s\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
@@ -739,7 +739,7 @@ msgstr "Kunne ikke lese \"payload\" fra %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive \"payload\" til %s: %s\n"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -2167,41 +2167,41 @@ msgstr ""
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "klarte ikke å åpne %s: %s\n"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s feilet\n"
diff --git a/po/pl.po b/po/pl.po
index d0c651b33..41420b4a5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\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"
@@ -732,7 +732,7 @@ msgstr "Nie mo¿na odczytaæ ikony: %s"
 msgid "Could not open %s: %s\n"
 msgstr "Nie mo¿na otworzyæ %s\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
@@ -762,7 +762,7 @@ msgstr "Nie mo¿na odczytaæ ikony: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -2245,41 +2245,41 @@ msgstr "wykonanie skryptu nie powiod³o siê"
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "pakiet: %s-%s-%s test plików = %d\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Nie mo¿na odczytaæ ikony: %s"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "u¿ytkownik %s nie istnieje - u¿yto konta root"
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s nie istnieje - u¿yto grupy root"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s nie powiod³o siê"
diff --git a/po/pt.po b/po/pt.po
index 917d99921..bb072daaf 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
@@ -715,7 +715,7 @@ msgstr "Não consegui reler o cabeçalho do assinatura.\n"
 msgid "Could not open %s: %s\n"
 msgstr "Não consigo aceder ao %s: %s\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Não consegui gravar o pacote: %s\n"
@@ -745,7 +745,7 @@ msgstr "Não consegui ler o conteúdo de %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Não consegui escrever o conteúdo de %s: %s\n"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Gravei: %s\n"
@@ -2189,41 +2189,41 @@ msgstr ""
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s tem %d ficheiros, teste = %d\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s script falhou (%d), a saltar %s-%s-%s\n"
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Não consegui reler o cabeçalho do assinatura.\n"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "o utilizador %s não existe - a usar o root\n"
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "o grupo %s não existe - a usar o root\n"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "a abertura do pacote falhou%s%s: %s\n"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr " no ficheiro "
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s falhou no ficheiro %s: %s\n"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s falhou: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9db047459..7eded9b6f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -788,7 +788,7 @@ msgid "Could not open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -823,7 +823,7 @@ msgstr "No consegui abrir: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2369,43 +2369,43 @@ msgstr ""
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
 # , c-format
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "Construo falhou.\n"
diff --git a/po/ro.po b/po/ro.po
index 01dad9eeb..a408dcf6e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\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"
@@ -691,7 +691,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -721,7 +721,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2115,40 +2115,40 @@ msgstr ""
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 msgid "Unable to reload signature header\n"
 msgstr ""
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index ad2a85267..6509b550a 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -697,7 +697,7 @@ msgstr ""
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
@@ -727,7 +727,7 @@ msgstr ""
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2121,40 +2121,40 @@ msgstr ""
 msgid "%s: %s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 msgid "Unable to reload signature header\n"
 msgstr ""
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 3c5eb48c1..c364ae938 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: 2002-08-27 13:36-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -714,7 +714,7 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÚÁÇÒÕÚÉÔØ ÚÁÇÏÌÏ×ÏË ÐÏÄÐÉÓÉ.\n"
 msgid "Could not open %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s\n"
@@ -744,7 +744,7 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÉÚ %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "úÁÐÉÓÁÎ: %s\n"
@@ -2162,40 +2162,40 @@ msgstr "%s(%s-%s-%s) ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ, ËÏÄ ×ÏÚ×ÒÁÔÁ %d\n"
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, ÒÅÚÕÌØÔÁÔ ÐÒÏ×ÅÒËÉ: %d\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ (%d), ÐÒÏÐÕÓËÁÅÔÓÑ %s\n"
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 msgid "Unable to reload signature header\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÚÁÇÒÕÚÉÔØ ÚÁÇÏÌÏ×ÏË ÐÏÄÐÉÓÉ\n"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n"
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr " ÎÁ ÆÁÊÌÅ "
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n"
diff --git a/po/sk.po b/po/sk.po
index 413473cb4..7d62c6359 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\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"
@@ -729,7 +729,7 @@ msgstr "Nie je mo¾né preèíta» ikonu: %s"
 msgid "Could not open %s: %s\n"
 msgstr "Otvorenie %s zlyhalo\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie je mo¾né zapísa» balík: %s"
@@ -759,7 +759,7 @@ msgstr "Nie je mo¾né preèíta» ikonu: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie je mo¾né zapísa» balík: %s"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapísané: %s\n"
@@ -2243,41 +2243,41 @@ msgstr "vykonanie skriptu zlyhalo"
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "balík: %s-%s-%s test súborov = %d\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Nie je mo¾né preèíta» ikonu: %s"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root"
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou¾ije sa root"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalenie archívu zlyhalo%s%s: %s"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr " pre súbor "
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nepodarilo sa otvori» %s: %s"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s zlyhalo"
diff --git a/po/sl.po b/po/sl.po
index c473d6e10..a082e7cda 100644
--- 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.335 2002/12/13 23:35:14 jbj Exp $
+# $Id: sl.po,v 1.336 2002/12/18 16:19:10 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -728,7 +728,7 @@ msgstr "Ikone %s ni mo¾no prebrati: %s"
 msgid "Could not open %s: %s\n"
 msgstr "Ni mo¾no odpreti %s: %s\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ni mo¾no zapisati paketa: %s"
@@ -758,7 +758,7 @@ msgstr "Ikone %s ni mo¾no prebrati: %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ni mo¾no zapisati paketa %s: %s"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
@@ -2243,41 +2243,41 @@ msgstr "skript se ni uspe¹no izvedel"
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "paket: %s-%s-%s datoteke test = %d\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Ikone %s ni mo¾no prebrati: %s"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "uporabnik %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "raz¹iritev arhiva je bilo neuspe¹no%s%s: %s"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr " za datoteko "
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspe¹no odpiranje %s: %s\n"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s neuspe¹en"
diff --git a/po/sr.po b/po/sr.po
index 7ec78eb9d..787be6a56 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -718,7 +718,7 @@ msgstr "Ne mogu da upi¹em %s"
 msgid "Could not open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ne mogu da upi¹em %s"
@@ -748,7 +748,7 @@ msgstr "Ne mogu da upi¹em %s"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
@@ -2235,41 +2235,41 @@ msgstr "neuspelo izvr¹avanje skripta"
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr ""
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "PGP omanuo"
diff --git a/po/sv.po b/po/sv.po
index aa79e28c2..24f57fc2f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.1\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: 2002-08-19 22:26+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -706,7 +706,7 @@ msgstr "Kan inte läsa om signaturhuvud.\n"
 msgid "Could not open %s: %s\n"
 msgstr "Kunde inte öppna %s: %s\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunde inte skriva paket: %s\n"
@@ -736,7 +736,7 @@ msgstr "Kan inte läsa last från %s: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kan inte skriva last till %s: %s\n"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
@@ -2146,40 +2146,40 @@ msgstr "körning av %s-skript från %s-%s-%s misslyckades, slutstatus %d\n"
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s har %d filer, test = %d\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s-skript misslyckades (%d), hoppar över %s\n"
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 msgid "Unable to reload signature header\n"
 msgstr "Kan inte läsa om signaturhuvud\n"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "användare %s finns inte - använder root\n"
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupp %s finns inte - använder root\n"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "uppackning av arkiv misslyckades%s%s: %s\n"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s misslyckades på fil %s: %s\n"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s misslyckades: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 91c4280f2..dda9a153b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-12-13 17:05-0500\n"
+"POT-Creation-Date: 2002-12-18 11:10-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -720,7 +720,7 @@ msgstr "%s'den baþlýk okunamadý: %s\n"
 msgid "Could not open %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: build/pack.c:629 lib/psm.c:1833
+#: build/pack.c:629 lib/psm.c:1844
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "paket yazýlamadý: %s\n"
@@ -750,7 +750,7 @@ msgstr "%s'den payload okunamadý: %s\n"
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s'e payload yazýlamadý: %s\n"
 
-#: build/pack.c:710 lib/psm.c:2138
+#: build/pack.c:710 lib/psm.c:2149
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Yazýldý: %s\n"
@@ -2207,41 +2207,41 @@ msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, çýkýþta durum %d\n"
 msgid "%s: %s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s %d dosya içeriyor, test = %d\n"
 
-#: lib/psm.c:1736
+#: lib/psm.c:1747
 #, fuzzy, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s\n"
 msgstr "%s: %s betiði baþarýsýz (%d), %s-%s-%s atlanýyor\n"
 
-#: lib/psm.c:1845
+#: lib/psm.c:1856
 #, fuzzy
 msgid "Unable to reload signature header\n"
 msgstr "%s'den baþlýk okunamadý: %s\n"
 
-#: lib/psm.c:1891
+#: lib/psm.c:1902
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "kullanýcý %s yok - root kullanýlacak\n"
 
-#: lib/psm.c:1900
+#: lib/psm.c:1911
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grup %s yok - root kullanýlacak\n"
 
-#: lib/psm.c:1948
+#: lib/psm.c:1959
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "arþiv paketi açýlýrken baþarýsýz%s%s: %s\n"
 
-#: lib/psm.c:1949
+#: lib/psm.c:1960
 msgid " on file "
 msgstr " dosyada "
 
-#: lib/psm.c:2146
+#: lib/psm.c:2157
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: lib/psm.c:2149
+#: lib/psm.c:2160
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s baþarýsýz\n"
diff --git a/rpm.spec.in b/rpm.spec.in
index 08513b837..dbd237dbe 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -17,7 +17,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.28nptl
+Release: 0.29nptl
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -461,6 +461,9 @@ exit 0
 %{__prefix}/include/popt.h
 
 %changelog
+* Wed Dec 18 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.29nptl
+- popt aliases for -U et al to achieve dynamic link with nptl.
+
 * Tue Dec 17 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.28nptl
 - re-enable CDB locking, removing "private" from %%__dbi_cdb macro.
 
diff --git a/rpmpopt.in b/rpmpopt.in
index 1e1daf19e..40a258b71 100644
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -86,8 +86,6 @@ rpm	alias --last --qf '%|INSTALLTIME?{%{INSTALLTIME}}:{000000000}| %{NAME}-%{VER
 rpm	alias --filesbypkg --qf '[%-25{=NAME} %{FILENAMES}\n]' \
 	--POPTdesc=$"list all files from each package"
 
-rpm	alias --dwim --force --nodeps
-
 rpm alias --redhatprovides -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatprovides \
 	--POPTdesc=$"find package name that contains a provided capability (needs rpmdb-redhat package installed)"
 
@@ -177,6 +175,15 @@ rpm	exec -V			rpmv -V
 rpm	exec -y			rpmv -y
 rpm	exec --verify		rpmv --verify
 
+rpm	exec -i			rpmi -i
+rpm	exec --install		rpmi --install
+rpm	exec -U			rpmi -U
+rpm	exec --upgrade		rpmi --upgrade
+rpm	exec -F			rpmi -F
+rpm	exec --freshen		rpmi --freshen
+rpm	exec -e			rpmi -e
+rpm	exec --erase		rpmi --erase
+
 rpm	alias --with		--define "_with_!#:+       --with-!#:+" \
 	--POPTdesc=$"enable configure <option> for build" \
 	--POPTargs=$"<option>"