29 files changed, 514 insertions, 478 deletions

diff --git a/CHANGES b/CHANGES
index 46cde1456..2ff9fa552 100644
--- a/CHANGES
+++ b/CHANGES
@@ -118,6 +118,8 @@
 	- add rpmds/rpmfi/rpmts methods to bindings.
 	- re-enable rpm-python sub-package.
 	- fix: resurrect "()(64bit)" markings using objdump.
+	- add rpmal/rpmte/rpmfd methods to bindings.
+	- drop cpanflute and cpanflute2, will be in Chip's CPAN package now.
 
 4.0.3 -> 4.0.4:
 	- solaris: translate i86pc to i386 (#57182).
diff --git a/po/cs.po b/po/cs.po
index bc0d51072..169af1e2a 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-0400\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"
@@ -1439,52 +1439,52 @@ msgstr "selhal - "
 msgid "package %s was already added, replacing with %s\n"
 msgstr "balíèek %s je ji¾ nainstalován"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s ANO (rpmrc poskytuje)\n"
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "¹patný db soubor %s\n"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "¾ádné balíèky\n"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr "========== ukládání tsort relací\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1492,20 +1492,20 @@ msgid ""
 msgstr ""
 "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n"
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n"
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr "SMYÈKA:\n"
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr "========== pokraèuje tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index c075a6dbb..5a17177dd 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-0400\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"
@@ -1440,71 +1440,71 @@ msgstr " mislykkedes - "
 msgid "package %s was already added, replacing with %s\n"
 msgstr "pakken %s er allerede installeret"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s JA (rpmrc tilfører)\n"
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s JA (rpmlib tilfører)\n"
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "ugyldig db-fil %s\n"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s JA (db tilfører)\n"
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "ingen pakker\n"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr "========== gemmer tsort-relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n"
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr "LØKKE:\n"
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr "========== fortsætter tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index ad15d9c51..1d971105f 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-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"
@@ -1573,73 +1573,73 @@ msgstr "pgp fehlgeschlagen"
 msgid "package %s was already added, replacing with %s\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
 # , c-format
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 #, fuzzy
 msgid "(db provides)"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
 # FIXME
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index f6fca0f89..9270c1c85 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -1465,71 +1465,71 @@ msgstr "pgp epäonnistui"
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "en voinut avata %s: %s"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 #, fuzzy
 msgid "(db provides)"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "kysele kaikki paketit"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index e168dfb1e..c65932aeb 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-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"
@@ -1496,68 +1496,68 @@ msgstr "La construction a chou.\n"
 msgid "package %s was already added, replacing with %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 95464b70f..401bf6ac9 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-0400\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"
@@ -1409,66 +1409,66 @@ msgstr ""
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 8fcdf85c8..7b27f73d8 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-0400\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"
@@ -1416,67 +1416,67 @@ msgstr ""
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "uppfæra pakka"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 7b23672f5..ed1d407f0 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-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"
@@ -1488,71 +1488,71 @@ msgstr "¼ºÇÔ - "
 msgid "package %s was already added, replacing with %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤Ï¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 6ab7920ca..dd699e689 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-0400\n"
 "PO-Revision-Date: 2001-09-07 22:03+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -1430,52 +1430,52 @@ msgstr " ½ÇÆÐÇÔ - "
 msgid "package %s was already added, replacing with %s\n"
 msgstr "%s ÆÐÅ°Áö´Â ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "À߸øµÈ db ÆÄÀÏ    %s\n"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1483,20 +1483,20 @@ msgid ""
 msgstr ""
 "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n"
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n"
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr "·çÇÁ(LOOP):\n"
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index bba79753d..a48893ac6 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-0400\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"
@@ -1431,67 +1431,67 @@ msgstr " feilet - "
 msgid "package %s was already added, replacing with %s\n"
 msgstr "pakke %s er allerede installert"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "ingen pakker\n"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 7152b6eb3..ee7483bd7 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-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"
@@ -1471,71 +1471,71 @@ msgstr " nie powiod³o siê -"
 msgid "package %s was already added, replacing with %s\n"
 msgstr "pakiet %s-%s-%s jest ju¿ zainstalowany"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "b³êdny status pliku: %s"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 #, fuzzy
 msgid "(db provides)"
 msgstr "Udostêpniane zasoby:"
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "znaleziono %d pakietów\n"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "usuwanie indeksu grupy\n"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7093d7d2c..b985939e7 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-0400\n"
 
 #: build.c:40
 #, fuzzy
@@ -1583,70 +1583,70 @@ msgstr "Construo falhou.\n"
 msgid "package %s was already added, replacing with %s\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 msgid "(rpmlib provides)"
 msgstr ""
 
 # , c-format
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "pesquise todos os pacotes"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
 # , c-format
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "No consegui abrir: %s\n"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index d49118e5a..08f0d40de 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-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"
@@ -1409,66 +1409,66 @@ msgstr ""
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 6cef66825..38332faf8 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-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"
@@ -1415,66 +1415,66 @@ msgstr ""
 msgid "package %s was already added, replacing with %s\n"
 msgstr ""
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 msgid "(rpmrc provides)"
 msgstr ""
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 msgid "(rpmlib provides)"
 msgstr ""
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 msgid "(db files)"
 msgstr ""
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 msgid "(db provides)"
 msgstr ""
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 msgid "(db package)"
 msgstr ""
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index d54e9e71c..4d0efea51 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-0400\n"
 "PO-Revision-Date: 2001-08-29 13:55-0400\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team:  Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -1448,52 +1448,52 @@ msgstr "ÎÅ ÕÄÁÌÏÓØ - "
 msgid "package %s was already added, replacing with %s\n"
 msgstr "ÐÁËÅÔ %s ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s YES (rpmrc provides)\n"
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s YES (rpmlib provides)\n"
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s YES (db provides)\n"
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "ÎÅÔ ÐÁËÅÔÏ×\n"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1502,20 +1502,20 @@ msgstr ""
 "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, "
 "ÇÌÕÂÉÎÁ)\n"
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n"
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr "ãéëì:\n"
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index a55902f35..6f6aac682 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-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"
@@ -1469,71 +1469,71 @@ msgstr " zlyhalo - "
 msgid "package %s was already added, replacing with %s\n"
 msgstr "balík %s nie je nain¹talovaný\n"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "chybný stav súboru: %s"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 #, fuzzy
 msgid "(db provides)"
 msgstr "Poskytuje:"
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "nájdených %d balíkov\n"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstraòuje sa index skupín\n"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 00f6375a5..0720fe18e 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.248 2002/05/23 21:07:10 jbj Exp $
+# $Id: sl.po,v 1.249 2002/05/28 16:23:31 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-0400\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"
@@ -1471,71 +1471,71 @@ msgstr " neuspe¹no - "
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paket %s-%s-%s je ¾e name¹èen"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s DA (rpmrc ponudbe)\n"
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "po¹kodovana zbirka podatkov %s"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s DA (db ponudbe)\n"
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "ni paketov\n"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 314132a27..15ce3900e 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -1458,71 +1458,71 @@ msgstr "PGP omanuo"
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 #, fuzzy
 msgid "(db provides)"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "upit nad svim paketima"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
 "depth)\n"
 msgstr ""
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 480a1074d..f0a338f2c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-0400\n"
 "PO-Revision-Date: 2001-09-12 14:18+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1433,52 +1433,52 @@ msgstr " misslyckades - "
 msgid "package %s was already added, replacing with %s\n"
 msgstr "paket %s är redan installerat"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n"
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "felaktig db-fil %s\n"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s JA (db-tillhandahållande)\n"
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "inga paket\n"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr "========== noterar alla relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1486,20 +1486,20 @@ msgid ""
 msgstr ""
 "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n"
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr "========== endast efterföljare (presentationsordning)\n"
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr "LOOP:\n"
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr "========== fortsätter med tsort ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 34e9a95f0..20a4457c4 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-05-23 17:06-0400\n"
+"POT-Creation-Date: 2002-05-28 12:01-0400\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"
@@ -1453,52 +1453,52 @@ msgstr " baþarýsýz - "
 msgid "package %s was already added, replacing with %s\n"
 msgstr "%s zaten kurulu"
 
-#: lib/depends.c:389
+#: lib/depends.c:391
 msgid "(cached)"
 msgstr ""
 
-#: lib/depends.c:414
+#: lib/depends.c:416
 #, fuzzy
 msgid "(rpmrc provides)"
 msgstr "%s: %-45s EVET (rpmrc saðlar)\n"
 
-#: lib/depends.c:430
+#: lib/depends.c:432
 #, fuzzy
 msgid "(rpmlib provides)"
 msgstr "%s: %-45s EVET (rpmlib saðlar)\n"
 
-#: lib/depends.c:451
+#: lib/depends.c:453
 #, fuzzy
 msgid "(db files)"
 msgstr "db dosyasý %s hatalý\n"
 
-#: lib/depends.c:463
+#: lib/depends.c:465
 #, fuzzy
 msgid "(db provides)"
 msgstr "%s: %-45s EVET (db saðlar)\n"
 
-#: lib/depends.c:476
+#: lib/depends.c:478
 #, fuzzy
 msgid "(db package)"
 msgstr "paket yok\n"
 
-#: lib/depends.c:815
+#: lib/depends.c:817
 #, c-format
 msgid "ignore package name relation(s) [%d]\t%s -> %s\n"
 msgstr ""
 
-#: lib/depends.c:935
+#: lib/depends.c:937
 #, fuzzy, c-format
 msgid "removing %s \"%s\" from tsort relations.\n"
 msgstr "tsort baðýntýlarýndan %s-%s-%s \"%s\" kaldýrýlýyor\n"
 
 #. Record all relations.
-#: lib/depends.c:1205
+#: lib/depends.c:1207
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort baðýntýlarý kaydediliyor\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1311
+#: lib/depends.c:1313
 #, fuzzy
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, tree, "
@@ -1506,20 +1506,20 @@ msgid ""
 msgstr ""
 "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n"
 
-#: lib/depends.c:1404
+#: lib/depends.c:1406
 msgid "========== successors only (presentation order)\n"
 msgstr "========== sadece ardýllar (sunum sýrasý)\n"
 
-#: lib/depends.c:1474
+#: lib/depends.c:1476
 msgid "LOOP:\n"
 msgstr "ÇEVRÝM:\n"
 
-#: lib/depends.c:1509
+#: lib/depends.c:1511
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort sürüyor ...\n"
 
 #. Return no. of packages that could not be ordered.
-#: lib/depends.c:1514
+#: lib/depends.c:1516
 #, c-format
 msgid "rpmtsOrder failed, %d elements remain\n"
 msgstr ""
diff --git a/python/db-py.c b/python/db-py.c
index ef0a2a608..5cd407d9a 100644
--- a/python/db-py.c
+++ b/python/db-py.c
@@ -27,7 +27,8 @@
 /** \ingroup python
  */
 static PyObject *
-rpmmi_Next(rpmmiObject * s, PyObject * args) {
+rpmmi_Next(rpmmiObject * s, PyObject * args)
+{
     /* XXX assume header? */
     Header h;
     hdrObject * ho;
@@ -40,7 +41,7 @@ rpmmi_Next(rpmmiObject * s, PyObject * args) {
 	return Py_None;
     }
 
-    ho = createHeaderObject(h);
+    ho = hdr_Wrap(h);
     
     return (PyObject *) ho;
 }
@@ -48,7 +49,8 @@ rpmmi_Next(rpmmiObject * s, PyObject * args) {
 /** \ingroup python
  */
 static PyObject *
-rpmmi_Pattern(rpmmiObject * s, PyObject * args) {
+rpmmi_Pattern(rpmmiObject * s, PyObject * args)
+{
     PyObject *TagN = NULL;
     int type;
     char * pattern;
@@ -79,7 +81,7 @@ static struct PyMethodDef rpmmi_methods[] = {
 - Retrieve next header that matches.\n" },
     {"pattern",	    (PyCFunction) rpmmi_Pattern,	METH_VARARGS,
 "mi.pattern(TagN, mire_type, pattern)\n\
-- Set a secondary match pattern on retrieved header tags\n" },
+- Set a secondary match pattern on tags from retrieved header.\n" },
     {NULL,		NULL}		/* sentinel */
 };
 
@@ -434,7 +436,7 @@ rpmdb_subscript(rpmdbObject * s, PyObject * key)
 	return NULL;
     }
 
-    ho = createHeaderObject(h);
+    ho = hdr_Wrap(h);
     h = headerFree(h, NULL);
 
     return ho;
@@ -450,7 +452,8 @@ static PyMappingMethods rpmdb_as_mapping = {
 
 /**
  */
-static void rpmdb_dealloc(rpmdbObject * s) {
+static void rpmdb_dealloc(rpmdbObject * s)
+{
     s->offsets = _free(s->offsets);
     if (s->db)
 	rpmdbClose(s->db);
@@ -459,7 +462,8 @@ static void rpmdb_dealloc(rpmdbObject * s) {
 
 /**
  */
-static PyObject * rpmdb_getattr(rpmdbObject * s, char * name) {
+static PyObject * rpmdb_getattr(rpmdbObject * s, char * name)
+{
     return Py_FindMethod(rpmdb_methods, (PyObject * ) s, name);
 }
 
@@ -516,7 +520,8 @@ PyTypeObject rpmdb_Type = {
 #endif
 };
 
-rpmdb dbFromDb(rpmdbObject * db) {
+rpmdb dbFromDb(rpmdbObject * db)
+{
     return db->db;
 }
 
@@ -554,7 +559,8 @@ rpmdbObject * rpmOpenDB(PyObject * self, PyObject * args) {
 
 /**
  */
-PyObject * rebuildDB (PyObject * self, PyObject * args) {
+PyObject * rebuildDB (PyObject * self, PyObject * args)
+{
     char * root = "";
 
     if (!PyArg_ParseTuple(args, "s", &root)) return NULL;
diff --git a/python/db-py.h b/python/db-py.h
index 431ea9a30..4e4c9992b 100644
--- a/python/db-py.h
+++ b/python/db-py.h
@@ -19,6 +19,8 @@ struct rpmdbObject_s {
     int *offsets;
 } ;
 
+extern PyTypeObject rpmdb_Type;
+
 /** \ingroup python
  */
 typedef struct rpmmiObject_s rpmmiObject;
@@ -31,10 +33,10 @@ struct rpmmiObject_s {
     rpmdbObject *db;
 } ;
 
-extern PyTypeObject rpmdb_Type;
 extern PyTypeObject rpmmi_Type;
 
 rpmdb dbFromDb(rpmdbObject * db);
+
 rpmdbObject * rpmOpenDB(PyObject * self, PyObject * args);
 PyObject * rebuildDB (PyObject * self, PyObject * args);
 
diff --git a/python/header-py.c b/python/header-py.c
index f932ed61f..0418e8973 100644
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -101,33 +101,33 @@ struct hdrObject_s {
 
 /** \ingroup python
  */
-static PyObject * hdrKeyList(hdrObject * s, PyObject * args) {
+static PyObject * hdrKeyList(hdrObject * s, PyObject * args)
+{
     PyObject * list, *o;
-    HeaderIterator iter;
+    HeaderIterator hi;
     int tag, type;
 
     if (!PyArg_ParseTuple(args, "")) return NULL;
 
     list = PyList_New(0);
 
-    iter = headerInitIterator(s->h);
-    while (headerNextIterator(iter, &tag, &type, NULL, NULL)) {
+    hi = headerInitIterator(s->h);
+    while (headerNextIterator(hi, &tag, &type, NULL, NULL)) {
         if (tag == HEADER_I18NTABLE) continue;
 
 	switch (type) {
-	  case RPM_BIN_TYPE:
-	  case RPM_INT32_TYPE:
-	  case RPM_CHAR_TYPE:
-	  case RPM_INT8_TYPE:
-	  case RPM_INT16_TYPE:
-	  case RPM_STRING_ARRAY_TYPE:
-	  case RPM_STRING_TYPE:
+	case RPM_BIN_TYPE:
+	case RPM_INT32_TYPE:
+	case RPM_CHAR_TYPE:
+	case RPM_INT8_TYPE:
+	case RPM_INT16_TYPE:
+	case RPM_STRING_ARRAY_TYPE:
+	case RPM_STRING_TYPE:
 	    PyList_Append(list, o=PyInt_FromLong(tag));
 	    Py_DECREF(o);
 	}
     }
-
-    headerFreeIterator(iter);
+    headerFreeIterator(hi);
 
     return list;
 }
@@ -170,7 +170,8 @@ static PyObject * hdrUnload(hdrObject * s, PyObject * args, PyObject *keywords)
  *	(attr_name, correctValue, currentValue)
  * It should be passed the file number to verify.
  */
-static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) {
+static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args)
+{
     int fileNumber;
     rpmVerifyAttrs verifyResult = 0;
     PyObject * list, * tuple, * attrName;
@@ -393,7 +394,8 @@ static PyObject * hdrVerifyFile(hdrObject * s, PyObject * args) {
 
 /** \ingroup python
  */
-static PyObject * hdrExpandFilelist(hdrObject * s, PyObject * args) {
+static PyObject * hdrExpandFilelist(hdrObject * s, PyObject * args)
+{
     expandFilelist (s->h);
 
     Py_INCREF(Py_None);
@@ -402,7 +404,8 @@ static PyObject * hdrExpandFilelist(hdrObject * s, PyObject * args) {
 
 /** \ingroup python
  */
-static PyObject * hdrCompressFilelist(hdrObject * s, PyObject * args) {
+static PyObject * hdrCompressFilelist(hdrObject * s, PyObject * args)
+{
     compressFilelist (s->h);
 
     Py_INCREF(Py_None);
@@ -436,7 +439,8 @@ static void mungeFilelist(Header h)
 
 /** 
  */
-static PyObject * rhnUnload(hdrObject * s, PyObject * args) {
+static PyObject * rhnUnload(hdrObject * s, PyObject * args)
+{
     int len;
     char * uh;
     PyObject * rc;
@@ -496,7 +500,8 @@ static PyObject * rhnUnload(hdrObject * s, PyObject * args) {
 
 /** \ingroup python
  */
-static PyObject * hdrFullFilelist(hdrObject * s, PyObject * args) {
+static PyObject * hdrFullFilelist(hdrObject * s, PyObject * args)
+{
     if (!PyArg_ParseTuple(args, ""))
 	return NULL;
 
@@ -508,7 +513,8 @@ static PyObject * hdrFullFilelist(hdrObject * s, PyObject * args) {
 
 /** \ingroup python
  */
-static PyObject * hdrSprintf(hdrObject * s, PyObject * args) {
+static PyObject * hdrSprintf(hdrObject * s, PyObject * args)
+{
     char * fmt;
     char * r;
     errmsg_t err;
@@ -529,6 +535,12 @@ static PyObject * hdrSprintf(hdrObject * s, PyObject * args) {
     return result;
 }
 
+/**
+ */
+static int hdr_compare(hdrObject * a, hdrObject * b)
+{
+    return rpmVersionCompare(a->h, b->h);
+}
 
 /** \ingroup python
  */
@@ -562,13 +574,15 @@ static struct PyMethodDef hdr_methods[] = {
 
 /** \ingroup python
  */
-static PyObject * hdr_getattr(hdrObject * s, char * name) {
+static PyObject * hdr_getattr(hdrObject * s, char * name)
+{
     return Py_FindMethod(hdr_methods, (PyObject * ) s, name);
 }
 
 /** \ingroup python
  */
-static void hdr_dealloc(hdrObject * s) {
+static void hdr_dealloc(hdrObject * s)
+{
     if (s->h) headerFree(s->h, "hdr_dealloc s->h");
     s->md5list = _free(s->md5list);
     s->fileList = _free(s->fileList);
@@ -596,7 +610,8 @@ long tagNumFromPyObject (PyObject *item)
 
 /** \ingroup python
  */
-static PyObject * hdr_subscript(hdrObject * s, PyObject * item) {
+static PyObject * hdr_subscript(hdrObject * s, PyObject * item)
+{
     int type, count, i, tag = -1;
     void * data;
     PyObject * o, * metao;
@@ -639,37 +654,37 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item) {
     }
 
     switch (tag) {
-      case RPMTAG_OLDFILENAMES:
-      case RPMTAG_FILESIZES:
-      case RPMTAG_FILESTATES:
-      case RPMTAG_FILEMODES:
-      case RPMTAG_FILEUIDS:
-      case RPMTAG_FILEGIDS:
-      case RPMTAG_FILERDEVS:
-      case RPMTAG_FILEMTIMES:
-      case RPMTAG_FILEMD5S:
-      case RPMTAG_FILELINKTOS:
-      case RPMTAG_FILEFLAGS:
-      case RPMTAG_ROOT:
-      case RPMTAG_FILEUSERNAME:
-      case RPMTAG_FILEGROUPNAME:
+    case RPMTAG_OLDFILENAMES:
+    case RPMTAG_FILESIZES:
+    case RPMTAG_FILESTATES:
+    case RPMTAG_FILEMODES:
+    case RPMTAG_FILEUIDS:
+    case RPMTAG_FILEGIDS:
+    case RPMTAG_FILERDEVS:
+    case RPMTAG_FILEMTIMES:
+    case RPMTAG_FILEMD5S:
+    case RPMTAG_FILELINKTOS:
+    case RPMTAG_FILEFLAGS:
+    case RPMTAG_ROOT:
+    case RPMTAG_FILEUSERNAME:
+    case RPMTAG_FILEGROUPNAME:
 	forceArray = 1;
 	break;
-      case RPMTAG_SUMMARY:
-      case RPMTAG_GROUP:
-      case RPMTAG_DESCRIPTION:
+    case RPMTAG_SUMMARY:
+    case RPMTAG_GROUP:
+    case RPMTAG_DESCRIPTION:
 	freeData = 1;
 	break;
-      default:
+    default:
         break;
     }
 
     switch (type) {
-      case RPM_BIN_TYPE:
+    case RPM_BIN_TYPE:
 	o = PyString_FromStringAndSize(data, count);
 	break;
 
-      case RPM_INT32_TYPE:
+    case RPM_INT32_TYPE:
 	if (count != 1 || forceArray) {
 	    metao = PyList_New(0);
 	    for (i = 0; i < count; i++) {
@@ -683,8 +698,8 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item) {
 	}
 	break;
 
-      case RPM_CHAR_TYPE:
-      case RPM_INT8_TYPE:
+    case RPM_CHAR_TYPE:
+    case RPM_INT8_TYPE:
 	if (count != 1 || forceArray) {
 	    metao = PyList_New(0);
 	    for (i = 0; i < count; i++) {
@@ -698,7 +713,7 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item) {
 	}
 	break;
 
-      case RPM_INT16_TYPE:
+    case RPM_INT16_TYPE:
 	if (count != 1 || forceArray) {
 	    metao = PyList_New(0);
 	    for (i = 0; i < count; i++) {
@@ -712,7 +727,7 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item) {
 	}
 	break;
 
-      case RPM_STRING_ARRAY_TYPE:
+    case RPM_STRING_ARRAY_TYPE:
 	stringArray = data;
 
 	metao = PyList_New(0);
@@ -725,7 +740,7 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item) {
 	o = metao;
 	break;
 
-      case RPM_STRING_TYPE:
+    case RPM_STRING_TYPE:
 	if (count != 1 || forceArray) {
 	    stringArray = data;
 
@@ -743,7 +758,7 @@ static PyObject * hdr_subscript(hdrObject * s, PyObject * item) {
 	}
 	break;
 
-      default:
+    default:
 	PyErr_SetString(PyExc_TypeError, "unsupported type in header");
 	return NULL;
     }
@@ -776,7 +791,7 @@ PyTypeObject hdr_Type = {
 	0,				/* tp_print */
 	(getattrfunc) hdr_getattr, 	/* tp_getattr */
 	0,				/* tp_setattr */
-	0,				/* tp_compare */
+	(cmpfunc) hdr_compare,		/* tp_compare */
 	0,				/* tp_repr */
 	0,				/* tp_as_number */
 	0,	 			/* tp_as_sequence */
@@ -812,24 +827,27 @@ PyTypeObject hdr_Type = {
 #endif
 };
 
-hdrObject * createHeaderObject(Header h) {
-    hdrObject * ho = PyObject_NEW(hdrObject, &hdr_Type);
-    ho->h = headerLink(h, NULL);
-    ho->fileList = ho->linkList = ho->md5list = NULL;
-    ho->uids = ho->gids = ho->mtimes = ho->fileSizes = NULL;
-    ho->modes = ho->rdevs = NULL;
-    return ho;
+hdrObject * hdr_Wrap(Header h)
+{
+    hdrObject * hdr = PyObject_NEW(hdrObject, &hdr_Type);
+    hdr->h = headerLink(h, NULL);
+    hdr->fileList = hdr->linkList = hdr->md5list = NULL;
+    hdr->uids = hdr->gids = hdr->mtimes = hdr->fileSizes = NULL;
+    hdr->modes = hdr->rdevs = NULL;
+    return hdr;
 }
 
-Header hdrGetHeader(hdrObject * h) {
-    return h->h;
+Header hdrGetHeader(hdrObject * s)
+{
+    return s->h;
 }
 
 /**
  */
-PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args) {
-    hdrObject * h;
-    Header header;
+PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args)
+{
+    hdrObject * hdr;
+    Header h;
     FD_t fd;
     int rawFd;
     int isSource = 0;
@@ -840,7 +858,7 @@ PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args) {
     fd = fdDup(rawFd);
     {	rpmts ts;
 	ts = rpmtsCreate();
-	rc = rpmReadPackageFile(ts, fd, "rpmHeaderFromPackage", &header);
+	rc = rpmReadPackageFile(ts, fd, "rpmHeaderFromPackage", &h);
 	rpmtsFree(ts);
     }
     Fclose(fd);
@@ -848,17 +866,14 @@ PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args) {
     switch (rc) {
     case RPMRC_BADSIZE:
     case RPMRC_OK:
-	h = (hdrObject *) PyObject_NEW(PyObject, &hdr_Type);
-	h->h = header;
-	h->fileList = h->linkList = h->md5list = NULL;
-	h->uids = h->gids = h->mtimes = h->fileSizes = NULL;
-	h->modes = h->rdevs = NULL;
-	isSource = headerIsEntry(header, RPMTAG_SOURCEPACKAGE);
+	isSource = headerIsEntry(h, RPMTAG_SOURCEPACKAGE);
+	hdr = hdr_Wrap(h);
+	h = headerFree(h, NULL);	/* XXX ref held by hdr */
 	break;
 
     case RPMRC_NOTFOUND:
 	Py_INCREF(Py_None);
-	h = (hdrObject *) Py_None;
+	hdr = (hdrObject *) Py_None;
 	break;
 
     case RPMRC_FAIL:
@@ -868,15 +883,17 @@ PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args) {
 	return NULL;
     }
 
-    return Py_BuildValue("(Ni)", h, isSource);
+    return Py_BuildValue("(Ni)", hdr, isSource);
 }
 
 /**
  */
-PyObject * hdrLoad(PyObject * self, PyObject * args) {
-    char * obj, * copy=NULL;
-    Header hdr;
-    hdrObject * h;
+PyObject * hdrLoad(PyObject * self, PyObject * args)
+{
+    hdrObject * hdr;
+    char * copy = NULL;
+    char * obj;
+    Header h;
     int len;
 
     if (!PyArg_ParseTuple(args, "s#", &obj, &len)) return NULL;
@@ -889,30 +906,27 @@ PyObject * hdrLoad(PyObject * self, PyObject * args) {
     }
     memcpy (copy, obj, len);
 
-    hdr = headerLoad(copy);
-    if (!hdr) {
+    h = headerLoad(copy);
+    if (!h) {
 	PyErr_SetString(pyrpmError, "bad header");
 	return NULL;
     }
-    headerAllocated(hdr);
-    compressFilelist (hdr);
-    providePackageNVR (hdr);
+    headerAllocated(h);
+    compressFilelist (h);
+    providePackageNVR (h);
 
-    h = (hdrObject *) PyObject_NEW(PyObject, &hdr_Type);
-    h->h = hdr;
-    h->fileList = h->linkList = h->md5list = NULL;
-    h->uids = h->gids = h->mtimes = h->fileSizes = NULL;
-    h->modes = h->rdevs = NULL;
+    hdr = hdr_Wrap(h);
+    h = headerFree(h, NULL);	/* XXX ref held by hdr */
 
-    return (PyObject *) h;
+    return (PyObject *) hdr;
 }
 
 /**
  */
-PyObject * rhnLoad(PyObject * self, PyObject * args) {
+PyObject * rhnLoad(PyObject * self, PyObject * args)
+{
     char * obj, * copy=NULL;
-    Header hdr;
-    hdrObject * h;
+    Header h;
     int len;
 
     if (!PyArg_ParseTuple(args, "s#", &obj, &len)) return NULL;
@@ -925,47 +939,46 @@ PyObject * rhnLoad(PyObject * self, PyObject * args) {
     }
     memcpy (copy, obj, len);
 
-    hdr = headerLoad(copy);
-    if (!hdr) {
+    h = headerLoad(copy);
+    if (!h) {
 	PyErr_SetString(pyrpmError, "bad header");
 	return NULL;
     }
-    headerAllocated(hdr);
+    headerAllocated(h);
 
     /* XXX avoid the false OK's from rpmverifyDigest() with missing tags. */
-    if (!headerIsEntry(hdr, RPMTAG_HEADERIMMUTABLE)) {
+    if (!headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) {
 	PyErr_SetString(pyrpmError, "bad header, not immutable");
-	headerFree(hdr, "rhnLoad hdr #1");
+	headerFree(h, "rhnLoad #1");
 	return NULL;
     }
 
     /* XXX avoid the false OK's from rpmverifyDigest() with missing tags. */
-    if (!headerIsEntry(hdr, RPMTAG_SHA1HEADER)
-    &&  !headerIsEntry(hdr, RPMTAG_SHA1RHN)) {
+    if (!headerIsEntry(h, RPMTAG_SHA1HEADER)
+    &&  !headerIsEntry(h, RPMTAG_SHA1RHN)) {
 	PyErr_SetString(pyrpmError, "bad header, no digest");
-	headerFree(hdr, "rhnLoad hdr #2");
+	headerFree(h, "rhnLoad #2");
 	return NULL;
     }
 
     /* Retrofit a RHNPlatform: tag. */
-    if (!headerIsEntry(hdr, RPMTAG_RHNPLATFORM)) {
+    if (!headerIsEntry(h, RPMTAG_RHNPLATFORM)) {
 	const char * arch;
 	int_32 at;
-	if (headerGetEntry(hdr, RPMTAG_ARCH, &at, (void **)&arch, NULL))
-	    headerAddEntry(hdr, RPMTAG_RHNPLATFORM, at, arch, 1);
+	if (headerGetEntry(h, RPMTAG_ARCH, &at, (void **)&arch, NULL))
+	    headerAddEntry(h, RPMTAG_RHNPLATFORM, at, arch, 1);
     }
 
-    h = createHeaderObject(hdr);
-
-    return (PyObject *) h;
+    return (PyObject *) hdr_Wrap(h);
 }
 
 /**
  */
-PyObject * rpmReadHeaders (FD_t fd) {
+PyObject * rpmReadHeaders (FD_t fd)
+{
     PyObject * list;
-    Header header;
-    hdrObject * h;
+    Header h;
+    hdrObject * hdr;
 
     if (!fd) {
 	PyErr_SetFromErrno(pyrpmError);
@@ -974,27 +987,24 @@ PyObject * rpmReadHeaders (FD_t fd) {
 
     list = PyList_New(0);
     Py_BEGIN_ALLOW_THREADS
-    header = headerRead(fd, HEADER_MAGIC_YES);
+    h = headerRead(fd, HEADER_MAGIC_YES);
     Py_END_ALLOW_THREADS
 
-    while (header) {
-	compressFilelist (header);
-	providePackageNVR (header);
-	h = (hdrObject *) PyObject_NEW(PyObject, &hdr_Type);
-	h->h = header;
-	h->fileList = h->linkList = h->md5list = NULL;
-	h->uids = h->gids = h->mtimes = h->fileSizes = NULL;
-	h->modes = h->rdevs = NULL;
-	if (PyList_Append(list, (PyObject *) h)) {
+    while (h) {
+	compressFilelist(h);
+	providePackageNVR(h);
+	hdr = hdr_Wrap(h);
+	if (PyList_Append(list, (PyObject *) hdr)) {
 	    Py_DECREF(list);
-	    Py_DECREF(h);
+	    Py_DECREF(hdr);
 	    return NULL;
 	}
+	Py_DECREF(hdr);
 
-	Py_DECREF(h);
+	h = headerFree(h, NULL);	/* XXX ref held by hdr */
 
 	Py_BEGIN_ALLOW_THREADS
-	header = headerRead(fd, HEADER_MAGIC_YES);
+	h = headerRead(fd, HEADER_MAGIC_YES);
 	Py_END_ALLOW_THREADS
     }
 
@@ -1003,7 +1013,8 @@ PyObject * rpmReadHeaders (FD_t fd) {
 
 /**
  */
-PyObject * rpmHeaderFromFD(PyObject * self, PyObject * args) {
+PyObject * rpmHeaderFromFD(PyObject * self, PyObject * args)
+{
     FD_t fd;
     int fileno;
     PyObject * list;
@@ -1019,7 +1030,8 @@ PyObject * rpmHeaderFromFD(PyObject * self, PyObject * args) {
 
 /**
  */
-PyObject * rpmHeaderFromFile(PyObject * self, PyObject * args) {
+PyObject * rpmHeaderFromFile(PyObject * self, PyObject * args)
+{
     char * filespec;
     FD_t fd;
     PyObject * list;
@@ -1042,29 +1054,31 @@ PyObject * rpmHeaderFromFile(PyObject * self, PyObject * args) {
  * This assumes the order of list matches the order of the new headers, and
  * throws an exception if that isn't true.
  */
-int rpmMergeHeaders(PyObject * list, FD_t fd, int matchTag) {
-    Header newH;
-    HeaderIterator iter;
-    int_32 * newMatch, * oldMatch;
-    hdrObject * ho;
+int rpmMergeHeaders(PyObject * list, FD_t fd, int matchTag)
+{
+    Header h;
+    HeaderIterator hi;
+    int_32 * newMatch;
+    int_32 * oldMatch;
+    hdrObject * hdr;
     int count = 0;
     int type, c, tag;
     void * p;
 
     Py_BEGIN_ALLOW_THREADS
-    newH = headerRead(fd, HEADER_MAGIC_YES);
+    h = headerRead(fd, HEADER_MAGIC_YES);
     Py_END_ALLOW_THREADS
 
-    while (newH) {
-	if (!headerGetEntry(newH, matchTag, NULL, (void **) &newMatch, NULL)) {
+    while (h) {
+	if (!headerGetEntry(h, matchTag, NULL, (void **) &newMatch, NULL)) {
 	    PyErr_SetString(pyrpmError, "match tag missing in new header");
 	    return 1;
 	}
 
-	ho = (hdrObject *) PyList_GetItem(list, count++);
-	if (!ho) return 1;
+	hdr = (hdrObject *) PyList_GetItem(list, count++);
+	if (!hdr) return 1;
 
-	if (!headerGetEntry(ho->h, matchTag, NULL, (void **) &oldMatch, NULL)) {
+	if (!headerGetEntry(hdr->h, matchTag, NULL, (void **) &oldMatch, NULL)) {
 	    PyErr_SetString(pyrpmError, "match tag missing in new header");
 	    return 1;
 	}
@@ -1074,37 +1088,39 @@ int rpmMergeHeaders(PyObject * list, FD_t fd, int matchTag) {
 	    return 1;
 	}
 
-	ho->md5list = _free(ho->md5list);
-	ho->fileList = _free(ho->fileList);
-	ho->linkList = _free(ho->linkList);
-
-	iter = headerInitIterator(newH);
+	hdr->md5list = _free(hdr->md5list);
+	hdr->fileList = _free(hdr->fileList);
+	hdr->linkList = _free(hdr->linkList);
 
-	while (headerNextIterator(iter, &tag, &type, (void *) &p, &c)) {
+	for (hi = headerInitIterator(h);
+	    headerNextIterator(hi, &tag, &type, (void *) &p, &c);
+	    p = headerFreeData(p, type))
+	{
 	    /* could be dupes */
-	    headerRemoveEntry(ho->h, tag);
-	    headerAddEntry(ho->h, tag, type, p, c);
-	    headerFreeData(p, type);
+	    headerRemoveEntry(hdr->h, tag);
+	    headerAddEntry(hdr->h, tag, type, p, c);
 	}
 
-	headerFreeIterator(iter);
+	headerFreeIterator(hi);
 
 	Py_BEGIN_ALLOW_THREADS
-	newH = headerRead(fd, HEADER_MAGIC_YES);
+	h = headerRead(fd, HEADER_MAGIC_YES);
 	Py_END_ALLOW_THREADS
     }
 
     return 0;
 }
 
-PyObject * rpmMergeHeadersFromFD(PyObject * self, PyObject * args) {
+PyObject * rpmMergeHeadersFromFD(PyObject * self, PyObject * args)
+{
     FD_t fd;
     int fileno;
     PyObject * list;
     int rc;
     int matchTag;
 
-    if (!PyArg_ParseTuple(args, "Oii", &list, &fileno, &matchTag)) return NULL;
+    if (!PyArg_ParseTuple(args, "Oii", &list, &fileno, &matchTag))
+	return NULL;
 
     if (!PyList_Check(list)) {
 	PyErr_SetString(PyExc_TypeError, "first parameter must be a list");
@@ -1126,17 +1142,20 @@ PyObject * rpmMergeHeadersFromFD(PyObject * self, PyObject * args) {
 
 /**
  */
-PyObject * versionCompare (PyObject * self, PyObject * args) {
+PyObject * versionCompare (PyObject * self, PyObject * args)
+{
     hdrObject * h1, * h2;
 
-    if (!PyArg_ParseTuple(args, "O!O!", &hdr_Type, &h1, &hdr_Type, &h2)) return NULL;
+    if (!PyArg_ParseTuple(args, "O!O!", &hdr_Type, &h1, &hdr_Type, &h2))
+	return NULL;
 
-    return Py_BuildValue("i", rpmVersionCompare(h1->h, h2->h));
+    return Py_BuildValue("i", hdr_compare(h1, h2));
 }
 
 /**
  */
-PyObject * labelCompare (PyObject * self, PyObject * args) {
+PyObject * labelCompare (PyObject * self, PyObject * args)
+{
     char *v1, *r1, *e1, *v2, *r2, *e2;
     int rc;
 
diff --git a/python/header-py.h b/python/header-py.h
index 127df885c..397e45fa6 100644
--- a/python/header-py.h
+++ b/python/header-py.h
@@ -14,8 +14,12 @@ extern PyTypeObject hdr_Type;
  */
 PyObject * pyrpmError;
 
-hdrObject * createHeaderObject(Header h);
+hdrObject * hdr_Wrap(Header h);
+
 Header hdrGetHeader(hdrObject * h);
+
+long tagNumFromPyObject (PyObject *item);
+
 PyObject * labelCompare (PyObject * self, PyObject * args);
 PyObject * versionCompare (PyObject * self, PyObject * args);
 PyObject * rpmMergeHeadersFromFD(PyObject * self, PyObject * args);
@@ -26,6 +30,5 @@ PyObject * rpmReadHeaders (FD_t fd);
 PyObject * rhnLoad(PyObject * self, PyObject * args);
 PyObject * hdrLoad(PyObject * self, PyObject * args);
 PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args);
-long tagNumFromPyObject (PyObject *item);
 
 #endif
diff --git a/python/rpmal-py.c b/python/rpmal-py.c
index 4ab698bb3..cf56a9481 100644
--- a/python/rpmal-py.c
+++ b/python/rpmal-py.c
@@ -121,7 +121,7 @@ static char rpmal_doc[] =
 PyTypeObject rpmal_Type = {
 	PyObject_HEAD_INIT(&PyType_Type)
 	0,				/* ob_size */
-	"rpm.ds",			/* tp_name */
+	"rpm.al",			/* tp_name */
 	sizeof(rpmalObject),		/* tp_basicsize */
 	0,				/* tp_itemsize */
 	/* methods */
diff --git a/python/rpmds-py.c b/python/rpmds-py.c
index 72a547703..1a8ec4643 100644
--- a/python/rpmds-py.c
+++ b/python/rpmds-py.c
@@ -73,7 +73,7 @@ rpmds_TagN(rpmdsObject * s, PyObject * args)
 }
 
 static int
-rpmds_Compare(rpmdsObject * a, rpmdsObject * b)
+rpmds_compare(rpmdsObject * a, rpmdsObject * b)
 {
     return rpmdsCompare(a->ds, b->ds);
 }
@@ -234,18 +234,18 @@ PyTypeObject rpmds_Type = {
 	sizeof(rpmdsObject),		/* tp_basicsize */
 	0,				/* tp_itemsize */
 	/* methods */
-	(destructor)rpmds_dealloc,	/* tp_dealloc */
-	(printfunc)rpmds_print,		/* tp_print */
-	(getattrfunc)rpmds_getattr,	/* tp_getattr */
-	(setattrfunc)0,			/* tp_setattr */
-	(cmpfunc)rpmds_Compare,		/* tp_compare */
-	(reprfunc)0,			/* tp_repr */
+	(destructor) rpmds_dealloc,	/* tp_dealloc */
+	(printfunc) rpmds_print,	/* tp_print */
+	(getattrfunc) rpmds_getattr,	/* tp_getattr */
+	(setattrfunc) 0,		/* tp_setattr */
+	(cmpfunc) rpmds_compare,	/* tp_compare */
+	(reprfunc) 0,			/* tp_repr */
 	0,				/* tp_as_number */
 	0,				/* tp_as_sequence */
 	&rpmds_as_mapping,		/* tp_as_mapping */
-	(hashfunc)0,			/* tp_hash */
-	(ternaryfunc)0,			/* tp_call */
-	(reprfunc)0,			/* tp_str */
+	(hashfunc) 0,			/* tp_hash */
+	(ternaryfunc) 0,		/* tp_call */
+	(reprfunc) 0,			/* tp_str */
 	0,				/* tp_getattro */
 	0,				/* tp_setattro */
 	0,				/* tp_as_buffer */
@@ -256,8 +256,8 @@ PyTypeObject rpmds_Type = {
 	0,				/* tp_clear */
 	0,				/* tp_richcompare */
 	0,				/* tp_weaklistoffset */
-	(getiterfunc)rpmds_Iter,	/* tp_iter */
-	(iternextfunc)rpmds_Next,	/* tp_iternext */
+	(getiterfunc) rpmds_Iter,	/* tp_iter */
+	(iternextfunc) rpmds_Next,	/* tp_iternext */
 	rpmds_methods,			/* tp_methods */
 	0,				/* tp_members */
 	0,				/* tp_getset */
diff --git a/python/rpmfd-py.c b/python/rpmfd-py.c
index 610ce6e7e..8868521f0 100644
--- a/python/rpmfd-py.c
+++ b/python/rpmfd-py.c
@@ -162,7 +162,7 @@ static char rpmfd_doc[] =
 PyTypeObject rpmfd_Type = {
 	PyObject_HEAD_INIT(NULL)
 	0,				/* ob_size */
-	"rpm.io",			/* tp_name */
+	"rpm.fd",			/* tp_name */
 	sizeof(rpmfdObject),		/* tp_size */
 	0,				/* tp_itemsize */
 	(destructor)0,		 	/* tp_dealloc */
diff --git a/rpm.spec.in b/rpm.spec.in
index b763f55a1..3387cacfd 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.17
+Release: 0.18
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -416,8 +416,8 @@ fi
 %rpmattr	%{__prefix}/lib/rpm/brp-*
 %rpmattr	%{__prefix}/lib/rpm/check-prereqs
 %rpmattr	%{__prefix}/lib/rpm/config.site
-%rpmattr	%{__prefix}/lib/rpm/cpanflute
-%rpmattr	%{__prefix}/lib/rpm/cpanflute2
+#%rpmattr	%{__prefix}/lib/rpm/cpanflute
+#%rpmattr	%{__prefix}/lib/rpm/cpanflute2
 %rpmattr	%{__prefix}/lib/rpm/cross-build
 %rpmattr	%{__prefix}/lib/rpm/find-lang.sh
 %rpmattr	%{__prefix}/lib/rpm/find-prov.pl
@@ -515,6 +515,10 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Tue May 28 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.18
+- add rpmal/rpmte/rpmfd methods to bindings.
+- drop cpanflute and cpanflute2, will be in Chip's CPAN package now.
+
 * Sun May 26 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.17
 - fix: un-resurrect "()(64bit)" markings using objdump on i386.