58 files changed, 2165 insertions, 1142 deletions

diff --git a/CHANGES b/CHANGES
index 24828020d..ee6ab92c2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,8 @@
 	- rip out rpm{get,put}text, use getpo.sh and specspo instead.
 	- rip out rpmrc configuration.
 	- consistent return for all signature verification.
-	- use enum for signature header tags.
+	- use enums for almost all rpmlib #define's.
+	- API: change rpmProblem typedef to pass by reference, not value.
 
 3.0.6 -> 4.0
 	- use DIRNAMES/BASENAMES/DIRINDICES not FILENAMES in packages and db.
@@ -103,6 +104,7 @@
 	- add callbacks on package erasure.
 	- fix: preserve cpio errno when using Fclose with libio.
 	- fix: initialize sigs everywhere in python header object.
+	- translate rpm.8 man page (Peter Ivanyi <ivanyi@internet.sk>).
 
 3.0.4 -> 3.0.5
 	- configure.in fiddles for BSD systems (Patrick Schoo).
diff --git a/Doxyfile.in b/Doxyfile.in
index bc99b28a9..cb05324ad 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -50,7 +50,7 @@ EXTRACT_ALL            = YES
 # If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
 # will be included in the documentation. 
 
-EXTRACT_PRIVATE        = YES
+EXTRACT_PRIVATE        = NO
 
 # If the EXTRACT_STATIC tag is set to YES all static members of a file 
 # will be included in the documentation. 
@@ -348,17 +348,13 @@ INPUT                  = \
 	./popt/poptparse.c \
 	./tools/dump.c \
 	./tools/dumpdb.c \
-	./tools/fstrcmp.c \
 	./tools/javadeps.c \
-	./tools/message.c \
 	./tools/rpmarchive.c \
 	./tools/rpmchecksig.c \
-	./tools/rpmgettext.c \
 	./tools/rpmheader.c \
 	./tools/rpminject.c \
 	./tools/rpmlead.c \
-	./tools/rpmsignature.c \
-	./tools/str-list.c
+	./tools/rpmsignature.c
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
diff --git a/Doxyheader b/Doxyheader
index 2f476c494..0b5928094 100644
--- a/Doxyheader
+++ b/Doxyheader
@@ -28,6 +28,8 @@
  */
 /** \defgroup	db3	DB3.
  */
+/** \defgroup	rpmrpc	RPMRPC.
+ */
 /** \defgroup	rpmio	RPMIO.
  */
 /** \defgroup	popt	POPT.
diff --git a/configure.in b/configure.in
index 5c02e17f0..d22857796 100644
--- a/configure.in
+++ b/configure.in
@@ -957,7 +957,7 @@ AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat
 	tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
 	misc/Makefile po/Makefile.in intl/Makefile
 	doc/Makefile doc/manual/Makefile
-	doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile
+	doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
 	python/Makefile perl/Makefile perl/Makefile.PL],
 	[echo timestamp > popt/stamp-h.in
 	echo timestamp > stamp-h.in])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 294c92188..92877653b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS		= manual ja pl ru
+SUBDIRS		= manual ja pl ru sk
 
 man_MANS	= gendiff.1 rpm.8 rpm2cpio.8
 
diff --git a/doc/rpm.8 b/doc/rpm.8
index 84e8d3dfc..72c8010da 100644
--- a/doc/rpm.8
+++ b/doc/rpm.8
@@ -494,7 +494,7 @@ You will be prompted for your pass phrase, and your package will
 be built and signed.
 
 For example, to be able to use PGP to sign packages as the user
-\fp"John Doe <jdoe@foo.com>"\fP from the key rings located in
+\fB"John Doe <jdoe@foo.com>"\fP from the key rings located in
 \fB/etc/rpm/.pgp\fP using the executable \fB/usr/bin/pgp\fP you would include
 
 .I "\fB%_signature pgp\fP"
diff --git a/doc/sk/.cvsignore b/doc/sk/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/doc/sk/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/doc/sk/Makefile.am b/doc/sk/Makefile.am
new file mode 100644
index 000000000..1d079d31e
--- /dev/null
+++ b/doc/sk/Makefile.am
@@ -0,0 +1,8 @@
+## Process this file with automake to produce Makefile.in
+
+@SET_MAKE@
+
+man_MANS	= rpm.8
+mandir		= @mandir@/sk
+
+EXTRA_DIST	= $(man_MANS)
diff --git a/doc/sk/rpm.8 b/doc/sk/rpm.8
new file mode 100644
index 000000000..337d867b4
--- /dev/null
+++ b/doc/sk/rpm.8
@@ -0,0 +1,636 @@
+.\" rpm - Red Hat Package Manager
+.\"
+.\" translated into slovak by Peter Ivanyi <ivanyi@internet.sk>
+.\" for rpm version 3.0.5-9.6x
+.\"
+.TH rpm 8 "22 December 1998" "Red Hat Software" "Red Hat Linux"
+
+.SH MENO
+rpm \- Red Hat správca balíkov
+
+.SH POUŽITIE
+\fBrpm\fP [voľby] 
+
+.SH POPIS
+\fBrpm\fP je veľmi výkonný \fIsprávca balíkov\fP, ktorý môže byť
+použitý na zostavenie, inštaláciu, výpis informácií, kontrolu,
+aktualizáciu a odinštalovanie jednotlivých softverových balíkov.
+\fIBalík\fP obsahuje archív súborov a informácií o balíku vrátane
+mena, verzie a popisu.
+
+Musí byť použitý v niektorom z nasledujúcich režimov:
+\fIinicializácia databázy\fP, \fIprebudovanie databázy\fP,
+\fIzostavenie balíka\fP, \fIrekompilácia balíka\fP,
+\fIzostavenie balíka z tar archívu\fP, \fIzistenie informácií\fP,
+\fIvýpis informačných tagov\fP, \fIinštalácia\fP, \fIobčerstvenie\fP,
+\fIodinštalovanie\fP, \fIkontrola a overenie\fP, \fIoverenie podpisu\fP,
+\fIopätovný podpis\fP, \fIpridanie podpisu\fP,
+\fInastavenie vlastníkov a skupín\fP a \fIvýpis konfigurácie\fP.
+
+Spravovanie databázy:
+.br
+.I "\fB    rpm \-i [\-\-initdb]\fP"
+.br
+.I "\fB    rpm \-i [\-\-rebuilddb]\fP"
+
+Zostavenie:
+.br
+.I "\fB    rpm [\-b|t] [balík_spec]+\fP"
+.br
+.I "\fB    rpm [\-\-rebuild] [zdrojové_rpm]+\fP"
+.br
+.I "\fB    rpm [\-\-tarbuild] [tarovaný_zdroj]+\fP"
+.br
+
+Zistenie informácií:
+.br
+.I "\fB    rpm [\-\-query] [zisťovacie\-voľby]\fP"
+.br
+.I "\fB    rpm [\-\-querytags]\fP"
+.br
+
+Spravovanie inštalovaných balíkov:
+.br
+.I "\fB    rpm [\-\-install] [inštalačné\-voľby] [súbor_balíka]+\fP"
+.br
+.I "\fB    rpm [\-\-freshen|\-F] [inštalačné\-voľby] [súbor_balíka]+\fP"
+.br
+.I "\fB    rpm [\-\-uninstall|\-e] [odinštalačné\-voľby] [balík]+\fP"
+.br
+.I "\fB    rpm [\-\-verify|\-V] [overovacie\-voľby] [balík]+\fP"
+.br
+
+Podpisy (signatúry):
+.br
+.I "\fB    rpm [\-\-verify|\-V] [overovacie\-voľby] [balík]+\fP"
+.br
+.I "\fB    rpm [\-\-resign] [súbor_balíka]+\fP"
+.br
+.I "\fB    rpm [\-\-addsign] [súbor_balíka]+\fP"
+.br
+
+Rozličné:
+.br
+.I "\fB    rpm [\-\-showrc]\fP"
+.br
+.I "\fB    rpm [\-\-setperms] [balík]+\fP"
+.br
+.I "\fB    rpm [\-\-setgids] [balík]+\fP"
+.br
+
+
+.SH VŠEOBECNÉ VOĽBY
+Tieto voľby môžu byť použité vo všetkých režimoch.
+.IP "\fB\-vv\fP"
+Vypíše množstvo ošklivých ladiacich informácií.
+.IP "\fB\-\-quiet\fP"
+Vypíše čo najmenej informácií \- normálne sa zobrazia iba chybové hlášky.
+.IP "\fB\-\-help\fP"
+Vypíše o niečo dlhšiu informáciu o použití ako je bežný výpis.
+.IP "\fB\-\-version\fP"
+Vypíše jednoriadkovú informáciu pozostávajúcu z čísla používanej verzie
+\fBrpm\fP.
+.IP "\fB\-\-rcfile \fI<zoznam_súborov>\fP"
+Každý zo súborov v \fI<zoznam_súborov>\fP oddelených dvojbodkami je
+postupne čítaný cez \fBrpm\fP za účelom získania konfiguračných informácií.
+Implicitný \fI<zoznam súborov>\fP je
+\fB/usr/lib/rpm/rpmrc:/etc/rpmrc:~/.rpmrc\fP.
+Iba prvý súbor zo zoznamu súborov musí existovať, a vlnovky (~) sú
+expandované na hodnotu \fB$HOME\fP.
+.IP "\fB\-\-root \fI<adresár>\fP"
+Použije adresár \fI<adresár>\fP ako koreňový adresár systému pre všetky operácie.
+Uvedomte si, že toto znamená, že databáza sa sa bude čítať alebo modifikovať
+pod adresárom \fI<adresár>\fP a všetky predinštalačné a poinštalačné skripty
+budú bežať po prevedení chroot() na adresár \fI<adresár>\fP.
+.IP "\fB\-\-dbpath \fI<cesta>\fP"
+Použije databázu RPM v ceste \fI<cesta>\fP.
+.IP "\fB\-\-justdb\fP"
+Aktualizuje iba databázu a nie súborový systém.
+.IP "\fB\-\-ftpproxy \fI<počítač>\fP, \fB\-\-httpproxy \fI<počítač>\fP"
+Použije \fI<počítač>\fP ako počítač s FTP alebo HTTP proxy serverom.
+Bližšie podrobnosti sú uvedené v sekcii \fBVOĽBY FTP/HTTP\fP.
+.IP "\fB\-\-ftpport \fI<port>\fP, \fB\-\-httpport \fI<port>\fP"
+Použije \fI<port>\fP ako FTP alebo HTTP port na počítači s proxy serverom.
+Bližšie podrobnosti sú uvedené v sekcii \fBVOĽBY FTP/HTTP\fP.
+.IP "\fB\-\-pipe \fI<príkaz>\fP"
+Presmeruje výstup \fBrpm\fP na príkaz \fI<príkaz>\fP.
+
+
+.SH VOĽBY PRI INŠTALÁCII A AKTUALIZÁCII (UPGRADE)
+Všeobecná forma inštalačného príkazu je
+.PP
+	\fBrpm \-i [inštalačné\-voľby] \fI<súbor_balíka>+\fP
+.PP
+Táto voľba nainštaluje nový balíček.
+Všeobecná forma aktualizačného príkazu je
+.PP
+	\fBrpm \-U [inštalačné\-voľby] \fI<súbor_balíka>+\fP
+.PP
+Táto voľba aktualizuje existujúci nainštalovaný balíček alebo nainštaluje
+nový balíček. Podobá sa inštalačnému príkazu, rozdiel je iba v tom, že
+všetky ďaľšie verzie balíka sa odstránia zo systému.
+.PP
+	\fBrpm [\-F|--freshen] [inštalačné\-voľby] \fI<súbor_balíka>+\fP
+.PP
+Táto voľba aktualizuje balíky, ale iba za predpokladu, že predchádzajúce
+verzie sú nainštalované.
+
+\fI<súbor_balíka>\fP môže byť špecifikovaný ako ftp alebo http URL,
+v tomto prípade sa najprv balíček stiahne a nainštaluje až potom.
+Bližšie podrobnosti o vstavanej podpore ftp a http sú uvedené v sekcii
+\fBVOĽBY FTP/HTTP\fP.
+.PP
+.IP "\fB\-\-force\fP"
+Rovnaký efekt ako súčasné použitie \fB\-\-replacepkgs\fP, \fB\-\-replacefiles\fP a 
+\fB\-\-oldpackage\fP.
+.IP "\fB\-h\fP, \fB\-\-hash\fP"
+Vypíše 50 znakov #, keď je celý archív balíka rozbalený. Pre lepší
+vzhľad je vhodné používať s voľbou \fB\-v\fP.
+.IP "\fB\-\-oldpackage\fP"
+Povolí aktualizáciu prepísaním novšieho balíka starším.
+.IP "\fB\-\-percent\fP"
+Vypíše stav rozbalovania súborov z balíkového archívu v percentách.
+Toto je praktické pri behu RPM z iných nástrojov.
+.IP "\fB\-\-replacefiles\fP"
+Nainštaluje balík aj v prípade, že nahradí súbory z iných, už
+nainštalovaných balíkov.
+.IP "\fB\-\-replacepkgs\fP"
+Nainštaluje balíky aj v prípade, že niektoré z nich už sú nainštalované
+v systéme.
+.IP "\fB\-\-allfiles\fP"
+Nainštaluje alebo aktualizuje všetky missingok súbory (súbory, ktoré nemusia
+nutne existovať) z balíka bez ohľadu na to, či existujú.
+.IP "\fB\-\-nodeps\fP"
+Nevykoná kontrolu závislostí pred inštalovaním alebo aktualizovaním
+balíka.
+.IP "\fB\-\-noscripts\fP"
+Nevykoná predinštalačné a poinštalačné skripty.
+.IP "\fB\-\-notriggers\fP"
+Nevykoná skripty, ktorých spúšťou je inštalácia balíka.
+.IP "\fB\-\-ignoresize\fP"
+Nevykoná kontrolu pripojeného súborového systému na dostatok voľného miesta
+pred inštaláciou balíka.
+.IP "\fB\-\-excludepath \fI<cesta>\fP"
+Nenainštaluje súbory, ktorých mená začínajú na \fI<cesta>\fP.
+.IP "\fB\-\-excludedocs\fP"
+Nenainštaluje žiadne súbory, ktoré sú označené ako dokumentácia (ktoré
+zahŕňajú najmä manuálové stránky a texinfo dokumenty).
+.IP "\fB\-\-includedocs\fP"
+Nainštaluje súbory, ktoré sú označené ako dokumentácia. Toto je implicitné
+nastavenie.
+.IP "\fB\-\-test\fP"
+Nenainštaluje balík, iba jednoducho otestuje, čo by sa vykonalo pri
+inštalácii a vypíše potenciálne konflikty.
+.IP "\fB\-\-ignorearch\fP"
+Toto umožní inštaláciu alebo aktualizáciu aj v prípade, že sa nezhoduje
+architektúra popísaná v binárnom RPM a počítača, na ktorý sa má balík
+inštalovať.
+.IP "\fB\-\-ignoreos\fP"
+Toto umožní inštaláciu alebo aktualizáciu aj v prípade, že sa nezhoduje
+operačný systém popísaný v binárnom RPM a počítači, na ktorý sa má balík
+inštalovať.
+.IP "\fB\-\-prefix \fI<cesta>\fP"
+Toto nastaví inštalačný prefix na \fI<cesta>\fP pre relokovateľné
+(premiestniteľné) balíky.
+.IP "\fB\-\-relocate \fI<stará_cesta>\fB=\fI<nová_cesta>\fP"
+Pre relokovateľné balíky, preloží cestu súborov, ktoré sa mali umiestniť
+na miesto \fI<stará_cesta>\fP do \fI<nová_cesta>\fP.
+.IP "\fB\-\-badreloc\fP"
+Vnúti relokáciu aj v prípade, že balík nie je relokovateľný. Používa sa
+spolu s voľbou \-\-relocate.
+.IP "\fB\-\-noorder\fP"
+Nezmení poradie balíkov na inštaláciu. V opačnomom prípade by mohlo byť
+zmenené poradie v zozname balíkov, aby sa zachovali závislosti.
+
+
+.SH VOĽBY PRI ZISTENÍ INFORMÁCIÍ (QUERY)
+Všeobecná forma príkazu zistenia informácií je
+.PP
+	\fBrpm \-q [zisťovacie\-voľby]\fP
+.PP
+Je možné špecifikovať, v akom formáte majú byť vypísané výstupné údaje.
+Na takýto účel slúži voľba \fB[\-\-queryformat|\-\-qf]\fP, nasledovaná
+formátovacím reťazcom.
+
+Informačné výstupy sú modifikovanou verziou štandardného \fBprintf(3)\fP
+formátovania. Formát je vytvorený zo statických reťazcov (ktoré môžu zahŕňať
+štandardné C znakové escape sekvencie pre nový riadok, tabelátor a ďaľšie
+špeciálne znaky a \fBprintf(3)\fP typové formátovače). Keďže \fBrpm\fP už
+vie, aky typ má vytlačiť, špecifikátor typu musí byť vynechaný a nahradený
+menom tagu hlavičky, ktorá má byť vytlačená, uzavretý znakmi {}. RPMTAG_
+časť mena tagu môže byť vynechaná.
+
+Alternatívny výstup formátovania môže byť požadovaný, ak je nasledovaný
+tagom s \fB:\fItypetag\fR. Momentálne sú podporované nasledujúce typy:
+\fBoctal\fR, \fBdate\fR, \fBshescape\fR, \fBperms\fR, \fBfflags\fR, a
+\fBdepflags\fR.
+
+Napríklad na vytlačenie informácie o mene balíka je možné použiť
+formátovací reťazec \fB%{NAME}\fP. Na vytlačenie informácie o mene
+a distribúcii v dvoch stĺpcoch je možné použiť
+\fB%\-30{NAME}%{DISTRIBUTION}\fP.
+
+\fBrpm\fP zobrazí zoznam všetkých tagov, ktoré pozná, keď je spustené
+s argumentom \fB\-\-querytags\fP.
+
+Existujú dve podmnožiny volieb pre zistenie informácií: výber balíka a
+výber informácií.
+
+Voľby výberu balíka:
+.br
+.IP "\fB\fI<meno_balíka>\fP"
+Zisťuje u inštalovaných balíkov s menom \fI<meno_balíka>\fP.
+.IP "\fB\-a\fP, \fB\-\-all\fP"
+Zisťuje u všetkých nainštalovaných balíkov.
+.IP "\fB\-\-whatrequires \fI<schopnosť>\fP"
+Zisťuje u všetkých inštalovaných balíkov, ktoré vyžadujú \fI<schopnosť>\fP
+pre správnu funkčnosť.
+.IP "\fB\-\-whatprovides \fI<virtuálna_schopnosť>\fP"
+Zisťuje u všetkých inštalovaných balíkov, ktoré poskytujú vlastnosť
+\fI<virtuálna_schopnosť>\fP.
+.IP "\fB\-f \fI<file>\fP, \fB\-\-file \fI<file>\fP"
+Zisťuje u balíka, ktorý vlastní súbor \fI<file>\fP.
+.IP "\fB\-g \fI<group>\fP, \fB\-\-group \fI<group>\fP"
+Zisťuje u balíkov, ktoré majú skupinu \fI<group>\fP.
+.IP "\fB\-p \fI<súbor_balíka>\fP"
+Zisťuje u (nenainštalovaného) balíka \fI<súbor_balíka>\fP.
+\fI<súbor_balíka>\fP môže byť špecifikovaný v ftp alebo http štýle URL,
+v takomto prípade bude stiahnutá hlavička balíka, a z nej čítané požadované
+informácie. Bližšie informácie o vstavanej podpore ftp a http klienta sú
+v sekcii \fBFTP/HTTP VOĽBY\fP.
+.IP "\fB\-\-specfile \fI<spec_súbor>\fP"
+Rozanalyzuje \fI<spec_súbor>\fP a zisťuje informácie z tohto súboru, ako keby
+to bol balík rpm. Aj napriek neprítomnosti všetkých informácií (napr. zoznam
+súborov), tento druh zisťovania umožňuje rpm získať informácie zo spec súboru
+bez nutnosti napísať špeciálny analyzátor spec súborov.
+.IP "\fB\-\-querybynumber \fI<číslo>\fP"
+Zisťuje u záznamu číslo \fI<číslo>\fP databázy priamo, toto je užitočné pre
+ladiace účely.
+.IP "\fB\-\-triggeredby \fI<balík>\fP"
+Vypíše balíky, ktorých spúštou je existencia balíka \fI<balík>\fP.
+
+.P
+Voľba výberu informácií:
+.br
+.IP "\fB\-i\fP"
+Vypíše informácie o balíku, vrátane mena, verzie a popisu. Táto voľba
+využíva \fB\-\-queryformat\fP, ak je špecifikovaný.
+.IP "\fB\-R\fP, \fB\-\-requires\fP"
+Vypíše zoznam balíkov, na ktorých daný balík závisí.
+.IP "\fB\-\-provides\fP"
+Vypíše zoznam vlastností/schopností, ktoré poskytuje tento balík.
+.IP "\fB\-\-changelog\fP"
+Vypíše históriu zmien pre balík.
+.IP "\fB\-l\fP, \fB\-\-list\fP"
+Vypíše zoznam súborov v balíku.
+.IP "\fB\-s\fP, \fB\-\-state\fP"
+Vypíše \fIstavy\fP jednotlivých súborov v balíku (aplikuje voľbu
+\fB\-l\fP). Stav jednotlivých súborov môže byť \fInormal\fP (normálny),
+\fInot installed\fP (nenainštalovaný) alebo \fIreplaced\fP (nahradený).
+.IP "\fB\-d\fP, \fB\-\-docfiles\fP"
+Vypíše zoznam súborov označených ako dokumentácia (aplikuje \fB\-l\fP).
+.IP "\fB\-c\fP, \fB\-\-configfiles\fP"
+Vypíše iba zoznam konfiguračných súborov (aplikuje \fB\-l\fP).
+.IP "\fB\-\-scripts\fP"
+Vypíše balíkovo špecifický shellový skript, ktorý je použitý
+v inštalačnom alebo odinštalačnom procese, ak nejaký vôbec existuje.
+.IP "\fB\-\-triggers\fP, \fB\-\-triggerscripts\fP"
+Vypíše skripty, ktoré sú spúšťané spúšťou, ak nejaká existuje a je
+obsiahnutá v balíku.
+.IP "\fB\-\-dump\fP"
+Vypíše zoznam podrobných vlastností súborov pozostoávajúci z:
+cesta veľkosť mtime md5sum mód vlastník skupina je_konfiguračný_súbor
+je_dokumentačný_súbor rdev symlink. Táto voľba musí byť použitá
+minimálne s jednou z nasledujúcich volieb \fB\-l\fP, \fB\-c\fP, \fB\-d\fP.
+.IP "\fB\-\-last\fP"
+Usporiada zoznam balíkov podľa času inštalácie takým spôsobom, že posledný
+inštalovaný balík bude na vrchu.
+.IP "\fB\-\-filesbypkg\fP"
+Vypíše zoznam všetkých súborov v každom balíku.
+.IP "\fB\-\-triggerscripts\fP"
+Vypíše všetky skripty, ktoré sú spúšťané spúšťou vo vybranom balíku.
+
+
+.SH VOĽBY PRI KONTROLE A OVEROVANÍ
+Všeobecná forma príkazu kontroly je
+.PP
+	\fBrpm \-V|\-y|\-\-verify [overovacie\-voľby]\fP
+.PP
+Kontrola balíka prebieha z porovnania informácií z inštalovaných súborov
+z balíkov v systéme s informáciami o súboroch, ktoré obsahoval pôvodný balík
+(tieto su uložené v rpm databáze). Okrem iných údajov, kontrola porovnáva
+veľkosť, MD5 kontrolný súčet, oprávnenia, typ, vlastníka a skupinu každého
+súboru. Všetky odchýľky sú zobrazené. Specifikačné voľby balíka sú rovnaké
+ako režime výpisu informácii balíkov.
+
+Súbory, ktoré neboli inštalované z balíka, týkajúce sa napr. dokumentačných
+súborov pri použití voľby "\fB\-\-excludedocs\fP" pri inštalácii, sú v
+tichosti ignorované.
+
+Voľby, ktoré môžu byť použité v kontrolnom režime:
+
+.IP "\fB\-\-nofiles\fP"
+Ignoruje chýbajúce súbory v systéme počas kontroly.
+.IP "\fB\-\-nomd5\fP"
+Ignoruje chyby kontrolných súčtov MD5 počas kontroly.
+.IP "\fB\-\-nopgp\fP"
+Ignoruje chyby PGP podpisov počas kontroly.
+
+Výstup má formát 8 znakového reťazca, s prípadným rozšírením výskytu
+"\fBc\fP", ktoré charakterizuje konfiguračný súbor a mena súboru.
+Každý z ôsmych znakov popisuje výsledok porovnania jedného konkrétneho
+atribútu súboru s údajmi zaznamenanými v RPM databáze. Jednoduchá "\fB.\fP"
+(bodka) znamená, že test prešiel (neobjavené žiadne odchýľky).
+Nasledujúce znaky oznamujú dôvod neúspechu určitého testu:
+
+.IP "\fB5\fP"
+MD5 kontrolný súčet
+.IP "\fBS\fP"
+Veľkosť súboru
+.IP "\fBL\fP"
+Symbolický link
+.IP "\fBT\fP"
+Mtime (posledný čas modifikácie)
+.IP "\fBD\fP"
+Zariadenie
+.IP "\fBU\fP"
+Užívateľ
+.IP "\fBG\fP"
+Skupina
+.IP "\fBM\fP"
+Mód (vrátane oprávnení a typu súborov)
+
+
+.SH KONTROLA PODPISOV (SIGNATURE)
+Všeobecná forma príkazu kontroly rpm podpisu je
+.PP
+	\fBrpm \-\-checksig \fI<súbor_balíka>+\fP
+.PP
+Takto sa overuje PGP podpis balíka \fI<súbor_balíka>\fP na uistenie
+sa o jeho integrite a pôvode.
+Konfiguračné informácie PGP sú čítané z konfiguračných súborov.
+Bližšie údaje sa nachádzajú v sekcii PGP POPDPISY.
+
+
+.SH VOĽBY PRI ODINŠTALÁCII
+Všeobecná forma príkazu na odinštalovanie je
+.PP
+	\fB    rpm \-e \fI<meno_balíka>+\fP
+.PP
+.IP "\fB\-\-allmatches\fP"
+Odstráni všetky verzie balíka, ktoré súhlasia s menom \fI<meno_balíka>\fR.
+Normálne sa vyvolá chyba, ak viac balíkov súhlasí s menom
+\fI<meno_balíka>\fR.
+.IP "\fB\-\-noscripts\fP"
+Nevykoná pred a po odinštalačné skripty.
+.IP "\fB\-\-notriggers\fP"
+Nevykoná skripty, ktorých spúšťou je odinštalovanie balíka.
+.IP "\fB\-\-nodeps\fP"
+Nebude skúmať závislosti pri odinštalovaní balíkov.
+.IP "\fB\-\-test\fP"
+Nič sa v skutočnosti neodinštaluje, len sa preverí, čo by sa malo stať.
+Veľmi užitočné s voľbou \fB\-vv\fP.
+
+
+.SH VOĽBY PRI ZOSTAVOVANÍ
+Všeobecná forma príkazu na zostavenie rpm je
+.PP
+    \fBrpm \-[b|t]\fIO\fP [zostavovacie\-voľby] \fI<spec_súbor_balíka>+\fP
+.PP
+Argumentom je \fB-b\fR, ak sa na zostavenie balíka použije spec súbor
+(súbor špecifikácií balíka) alebo \fB-t\fR, ak \fBRPM\fR má vyhľadať
+spec súbor vnútri gzipovaného (alebo komprimovaného) tar archívu, a tento
+použiť na zostavenie balíka. Po prvom argumente ďaľší argument (\fIO\fR)
+špecifikuje fázu štádia zostavenia a zabalenia, ktorá sa má vykonať, a
+ktorá je jedna z:
+
+.IP "\fB\-bp\fP"
+Vykoná "%prep" fázu pre spec súbor. Normálne toto vyvolá rozbalenie
+zdrojových archívov a aplikovanie záplat.
+.IP "\fB\-bl\fP"
+Vykoná "kontrolu zoznamu". Sekcia "%files" z spec súboru je makrom
+expandovaná, a je vykonaná kontrola, že každý súbor existuje.
+.IP "\fB\-bc\fP"
+Vykoná fázu "%build" pre spec súbor (po vykonaní prep fázy). Toto
+normálne vyvolá ekvivalent príkazu "make".
+.IP "\fB\-bi\fP"
+Vykoná fázu "%install" zo spec súboru (po vykonaní prep a build fázy).
+Toto vo všeobecnosti vyvolá ekvivalent príkazu "make install".
+.IP "\fB\-bb\fP"
+Zostaví binárny balík (po vykonaní prep, build a install fázy).
+.IP "\fB\-bs\fP"
+Zostaví iba zdrojový balík (po vykonaní prep, build a install fázy).
+.IP "\fB\-ba\fP"
+Zostaví binárny a zdrojový balík (po vykonaní prep, build a install fázy).
+.PP
+Môžu byť použité aj nasledujúce voľby:
+.IP "\fB\-\-short\-circuit\fP"
+Preskočí priamo na požadovanú fázu (t. zn. preskočí všetky fázy štádia
+zostavenia, ktoré predchádzajú špecifikovanej fáze). Táto voľba je platná
+iba s prepínačmi \fB\-bc\fP and \fB\-bi\fP.
+.IP "\fB\-\-timecheck\fP"
+Nastavuje "kontrolu času" (0 zakáže). Táto voľba môže byť nastavená
+definovaním makra "_timecheck". Hodnota "kontroly času" vyjadruje
+(v sekundách) maximálny vek súborov, ktoré budú zabalené. Varovania
+sú vypisované pre všetky súbory, ktorých vek je za hranicou takto
+definovanej hodnoty.
+.IP "\fB\-\-clean\fP"
+Odstrání zostavovací strom (adresár) potom, čo sa vytvorí balík.
+.IP "\fB\-\-rmsource\fP"
+Odstrání zdrojové súbory a spec súbor po zostavení (môže sa používať aj
+samostatne, napr. "\fBrpm \-\-rmsource foo.spec\fP").
+.IP "\fB\-\-test\fP"
+Nevykoná žiadnu zo zostavovacej fázy.
+Užitočné pre otestovanie spec súboru.
+.IP "\fB\-\-sign\fP"
+Vloží PGP podpis do balíka. Tento podpis môže byť využitý na overenie
+integrity a pôvodu balíka. Bližšie informácie na nastavenie sú uvedené
+v sekcii PGP PODPISY.
+.IP "\fB\-\-buildroot \fI<adresár>\fP"
+Pri zostavovaní balíka prepíše tag BuildRoot adresárom \fI<adresár>\fP.
+.IP "\fB\-\-target \fI<platforma>\fP"
+Pri zostavovaní balíka sa interpretuje \fI<platforma>\fP ako
+\fBarch-vendor-os\fP a makrá \fB_target\fP, \fB_target_arch\fP a
+\fB_target_os\fP sa nastavia podľa tejto hodnoty.
+.IP "\fB\-\-buildarch \fI<architektúra>\fP"
+Pri zostavovaní balíka nastaví architektúru na \fI<architektúra>\fP. Táto
+voľba sa stala zastaralou použitím \fB\-\-target\fI v RPM 3.0.
+.IP "\fB\-\-buildos \fI<os>\fP"
+Pri zostavovaní balíka nastaví architektúru na \fI<os>\fP.Táto
+voľba sa stala zastaralou použitím \fB\-\-target\fI v RPM 3.0.
+
+
+.SH VOĽBY PRI ZNOVUZOSTAVOVANÍ A REKOMPILOVANÍ
+
+Existujú dve voľby, ako spustiť zostavenie balíka s rpm:
+
+.I "\fBrpm \-\-recompile \fI<zdrojový_súbor_balíka>+\fP"
+
+.I "\fBrpm \-\-rebuild \fI<zdrojový_súbor_balíka>+\fP"
+
+Keď je rpm spustené týmto spôsobom, \fBrpm\fP nainštaluje zdrojový balík a
+vykoná postupne fázy prípravy (prep), kompilácie a inštalácie. Prídavne
+s voľbou \fB\-\-rebuild\fP zostaví nový binárny balík. Keď sa zostavenie
+dokončí, adresár zostavovania (ako pri \fB\-\-clean\fP), zdrojové súbory,
+ako aj spec súbor sa sa odstránia.
+
+
+.SH PODPISOVANIE EXISTUJÚCEHO RPM
+
+.I "\fBrpm \-\-resign \fI<binárny_súbor_balíka>+\fP"
+
+Táto voľba vygeneruje a vloží nový podpis pre zoznam balíkov.
+Všetky prípadne existujúce podpisy sa odstránia.
+
+.I "\fBrpm \-\-addsign \fI<binárny_súbor_balíka>+\fP"
+
+Táto voľba vygeneruje a pridá nový podpis pre zoznam balíkov u ktorých
+už podpis existuje.
+
+
+.SH PGP PODPISY
+
+Aby bolo možné používať vlastnosti podpisovania, RPM je potrebné nastaviť
+spôsobom, aby mohlo spúšťať PGP, a aby bolo schopné nájsť zväzok verejných
+kľúčov s RPM verejnými kľúčmi v ňom. Implicitne RPM používa implicitné
+hodnoty PGP na nájdenie zväzkov kľúčov (honorujúc PGPPATH).
+Ak je zväzok kľúčov umiestnený na inom mieste, ako PGP očakáva, je potrebné
+nastaviť makro
+
+.IP "\fB_pgp_path\fP"
+na definovanie umiestnenia zväzkov kľúčov PGP, ktoré sa majú použiť.
+.PP
+
+Ak si želáte podpisovať balíky, ktoré si sami vytvoríte, potrebujete
+podobným spôsobom vytvoriť váš verejný a tajný kľúčový pár (bližšie informácie
+sú v dokumentácii ku PGP).
+Taktiež potrebujete konfigurovať makrá:
+
+.IP "\fB_signature\fP"
+Typ podpisu. Momentálne je podporované iba pgp.
+.IP "\fB_pgp_name\fP"
+Meno "užívateľa", ktorého kľúčom sa má podpísať balík.
+.PP
+
+Pri zostavovaní balíka je potrebné pridať \-\-sign do príkazového
+riadku. Nasledovne sa objaví výzva na heslo, a po správnom zadadaní
+sa balík zostaví a podpíše.
+
+Napríkad pre použitie PGP na podpísanie balíka ako užívateľ
+\fB"John Doe <jdoe@foo.com>"\fP zo zväzku kľúčov umiestnených
+v \fB/etc/rpm/.pgp\fP použitím \fB/usr/bin/pgp\fP zápis bude
+obsahovať
+
+.I "\fB%_signature pgp\fP"
+
+.I "\fB%_pgp_path /etc/rpm/.pgp\fP"
+
+.I "\fB%_pgp_name John Doe <jdoe@foo.com>\fP"
+
+.I "\fB%_pgpbin /usr/bin/pgp\fP"
+
+v konfiguračnom súbore makier: \fB/etc/rpm/macros\fP je určený na
+per-systém nastavenie a \fB~/.rpmmacros\fP na per-užívateľ nastavenie.
+
+
+.SH VOĽBY PRI PREBUDOVANÍ DATABÁZY
+Všeobecná forma príkazu prebudovania databázy je
+.PP
+	\fBrpm \-\-rebuilddb\fP
+.PP
+
+Na vybudovanie novej databázy treba vykonať
+.PP
+	\fBrpm \-\-initdb\fP
+.PP
+
+Jedinými voľbami pre tento režim sú \fB-\-dbpath\fP a \fB-\-root\fP.
+
+
+.SH SHOWRC 
+
+Spustením 
+
+.PP
+	\fBrpm \-\-showrc\fP
+
+.PP
+sa vypíšu hodnoty, ktoré bude RPM používať pri všetkých voľbách, a
+ktoré môžu byť nastavené v \fIrpmrc\fP súboroch.
+
+
+.SH FTP/HTTP VOĽBY
+
+RPM obsahuje jednoduchého FTP a HTTP klienta na zjednodušenie inštalácie
+a jednoduchšieho získania informácií balíkov, ktoré sú umiestenené na sieti.
+Súbory balíkov určené pre inštalovanie, aktualizáciu a výpis informácií je
+možné špecifikovať v ftp alebo http štýle URL:
+
+.PP
+	\fBftp://<užívateľ>:<heslo>@počítač:<port>/path/to/package.rpm\fP
+.PP
+Ak časť \fB:heslo\fP chýba, objaví sa výzva na heslo (vždy len jeden krát
+pre pár užívateľ/počítač). Ak chýbajú obe časti - užívateľ aj heslo, použitý
+je anonymný ftp. Vo všetkých prípadoch je použitý pasívny (PASV) ftp prenos.
+
+RPM povoluje použiť nasledujúce voľby s ftp URL:
+
+.IP "\fB\--ftpproxy \fI<meno_počítača>\fP"
+Počítač \fI<meno_počítača>\fP sa použije ako proxy server pre všetky ftp
+prenosy, čo umožní užívateľom použiť ftp služby za firewallom, ktorý
+používa proxy systémy.
+Táto voľba môže byť tak isto špecifikovaná nastavením makra \fB_ftpproxy\fP.
+
+.IP "\fB\--ftpport \fI<port>\fP"
+Použije sa číslo TCP portu \fI<port>\fP pre ftp spojenie s ftp proxy
+serverom namiesto implicitného portu. Táto voľba môže byť tak isto
+špecifikovaná nastavením makra \fB_ftpport\fP.
+.PP
+
+RPM umožňuje nasledujúce voľby pri použití http URL:
+
+.IP "\fB\--httpproxy \fI<meno_počítača>\fP"
+Počítač \fI<meno_počítača>\fP bude použitý ako proxy server pre všetky http
+prenosy.
+Táto voľba môže byť tak isto špecifikovaná konfigurovaním makra
+\fB_httpproxy\fP.
+
+.IP "\fB\--httpport \fI<port>\fP"
+Použije sa číslo TCP portu \fI<port>\fP pre http spojenie s http proxy
+serverom namiesto implicitného portu.
+Táto voľba môže byť tiež špecifikovaná konfigurovaním makra
+\fB_httpport\fP.
+.PP
+
+
+.SH SÚBORY
+.nf
+/usr/lib/rpm/rpmrc
+/etc/rpmrc
+~/.rpmrc
+/usr/lib/rpm/macros
+/etc/rpm/macros
+~/.rpmmacros
+/var/lib/rpm/conflictsindex.rpm
+/var/lib/rpm/fileindex.rpm
+/var/lib/rpm/groupindex.rpm
+/var/lib/rpm/nameindex.rpm
+/var/lib/rpm/packages.rpm
+/var/lib/rpm/providesindex.rpm
+/var/lib/rpm/requiredby.rpm
+/var/lib/rpm/triggerindex.rpm
+/tmp/rpm*
+.fi
+.El
+
+.SH PRÍBUZNÁ DOKUMENTÁCIA 
+.IR glint (8) ,
+.IR rpm2cpio (8) ,
+.B http://www.rpm.org/
+.nf
+.SH AUTORI
+.nf
+Marc Ewing <marc@redhat.com>
+Jeff Johnson <jbj@redhat.com>
+Erik Troan <ewt@redhat.com>
+.fi
diff --git a/lib/install.c b/lib/install.c
index 499b55d1b..bfdda3889 100644
--- a/lib/install.c
+++ b/lib/install.c
@@ -21,7 +21,7 @@ struct callbackInfo {
     rpmCallbackFunction notify;
     const char ** specFilePtr;
     Header h;
-    void * notifyData;
+    rpmCallbackData notifyData;
     const void * pkgKey;
 };
 
@@ -523,10 +523,10 @@ static void callback(struct cpioCallbackInfo * cpioInfo, void * data)
 /**
  * @param h		header
  */
-static int installArchive(FD_t fd, struct fileInfo * files,
-			  int fileCount, rpmCallbackFunction notify,
-			  void * notifyData, const void * pkgKey, Header h,
-			  /*@out@*/const char ** specFile, int archiveSize)
+static int installArchive(FD_t fd, struct fileInfo * files, int fileCount,
+			rpmCallbackFunction notify, rpmCallbackData notifyData,
+			const void * pkgKey, Header h,
+			/*@out@*/ const char ** specFile, int archiveSize)
 {
     int rc, i;
     struct cpioFileMapping * map = NULL;
@@ -635,8 +635,8 @@ static int installArchive(FD_t fd, struct fileInfo * files,
  * @return		0 on success, 1 on bad magic, 2 on error
  */
 static int installSources(Header h, const char * rootdir, FD_t fd,
-			  const char ** specFilePtr, rpmCallbackFunction notify,
-			  void * notifyData)
+			const char ** specFilePtr,
+			rpmCallbackFunction notify, rpmCallbackData notifyData)
 {
     const char * specFile = NULL;
     int specFileIndex = -1;
@@ -878,8 +878,9 @@ const char *const fileActionString(enum fileActions a)
 }
 
 int rpmInstallSourcePackage(const char * rootdir, FD_t fd,
-			    const char ** specFile, rpmCallbackFunction notify,
-			    void * notifyData, char ** cookie)
+			const char ** specFile,
+			rpmCallbackFunction notify, rpmCallbackData notifyData,
+			char ** cookie)
 {
     int rc, isSource;
     Header h;
@@ -911,10 +912,10 @@ int rpmInstallSourcePackage(const char * rootdir, FD_t fd,
 }
 
 int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
-		         int flags, rpmCallbackFunction notify,
-			 void * notifyData, const void * pkgKey,
-			 enum fileActions * actions,
-			 struct sharedFileInfo * sharedList, FD_t scriptFd)
+			rpmtransFlags transFlags,
+			rpmCallbackFunction notify, rpmCallbackData notifyData,
+			const void * pkgKey, enum fileActions * actions,
+			struct sharedFileInfo * sharedList, FD_t scriptFd)
 {
     int rc;
     const char * name, * version, * release;
@@ -931,13 +932,13 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
     char * currDir = NULL;
 
     /* XXX this looks broke, as libraries may need /sbin/ldconfig for example */
-    if (flags & (RPMTRANS_FLAG_JUSTDB | RPMTRANS_FLAG_MULTILIB))
-	flags |= RPMTRANS_FLAG_NOSCRIPTS;
+    if (transFlags & (RPMTRANS_FLAG_JUSTDB | RPMTRANS_FLAG_MULTILIB))
+	transFlags |= RPMTRANS_FLAG_NOSCRIPTS;
 
     headerNVR(h, &name, &version, &release);
 
     rpmMessage(RPMMESS_DEBUG, _("package: %s-%s-%s files test = %d\n"),
-		name, version, release, flags & RPMTRANS_FLAG_TEST);
+		name, version, release, transFlags & RPMTRANS_FLAG_TEST);
 
     if ((scriptArg = rpmdbCountPackages(db, name)) < 0) {
 	rc = 2;
@@ -951,7 +952,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
 	rpmdbSetIteratorRelease(mi, release);
 	while ((oldH = rpmdbNextIterator(mi))) {
 	    otherOffset = rpmdbGetIteratorOffset(mi);
-	    oldH = (flags & RPMTRANS_FLAG_MULTILIB)
+	    oldH = (transFlags & RPMTRANS_FLAG_MULTILIB)
 		? headerCopy(oldH) : NULL;
 	    break;
 	}
@@ -974,7 +975,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
 	/*@-unrecog@*/ chroot(rootdir); /*@=unrecog@*/
     }
 
-    if (!(flags & RPMTRANS_FLAG_JUSTDB) && headerIsEntry(h, RPMTAG_BASENAMES)) {
+    if (!(transFlags & RPMTRANS_FLAG_JUSTDB) && headerIsEntry(h, RPMTAG_BASENAMES)) {
 	const char * defaultPrefix;
 	/* old format relocateable packages need the entire default
 	   prefix stripped to form the cpio list, while all other packages
@@ -995,7 +996,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
 	files = NULL;
     }
 
-    if (flags & RPMTRANS_FLAG_TEST) {
+    if (transFlags & RPMTRANS_FLAG_TEST) {
 	rpmMessage(RPMMESS_DEBUG, _("stopping install as we're running --test\n"));
 	rc = 0;
 	goto exit;
@@ -1003,7 +1004,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
 
     rpmMessage(RPMMESS_DEBUG, _("running preinstall script (if any)\n"));
     if (runInstScript("/", h, RPMTAG_PREIN, RPMTAG_PREINPROG, scriptArg,
-		      flags & RPMTRANS_FLAG_NOSCRIPTS, scriptFd)) {
+		      transFlags & RPMTRANS_FLAG_NOSCRIPTS, scriptFd)) {
 	rc = 2;
 	goto exit;
     }
@@ -1104,7 +1105,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
 	free(fileStates);
 	if (fileMem) freeFileMemory(fileMem);
 	fileMem = NULL;
-    } else if (flags & RPMTRANS_FLAG_JUSTDB) {
+    } else if (transFlags & RPMTRANS_FLAG_JUSTDB) {
 	if (headerGetEntry(h, RPMTAG_BASENAMES, NULL, NULL, &fileCount)) {
 	    fileStates = xmalloc(sizeof(*fileStates) * fileCount);
 	    memset(fileStates, RPMFILE_STATE_NORMAL, fileCount);
@@ -1131,7 +1132,7 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
     if (otherOffset)
         rpmdbRemove(db, otherOffset);
 
-    if (flags & RPMTRANS_FLAG_MULTILIB) {
+    if (transFlags & RPMTRANS_FLAG_MULTILIB) {
 	uint_32 multiLib, * newMultiLib, * p;
 
 	if (headerGetEntry(h, RPMTAG_MULTILIBS, NULL, (void **) &newMultiLib,
@@ -1154,12 +1155,12 @@ int installBinaryPackage(const char * rootdir, rpmdb db, FD_t fd, Header h,
     rpmMessage(RPMMESS_DEBUG, _("running postinstall scripts (if any)\n"));
 
     if (runInstScript(rootdir, h, RPMTAG_POSTIN, RPMTAG_POSTINPROG, scriptArg,
-		      (flags & RPMTRANS_FLAG_NOSCRIPTS), scriptFd)) {
+		      (transFlags & RPMTRANS_FLAG_NOSCRIPTS), scriptFd)) {
 	rc = 2;
 	goto exit;
     }
 
-    if (!(flags & RPMTRANS_FLAG_NOTRIGGERS)) {
+    if (!(transFlags & RPMTRANS_FLAG_NOTRIGGERS)) {
 	/* Run triggers this package sets off */
 	if (runTriggers(rootdir, db, RPMSENSE_TRIGGERIN, h, 0, scriptFd)) {
 	    rc = 2;
diff --git a/lib/install.h b/lib/install.h
index b3f61b925..af7d966b5 100644
--- a/lib/install.h
+++ b/lib/install.h
@@ -62,15 +62,15 @@ int runInstScript(const char * prefix, Header h, int scriptTag, int progTag,
 int runTriggers(const char * root, rpmdb rpmdb, int sense, Header h,
 		int countCorrection, FD_t scriptFd);
 
-/* while this looks for triggers in h which are set off by things in the db
-   database to calculate arguments to the trigger */
 /**
+ * Run triggers from header that are fired by the database.
  * @param root		path to top of install tree
  * @param rpmdb		rpm database
- * @param sense
+ * @param sense		@todo Document.
  * @param h		header
- * @param countCorrection
- * @param scriptFd
+ * @param countCorrection	@todo Document.
+ * @param scriptFd	@todo Document.
+ * @return		@todo Document.
  */
 int runImmedTriggers(const char * root, rpmdb rpmdb, int sense, Header h,
 		int countCorrection, FD_t scriptFd);
@@ -88,19 +88,19 @@ int runImmedTriggers(const char * root, rpmdb rpmdb, int sense, Header h,
  * @param rpmdb		rpm database
  * @param fd		package file handle
  * @param h		package header
- * @param flags		transaction flags
+ * @param transFlags	transaction flags
  * @param notify	progress callback
  * @param notifyData	progress callback private data
  * @param pkgKey	package private data
  * @param actions	array of file dispositions
  * @param sharedList	header instances of packages that share files
- * @param scriptFd
+ * @param scriptFd	@todo Document.
  * @return		0 on success, 1 on bad magic, 2 on error
  */
 int installBinaryPackage(const char * rootdir, rpmdb rpmdb, FD_t fd, Header h,
-		int flags, rpmCallbackFunction notify, 
-		void * notifyData, const void * pkgKey, 
-		enum fileActions * actions,
+		rpmtransFlags transFlags,
+		rpmCallbackFunction notify, rpmCallbackData notifyData,
+		const void * pkgKey, enum fileActions * actions,
 		struct sharedFileInfo * sharedList, FD_t scriptFd);
 
 /**
@@ -110,19 +110,18 @@ int installBinaryPackage(const char * rootdir, rpmdb rpmdb, FD_t fd, Header h,
  * @param fd		package file handle
  * @param offset	header instance in rpm database
  * @param h		package header
- * @param flags		transaction flags
+ * @param transFlags	transaction flags
  * @param notify	progress callback
  * @param notifyData	progress callback private data
  * @param pkgKey	package private data
  * @param actions	array of file dispositions
- * @param scriptFd
+ * @param scriptFd	@todo Document.
  * @return
  */
 int removeBinaryPackage(const char * rootdir, rpmdb rpmdb, unsigned int offset,
-		Header h,
-		int flags, rpmCallbackFunction notify, 
-		void * notifyData, const void * pkgKey, 
-		enum fileActions * actions,
+		Header h, rpmtransFlags flags,
+		rpmCallbackFunction notify, rpmCallbackData notifyData,
+		const void * pkgKey, enum fileActions * actions,
 		FD_t scriptFd);
 
 #ifdef __cplusplus
diff --git a/lib/problems.c b/lib/problems.c
index aeef3297b..e4fce2bb6 100644
--- a/lib/problems.c
+++ b/lib/problems.c
@@ -91,14 +91,14 @@ const char * rpmProblemString(rpmProblem prob)
     const char * altName = NULL, * altVersion = NULL, * altRelease = NULL;
     char * buf;
 
-    headerNVR(prob.h, &name, &version, &release);
+    headerNVR(prob->h, &name, &version, &release);
 
-    if (prob.altH)
-	headerNVR(prob.altH, &altName, &altVersion, &altRelease);
+    if (prob->altH)
+	headerNVR(prob->altH, &altName, &altVersion, &altRelease);
 
     buf = xmalloc(strlen(name) + strlen(version) + strlen(release) + 400);
 
-    switch (prob.type) {
+    switch (prob->type) {
       case RPMPROB_BADARCH:
 	sprintf(buf, _("package %s-%s-%s is for a different architecture"), 
 		name, version, release);
@@ -116,18 +116,18 @@ const char * rpmProblemString(rpmProblem prob)
 
       case RPMPROB_BADRELOCATE:
 	sprintf(buf, _("path %s is not relocateable for package %s-%s-%s"),
-		prob.str1, name, version, release);
+		prob->str1, name, version, release);
 	break;
 
       case RPMPROB_NEW_FILE_CONFLICT:
 	sprintf(buf, _("file %s conflicts between attemped installs of "
-		       "%s-%s-%s and %s-%s-%s"), prob.str1, name, version, 
+		       "%s-%s-%s and %s-%s-%s"), prob->str1, name, version, 
 		release, altName, altVersion, altRelease);
 	break;
 
       case RPMPROB_FILE_CONFLICT:
 	sprintf(buf, _("file %s from install of %s-%s-%s conflicts with "
-		       "file from package %s-%s-%s"), prob.str1, name, version, 
+		       "file from package %s-%s-%s"), prob->str1, name, version, 
 		release, altName, altVersion, altRelease);
 	break;
 
@@ -140,24 +140,24 @@ const char * rpmProblemString(rpmProblem prob)
       case RPMPROB_DISKSPACE:
 	sprintf(buf, _("installing package %s-%s-%s needs %ld%cb on the %s"
 		       " filesystem"), name, version, release, 
-			prob.ulong1 > (1024*1024)
-			    ? (prob.ulong1 + 1024 * 1024 - 1) / (1024 * 1024)
-			    : (prob.ulong1 + 1023) / 1024,
-			prob.ulong1 > (1024*1024) ? 'M' : 'K',
-			prob.str1);
+			prob->ulong1 > (1024*1024)
+			    ? (prob->ulong1 + 1024 * 1024 - 1) / (1024 * 1024)
+			    : (prob->ulong1 + 1023) / 1024,
+			prob->ulong1 > (1024*1024) ? 'M' : 'K',
+			prob->str1);
 	break;
 
       case RPMPROB_BADPRETRANS:
 	sprintf(buf, _("package %s-%s-%s pre-transaction syscall(s): %s failed: %s"),
 			name, version, release, 
-			prob.str1, strerror(prob.ulong1));
+			prob->str1, strerror(prob->ulong1));
 	break;
 
       case RPMPROB_REQUIRES:
       case RPMPROB_CONFLICT:
       default:
 	sprintf(buf, _("unknown error %d encountered while manipulating "
-		"package %s-%s-%s"), prob.type, name, version, release);
+		"package %s-%s-%s"), prob->type, name, version, release);
 	break;
     }
 
@@ -182,7 +182,8 @@ void rpmProblemSetPrint(FILE *fp, rpmProblemSet probs)
 	fp = stderr;
 
     for (i = 0; i < probs->numProblems; i++) {
-	if (!probs->probs[i].ignoreProblem)
-	    rpmProblemPrint(fp, probs->probs[i]);
+	rpmProblem myprob = probs->probs + i;
+	if (!myprob->ignoreProblem)
+	    rpmProblemPrint(fp, myprob);
     }
 }
diff --git a/lib/query.c b/lib/query.c
index 5eef30e3d..317de27c3 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -458,19 +458,18 @@ int showMatches(QVA_t *qva, rpmdbMatchIterator mi, QVF_t showPackage)
     return ec;
 }
 
-/*
- * XXX Eliminate linkage loop into librpmbuild.a
- */
 /**
+ * @todo Eliminate linkage loop into librpmbuild.a
  */
 int	(*parseSpecVec) (Spec *specp, const char *specFile, const char *rootdir,
 		const char *buildRoot, int inBuildArch, const char *passPhrase,
 		char *cookie, int anyarch, int force) = NULL;
 /**
+ * @todo Eliminate linkage loop into librpmbuild.a
  */
 void	(*freeSpecVec) (Spec spec) = NULL;
 
-int rpmQueryVerify(QVA_t *qva, enum rpmQVSources source, const char * arg,
+int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg,
 	rpmdb rpmdb, QVF_t showPackage)
 {
     rpmdbMatchIterator mi = NULL;
@@ -710,7 +709,7 @@ int rpmQueryVerify(QVA_t *qva, enum rpmQVSources source, const char * arg,
     return retcode;
 }
 
-int rpmQuery(QVA_t *qva, enum rpmQVSources source, const char * arg)
+int rpmQuery(QVA_t *qva, rpmQVSources source, const char * arg)
 {
     rpmdb rpmdb = NULL;
     int rc;
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index bf7b9dcbb..fe2ce4f5b 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -92,7 +92,7 @@ exit:
     return rc;
 }
 
-int rpmReSign(enum rpmKtype add, char *passPhrase, const char **argv)
+int rpmReSign(rpmResignFlags add, char *passPhrase, const char **argv)
 {
     FD_t fd = NULL;
     FD_t ofd = NULL;
@@ -146,7 +146,7 @@ int rpmReSign(enum rpmKtype add, char *passPhrase, const char **argv)
 	/* ASSERT: fd == NULL && ofd == NULL */
 
 	/* Generate the new signatures */
-	if (add != RPMK_ADD_SIGNATURE) {
+	if (add != RESIGN_ADD_SIGNATURE) {
 	    rpmFreeSignature(sig);
 	    sig = rpmNewSignature();
 	    rpmAddSignature(sig, sigtarget, RPMSIGTAG_SIZE, passPhrase);
@@ -217,7 +217,7 @@ exit:
     return rc;
 }
 
-int rpmCheckSig(int flags, const char **argv)
+int rpmCheckSig(rpmCheckSigFlags flags, const char **argv)
 {
     FD_t fd = NULL;
     FD_t ofd = NULL;
diff --git a/lib/rpmdb.h b/lib/rpmdb.h
index f687d40b3..63731b3e3 100644
--- a/lib/rpmdb.h
+++ b/lib/rpmdb.h
@@ -271,9 +271,13 @@ struct rpmdb_s {
 
 /* for RPM's internal use only */
 
-#define RPMDB_FLAG_JUSTCHECK	(1 << 0)
-#define RPMDB_FLAG_MINIMAL	(1 << 1)
-#define	RPMDB_FLAG_CHROOT	(1 << 2)
+/** \ingroup rpmdb
+ */
+enum rpmdbFlags {
+	RPMDB_FLAG_JUSTCHECK	= (1 << 0),
+	RPMDB_FLAG_MINIMAL	= (1 << 1),
+	RPMDB_FLAG_CHROOT	= (1 << 2)
+};
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 1ed538c6e..309278e60 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -97,9 +97,11 @@ static void * showProgress(const void * arg, const rpmCallbackType what,
     return rc;
 }	
 
-int rpmInstall(const char * rootdir, const char ** fileArgv, int transFlags, 
-	      int interfaceFlags, int probFilter, 
-	      rpmRelocation * relocations)
+int rpmInstall(const char * rootdir, const char ** fileArgv,
+		rpmtransFlags transFlags, 
+		rpmInstallInterfaceFlags interfaceFlags,
+		rpmprobFilterFlags probFilter, 
+		rpmRelocation * relocations)
 {
     rpmdb db = NULL;
     FD_t fd;
@@ -212,10 +214,11 @@ int rpmInstall(const char * rootdir, const char ** fileArgv, int transFlags,
 
     rpmMessage(RPMMESS_DEBUG, _("retrieved %d packages\n"), numTmpPkgs);
 
-    /* Build up the transaction set. As a special case, v1 source packages
-       are installed right here, only because they don't have headers and
-       would create all sorts of confusion later. */
-
+    /**
+     * Build up the transaction set. As a special case, v1 source packages
+     * are installed right here, only because they don't have headers and
+     * would create all sorts of confusion later.
+     */
     for (fileURL = pkgURL; *fileURL; fileURL++) {
 	const char * fileName;
 	(void) urlPath(*fileURL, &fileName);
@@ -429,8 +432,9 @@ errxit:
     return numPkgs;
 }
 
-int rpmErase(const char * rootdir, const char ** argv, int transFlags,
-		 int interfaceFlags)
+int rpmErase(const char * rootdir, const char ** argv,
+		rpmtransFlags transFlags, 
+		rpmEraseInterfaceFlags interfaceFlags)
 {
     rpmdb db;
     int mode;
@@ -511,8 +515,8 @@ int rpmErase(const char * rootdir, const char ** argv, int transFlags,
     return numFailed;
 }
 
-int rpmInstallSource(const char * rootdir, const char * arg, const char ** specFile,
-		    char ** cookie)
+int rpmInstallSource(const char * rootdir, const char * arg,
+		const char ** specFile, char ** cookie)
 {
     FD_t fd;
     int rc;
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 86851c842..3b82d4bfa 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -272,21 +272,30 @@ extern const struct headerSprintfExtension rpmHeaderFormats[];
 #define	RPMTAG_FIRSTFREE_TAG		1128 /* internal */
 #define	RPMTAG_EXTERNAL_TAG		1000000
 
-#define	RPMFILE_STATE_NORMAL 		0
-#define	RPMFILE_STATE_REPLACED 		1
-#define	RPMFILE_STATE_NOTINSTALLED	2
-#define	RPMFILE_STATE_NETSHARED		3
-
-/* these can be ORed together */
-#define	RPMFILE_CONFIG			(1 << 0)
-#define	RPMFILE_DOC			(1 << 1)
-#define	RPMFILE_DONOTUSE		(1 << 2)
-#define	RPMFILE_MISSINGOK		(1 << 3)
-#define	RPMFILE_NOREPLACE		(1 << 4)
-#define	RPMFILE_SPECFILE		(1 << 5)
-#define	RPMFILE_GHOST			(1 << 6)
-#define	RPMFILE_LICENSE			(1 << 7)
-#define	RPMFILE_README			(1 << 8)
+/**
+ * File States (when installed).
+ */
+typedef enum rpmfileStates_e {
+    RPMFILE_STATE_NORMAL 	= 0,
+    RPMFILE_STATE_REPLACED 	= 1,
+    RPMFILE_STATE_NOTINSTALLED	= 2,
+    RPMFILE_STATE_NETSHARED	= 3
+} rpmfileStates;
+
+/**
+ * File Attributes.
+ */
+typedef	enum rpmfileAttrs_e {
+    RPMFILE_CONFIG	= (1 << 0),	/*!< from %%config */
+    RPMFILE_DOC		= (1 << 1),	/*!< from %%doc */
+    RPMFILE_DONOTUSE	= (1 << 2),	/*!< @todo Document. */
+    RPMFILE_MISSINGOK	= (1 << 3),	/*!< from %%config(missingok) */
+    RPMFILE_NOREPLACE	= (1 << 4),	/*!< from %%config(noreplace) */
+    RPMFILE_SPECFILE	= (1 << 5),	/*!< @todo Document. */
+    RPMFILE_GHOST	= (1 << 6),	/*!< from %%ghost */
+    RPMFILE_LICENSE	= (1 << 7),	/*!< from %%license */
+    RPMFILE_README	= (1 << 8)	/*!< from %%readme */
+} rpmfileAttrs;
 #define	RPMFILE_MULTILIB_SHIFT		9
 #define	RPMFILE_MULTILIB(N)		((N) << RPMFILE_MULTILIB_SHIFT)
 #define	RPMFILE_MULTILIB_MASK		RPMFILE_MULTILIB(7)
@@ -294,40 +303,30 @@ extern const struct headerSprintfExtension rpmHeaderFormats[];
 /* XXX Check file flags for multilib marker. */
 #define	isFileMULTILIB(_fflags)		((_fflags) & RPMFILE_MULTILIB_MASK)
 
-#define	RPMVERIFY_NONE		0
-#define	RPMVERIFY_MD5		(1 << 0)
-#define	RPMVERIFY_FILESIZE	(1 << 1)
-#define	RPMVERIFY_LINKTO	(1 << 2)
-#define	RPMVERIFY_USER		(1 << 3)
-#define	RPMVERIFY_GROUP		(1 << 4)
-#define	RPMVERIFY_MTIME		(1 << 5)
-#define	RPMVERIFY_MODE		(1 << 6)
-#define	RPMVERIFY_RDEV		(1 << 7)
-#define	RPMVERIFY_READLINKFAIL	(1 << 28)
-#define	RPMVERIFY_READFAIL	(1 << 29)
-#define	RPMVERIFY_LSTATFAIL	(1 << 30)
-
-#define	RPMVERIFY_ALL		~(RPMVERIFY_NONE)
+/**
+ * Dependency Attributes.
+ */
+typedef	enum rpmsenseFlags_e {
+    RPMSENSE_ANY	= 0,
+    RPMSENSE_SERIAL	= (1 << 0), /*!< @todo Legacy. */
+    RPMSENSE_LESS	= (1 << 1),
+    RPMSENSE_GREATER	= (1 << 2),
+    RPMSENSE_EQUAL	= (1 << 3),
+    RPMSENSE_PROVIDES	= (1 << 4), /* only used internally by builds */
+    RPMSENSE_CONFLICTS	= (1 << 5), /* only used internally by builds */
+    RPMSENSE_PREREQ	= (1 << 6),
+    RPMSENSE_OBSOLETES	= (1 << 7), /* only used internally by builds */
+    RPMSENSE_TRIGGERIN	= (1 << 16),
+    RPMSENSE_TRIGGERUN	= (1 << 17),
+    RPMSENSE_TRIGGERPOSTUN= (1 << 18),
+    RPMSENSE_MULTILIB	= (1 << 19),
+} rpmsenseFlags;
 
-#define	RPMSENSE_ANY		0
-#define	RPMSENSE_SERIAL		(1 << 0) /* eliminated, backward compatibilty */
-#define	RPMSENSE_LESS		(1 << 1)
-#define	RPMSENSE_GREATER	(1 << 2)
-#define	RPMSENSE_EQUAL		(1 << 3)
-#define	RPMSENSE_PROVIDES	(1 << 4) /* only used internally by builds */
-#define	RPMSENSE_CONFLICTS	(1 << 5) /* only used internally by builds */
-#define	RPMSENSE_PREREQ		(1 << 6)
-#define	RPMSENSE_OBSOLETES	(1 << 7) /* only used internally by builds */
 #define	RPMSENSE_SENSEMASK	15	 /* Mask to get senses, ie serial, */
                                          /* less, greater, equal.          */
 
-#define	RPMSENSE_TRIGGERIN	(1 << 16)
-#define	RPMSENSE_TRIGGERUN	(1 << 17)
-#define	RPMSENSE_TRIGGERPOSTUN	(1 << 18)
-#define	RPMSENSE_TRIGGER	(RPMSENSE_TRIGGERIN | RPMSENSE_TRIGGERUN | \
-                                  RPMSENSE_TRIGGERPOSTUN)
-
-#define	RPMSENSE_MULTILIB	(1 << 19)
+#define	RPMSENSE_TRIGGER	\
+	(RPMSENSE_TRIGGERIN | RPMSENSE_TRIGGERUN | RPMSENSE_TRIGGERPOSTUN)
 
 #define	isDependsMULTILIB(_dflags)	((_dflags) & RPMSENSE_MULTILIB)
 
@@ -348,26 +347,26 @@ extern const struct headerSprintfExtension rpmHeaderFormats[];
 /** \ingroup rpmrc
  * Return value of rpmrc variable.
  * @deprecated Use rpmExpand() with appropriate macro expression.
- * @todo Eliminate.
+ * @todo Eliminate from API.
  */
 const char * rpmGetVar(int var);
 
 /** \ingroup rpmrc
  * Set value of rpmrc variable.
  * @deprecated Use rpmDefineMacro() to change appropriate macro instead.
- * @todo Eliminate.
+ * @todo Eliminate from API.
  */
 void rpmSetVar(int var, const char *val);
 
 /** \ingroup rpmrc
  * Build and install arch/os table identifiers.
- * @todo Eliminate.
+ * @todo Eliminate from API.
  */
 enum rpm_machtable_e {
-	RPM_MACHTABLE_INSTARCH		= 0,
-	RPM_MACHTABLE_INSTOS		= 1,
-	RPM_MACHTABLE_BUILDARCH		= 2,
-	RPM_MACHTABLE_BUILDOS  		= 3
+    RPM_MACHTABLE_INSTARCH	= 0,
+    RPM_MACHTABLE_INSTOS	= 1,
+    RPM_MACHTABLE_BUILDARCH	= 2,
+    RPM_MACHTABLE_BUILDOS	= 3
 };
 #define	RPM_MACHTABLE_COUNT		4	/* number of arch/os tables */
 
@@ -425,7 +424,8 @@ int rpmMachineScore(int type, const char * name);
 int rpmShowRC(FILE *f);
 
 /** \ingroup rpmrc
- * @todo Eliminate, use _target_* macros.
+ * @deprecated Use addMacro to set _target_* macros.
+ * @todo Eliminate from API.
  * @param archTable
  * @param osTable
  */
@@ -435,7 +435,8 @@ void rpmSetTables(int archTable, int osTable);  /* only used by build code */
  * Set current arch/os names.
  * NULL as argument is set to the default value (munged uname())
  * pushed through a translation table (if appropriate).
- * @todo Eliminate, use _target_* macros.
+ * @deprecated Use addMacro to set _target_* macros.
+ * @todo Eliminate from API.
  *
  * @param arch		arch name (or NULL)
  * @param os		os name (or NULL)
@@ -444,7 +445,9 @@ void rpmSetMachine(const char * arch, const char * os);
 
 /** \ingroup rpmrc
  * Return current arch/os names.
- * @todo Eliminate, use _target_* macros.
+ * @deprecated Use rpmExpand on _target_* macros.
+ * @todo Eliminate from API.
+ *
  * @retval arch		address of arch name (or NULL)
  * @retval os		address of os name (or NULL)
  */
@@ -452,6 +455,7 @@ void rpmGetMachine( /*@out@*/ const char **arch, /*@out@*/ const char **os);
 
 /** \ingroup rpmrc
  * Destroy rpmrc arch/os compatibility tables.
+ * @todo Eliminate from API.
  */
 void rpmFreeRpmrc(void);
 
@@ -567,7 +571,7 @@ int rpmdbPruneIterator(rpmdbMatchIterator mi, int * hdrNums,
 
 /** \ingroup rpmdb
  * Modify iterator to filter out headers that do not match version.
- * @todo replace with a more general mechanism using RE's on tag content.
+ * @todo Replace with a more general mechanism using RE's on tag content.
  * @param mi		rpm database iterator
  * @param version	version to check for
  */
@@ -575,7 +579,7 @@ void rpmdbSetIteratorVersion(rpmdbMatchIterator mi, /*@kept@*/ const char * vers
 
 /** \ingroup rpmdb
  * Modify iterator to filter out headers that do not match release.
- * @todo replace with a more general mechanism using RE's on tag content.
+ * @todo Replace with a more general mechanism using RE's on tag content.
  * @param mi		rpm database iterator
  * @param release	release to check for
  */
@@ -638,36 +642,40 @@ int rpmdbRebuild(const char * root);
 /** \name RPMPROBS */
 /*@{*/
 
-/** */
+/**
+ * Enumerate transaction set problems.
+ */
 typedef enum rpmProblemType_e {
-	RPMPROB_BADARCH, 
-	RPMPROB_BADOS,
-	RPMPROB_PKG_INSTALLED,
-	RPMPROB_BADRELOCATE,
-	RPMPROB_REQUIRES,
-	RPMPROB_CONFLICT,
-	RPMPROB_NEW_FILE_CONFLICT,
-	RPMPROB_FILE_CONFLICT,
-	RPMPROB_OLDPACKAGE,
-	RPMPROB_DISKSPACE,
-	RPMPROB_BADPRETRANS
+    RPMPROB_BADARCH,	/*!< package ... is for a different architecture */
+    RPMPROB_BADOS,	/*!< package ... is for a different operating system */
+    RPMPROB_PKG_INSTALLED, /*!< package ... is already installed */
+    RPMPROB_BADRELOCATE,/*!< path ... is not relocateable for package ... */
+    RPMPROB_REQUIRES,	/*!< @todo Use for dependency errors. */
+    RPMPROB_CONFLICT,	/*!< @todo Use for dependency errors. */
+    RPMPROB_NEW_FILE_CONFLICT, /*!< file ... conflicts between attemped installs of ... */
+    RPMPROB_FILE_CONFLICT,/*!< file ... from install of ... conflicts with file from package ... */
+    RPMPROB_OLDPACKAGE,	/*!< package ... (which is newer than ...) is already installed */
+    RPMPROB_DISKSPACE,	/*!< installing package ... needs ... on the ...  filesystem */
+    RPMPROB_BADPRETRANS	/*!< (unused) */
  } rpmProblemType;
 
-/** */
+/**
+ */
 typedef /*@abstract@*/ struct rpmProblem_s {
-    Header h, altH;
+    Header h;
+    Header altH;
 /*@dependent@*/ const void * key;
     rpmProblemType type;
     int ignoreProblem;
 /*@only@*/ const char * str1;
     unsigned long ulong1;
-} rpmProblem;
+} * rpmProblem;
 
 /** */
 typedef /*@abstract@*/ struct rpmProblemSet_s {
     int numProblems;
     int numProblemsAlloced;
-    rpmProblem * probs;
+    rpmProblem probs;		/*!< Array of specific problems. */
 } * rpmProblemSet;
 
 /**
@@ -685,7 +693,10 @@ struct rpmDependencyConflict {
     char * needsName, * needsVersion;
     int needsFlags;
     /*@observer@*/ /*@null@*/ const void * suggestedPackage; /* NULL if none */
-    enum { RPMDEP_SENSE_REQUIRES, RPMDEP_SENSE_CONFLICTS } sense;
+    enum {
+	RPMDEP_SENSE_REQUIRES,
+	RPMDEP_SENSE_CONFLICTS
+    } sense;
 } ;
 
 /**
@@ -694,18 +705,31 @@ void printDepProblems(FILE *fp, struct rpmDependencyConflict *conflicts,
 	int numConflicts)	/*@modifies *fp @*/;
 
 /**
+ * Return formatted string representation of problem.
+ * @deprecated API: prob used to be passed by value, now passed by reference.
+ * @param prob		rpm problem
+ * @return		formatted string
  */
 /*@only@*/ const char * rpmProblemString(rpmProblem prob)	/*@*/;
 
 /**
+ * Output formatted string representation of problem to file handle.
+ * @deprecated API: prob used to be passed by value, now passed by reference.
+ * @param fp		file handle
+ * @param prob		rpm problem
  */
 void rpmProblemPrint(FILE *fp, rpmProblem prob)	/*@modifies *fp @*/;
 
 /**
+ * Print problems to file handle.
+ * @param fp		file handle
+ * @param probs		problem set
  */
 void rpmProblemSetPrint(FILE *fp, rpmProblemSet probs)	/*@modifies *fp @*/;
 
 /**
+ * Destroy problem set.
+ * @param probs		problem set
  */
 void rpmProblemSetFree( /*@only@*/ rpmProblemSet probs);
 
@@ -715,12 +739,10 @@ void rpmProblemSetFree( /*@only@*/ rpmProblemSet probs);
 /*@{*/
 /* we pass these around as an array with a sentinel */
 typedef struct rpmRelocation_s {
-				/* XXX for backwards compatibility */
     const char * oldPath;	/*!< NULL here evals to RPMTAG_DEFAULTPREFIX, */
     const char * newPath;	/*!< NULL means to omit the file completely! */
 } rpmRelocation;
 
-
 /**
  * Install source package.
  * @param root		path to top of install tree
@@ -732,8 +754,8 @@ typedef struct rpmRelocation_s {
  * @return		0 on success, 1 on bad magic, 2 on error
  */
 int rpmInstallSourcePackage(const char * root, FD_t fd, const char ** specFile,
-			    rpmCallbackFunction notify, void * notifyData,
-			    char ** cookie);
+			rpmCallbackFunction notify, rpmCallbackData notifyData,
+			char ** cookie);
 
 /**
  * Compare headers to determine which header is "newer".
@@ -800,47 +822,59 @@ void rpmtransRemovePackage(rpmTransactionSet rpmdep, int dboffset);
 void rpmtransFree( /*@only@*/ rpmTransactionSet rpmdep);
 
 /** \ingroup rpmtrans
+ * Save file handle to be used as stderr when running package scripts.
  * @param ts		rpm transaction set
  * @param fd		file handle
  */
-void rpmtransSetScriptFd(rpmTransactionSet ts, FD_t fd);
+void rpmtransSetScriptFd(rpmTransactionSet ts, FD_t fd)
+	/*@modifies ts, fd @*/;
 
-/* this checks for dependency satisfaction, but *not* ordering */
 /** \ingroup rpmtrans
+ * Check that all dependencies can be resolved.
  * @param rpmdep	rpm transaction set
+ * @retval conflicts
+ * @retval numConflicts
+ * @return		0 on success
  */
 int rpmdepCheck(rpmTransactionSet rpmdep,
 	/*@exposed@*/ /*@out@*/ struct rpmDependencyConflict ** conflicts,
 	/*@exposed@*/ /*@out@*/ int * numConflicts);
 
-/* Orders items, returns error on circle, finals keys[] is NULL. No dependency
-   check is done, use rpmdepCheck() for that. If dependencies are not
-   satisfied a "best-try" ordering is returned. */
-
 /** \ingroup rpmtrans
+ * Determine package order in a transaction set according to dependencies.
+ * Orders packages, returns error on circular dependencies. No dependency
+ * check is done, use rpmdepCheck() for that. If dependencies are not
+ * satisfied a "best-effort" ordering is attempted.
+ *
  * @param order		rpm transaction set
+ * @return		0 if packages are successfully ordered, 1 otherwise
  */
-int rpmdepOrder(rpmTransactionSet order);
+int rpmdepOrder(rpmTransactionSet order)	/*@modifies order @*/;
 
 /** \ingroup rpmtrans
- * Destroy dependency conflicts.
+ * Destroy dependency conflicts storage.
  * @param conflicts	dependency conflicts
  * @param numConflicts	no. of dependency conflicts
  */
 void rpmdepFreeConflicts( /*@only@*/ struct rpmDependencyConflict * conflicts,
 	int numConflicts);
 
-#define	RPMTRANS_FLAG_TEST		(1 << 0)
-#define	RPMTRANS_FLAG_BUILD_PROBS	(1 << 1)
-#define	RPMTRANS_FLAG_NOSCRIPTS		(1 << 2)
-#define	RPMTRANS_FLAG_JUSTDB		(1 << 3)
-#define	RPMTRANS_FLAG_NOTRIGGERS	(1 << 4)
-#define	RPMTRANS_FLAG_NODOCS		(1 << 5)
-#define	RPMTRANS_FLAG_ALLFILES		(1 << 6)
-#define	RPMTRANS_FLAG_KEEPOBSOLETE	(1 << 7)
-#define	RPMTRANS_FLAG_MULTILIB		(1 << 8)
-
-/** \ingroup rpmdep
+/** \ingroup rpmtrans
+ * Bit(s) to control rpmCheckSig() operation.
+ */
+typedef enum rpmtransFlags_e {
+    RPMTRANS_FLAG_TEST		= (1 << 0),	/*!< from --test */
+    RPMTRANS_FLAG_BUILD_PROBS	= (1 << 1),	/*!< @todo Document. */
+    RPMTRANS_FLAG_NOSCRIPTS	= (1 << 2),	/*!< from --noscripts */
+    RPMTRANS_FLAG_JUSTDB	= (1 << 3),	/*!< from --justdb */
+    RPMTRANS_FLAG_NOTRIGGERS	= (1 << 4),	/*!< from --notriggers */
+    RPMTRANS_FLAG_NODOCS	= (1 << 5),	/*!< from --nodocs */
+    RPMTRANS_FLAG_ALLFILES	= (1 << 6),	/*!< from --allfiles */
+    RPMTRANS_FLAG_KEEPOBSOLETE	= (1 << 7),	/*!< @todo Document. */
+    RPMTRANS_FLAG_MULTILIB	= (1 << 8),	/*!< @todo Document. */
+} rpmtransFlags;
+
+/** \ingroup rpmtrans
  * Compare two versioned dependency ranges, looking for overlap.
  * @param AName		1st dependncy name string
  * @param AEVR		1st dependency [epoch:]version[-release] string
@@ -853,7 +887,7 @@ void rpmdepFreeConflicts( /*@only@*/ struct rpmDependencyConflict * conflicts,
 int rpmRangesOverlap(const char *AName, const char *AEVR, int AFlags,
         const char *BName, const char *BEVR, int BFlags)	/*@*/;
 
-/** \ingroup rpmdep
+/** \ingroup rpmtrans
  * Check dependency against internal rpmlib feature provides.
  * @param keyName	dependency name string
  * @param keyEVR	dependency [epoch:]version[-release] string
@@ -869,26 +903,54 @@ int rpmCheckRpmlibProvides(const char * keyName, const char * keyEVR,
  */
 void rpmShowRpmlibProvides(FILE * fp) /*@modifies *fp @*/;
 
+/**
+ * @todo Generalize filter mechanism.
+ */
+typedef enum rpmprobFilterFlags_e {
+    RPMPROB_FILTER_NONE		= 0,
+    RPMPROB_FILTER_IGNOREOS	= (1 << 0),
+    RPMPROB_FILTER_IGNOREARCH	= (1 << 1),
+    RPMPROB_FILTER_REPLACEPKG	= (1 << 2),
+    RPMPROB_FILTER_FORCERELOCATE= (1 << 3),
+    RPMPROB_FILTER_REPLACENEWFILES= (1 << 4),
+    RPMPROB_FILTER_REPLACEOLDFILES= (1 << 5),
+    RPMPROB_FILTER_OLDPACKAGE	= (1 << 6),
+    RPMPROB_FILTER_DISKSPACE	= (1 << 7)
+} rpmprobFilterFlags;
+
 /** \ingroup rpmtrans
+ * Process all packages in transactions set.
  * @param ts		rpm transaction set
- */
-int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify,
-		       void * notifyData, rpmProblemSet okProbs,
-		       /*@out@*/ rpmProblemSet * newProbs, int flags,
-			int ignoreSet);
-
-#define	RPMPROB_FILTER_IGNOREOS		(1 << 0)
-#define	RPMPROB_FILTER_IGNOREARCH	(1 << 1)
-#define	RPMPROB_FILTER_REPLACEPKG	(1 << 2)
-#define	RPMPROB_FILTER_FORCERELOCATE	(1 << 3)
-#define	RPMPROB_FILTER_REPLACENEWFILES	(1 << 4)
-#define	RPMPROB_FILTER_REPLACEOLDFILES	(1 << 5)
-#define	RPMPROB_FILTER_OLDPACKAGE	(1 << 6)
-#define	RPMPROB_FILTER_DISKSPACE	(1 << 7)
+ * @param notify	progress callback
+ * @param notifyData	progress callback private data
+ * @param okProbs	previously known problems (or NULL)
+ * @retval newProbs	address to return unfiltered problems (or NULL)
+ * @param transFlags	bits to control rpmRunTransactions()
+ * @param ignoreSet	bits to filter problem types
+ * @return		0 on success, -1 on error, >0 with newProbs set
+ */
+int rpmRunTransactions(rpmTransactionSet ts,
+			rpmCallbackFunction notify, rpmCallbackData notifyData,
+			rpmProblemSet okProbs,
+			/*@out@*/ rpmProblemSet * newProbs,
+			rpmtransFlags transFlags,
+			rpmprobFilterFlags ignoreSet);
 
 /*@}*/
 
-/** rpmlead.c **/
+/**
+ * Return name of tag from value.
+ * @param tag		tag value
+ * @return		name of tag
+ */
+/*@observer@*/ const char *const tagName(int tag)	/*@*/;
+
+/**
+ * Return value of tag from name.
+ * @param targstr	name of tag
+ * @return		tag value
+ */
+int tagValue(const char *tagstr)			/*@*/;
 
 #define	RPMLEAD_BINARY 0
 #define	RPMLEAD_SOURCE 1
@@ -898,11 +960,13 @@ int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify,
 #define	RPMLEAD_MAGIC2 0xee
 #define	RPMLEAD_MAGIC3 0xdb
 
-/* The lead needs to be 8 byte aligned */
-
-#define	RPMLEAD_SIZE 96
+#define	RPMLEAD_SIZE 96		/*!< Don't rely on sizeof(struct) */
 
 /** \ingroup lead
+ * The lead data structure.
+ * The lead needs to be 8 byte aligned.
+ * @deprecated The lead (except for signature_type) is legacy.
+ * @todo Don't use any information from lead.
  */
 struct rpmlead {
     unsigned char magic[4];
@@ -911,32 +975,32 @@ struct rpmlead {
     short archnum;
     char name[66];
     short osnum;
-    short signature_type;
-    char reserved[16];      /* pads to 96 bytes -- 8 byte aligned! */
-} ;
-
-/** \ingroup lead
- */
-struct oldrpmlead {		/* for version 1 packages */
-    unsigned char magic[4];
-    unsigned char major, minor;
-    short type;
-    short archnum;
-    char name[66];
-    unsigned int specOffset;
-    unsigned int specLength;
-    unsigned int archiveOffset;
+    short signature_type;	/*!< Signature header type (RPMSIG_HEADERSIG) */
+    char reserved[16];		/*!< Pad to 96 bytes -- 8 byte aligned! */
 } ;
 
 /**
+ * Release storage used by file system usage cache.
  */
 void freeFilesystems(void);
 
 /**
+ * Return (cached) file system mount points.
+ * @retval			addess of file system names (or NULL)
+ * @retval num			address of number of file systems
+ * @return			0 on success, 1 on error
  */
-int rpmGetFilesystemList( /*@out@*/ const char *** listptr, /*@out@*/int * num);
+int rpmGetFilesystemList( /*@out@*/ const char *** listptr, /*@out@*/ int * num)
+	/*@modifies *listptr, *num @*/;
 
 /**
+ * Determine per-file system usage for a list of files.
+ * @param filelist		array of absolute file names
+ * @param fssizes		array of file sizes
+ * @param numFiles		number of files in list
+ * @retval usagesPtr		address of per-file system usage array.
+ * @param flags			(unused)
+ * @return			0 on success, 1 on error
  */
 int rpmGetFilesystemUsage(const char ** filelist, int_32 * fssizes,
 	int numFiles, /*@out@*/ uint_32 ** usagesPtr, int flags);
@@ -978,51 +1042,103 @@ extern struct poptOption		rpmBuildPoptTable[];
 /*@{*/
 
 /** \ingroup rpmcli
+ * Bit(s) for rpmVerifyFile() attributes and result.
+ */
+enum rpmVerifyAttrs_e {
+    RPMVERIFY_NONE	= 0,		/*!< */
+    RPMVERIFY_MD5	= (1 << 0),	/*!< */
+    RPMVERIFY_FILESIZE	= (1 << 1),	/*!< */
+    RPMVERIFY_LINKTO	= (1 << 2),	/*!< */
+    RPMVERIFY_USER	= (1 << 3),	/*!< */
+    RPMVERIFY_GROUP	= (1 << 4),	/*!< */
+    RPMVERIFY_MTIME	= (1 << 5),	/*!< */
+    RPMVERIFY_MODE	= (1 << 6),	/*!< */
+    RPMVERIFY_RDEV	= (1 << 7),	/*!< */
+    RPMVERIFY_READLINKFAIL= (1 << 28),	/*!< */
+    RPMVERIFY_READFAIL	= (1 << 29),	/*!< */
+    RPMVERIFY_LSTATFAIL	= (1 << 30)	/*!< */
+};
+#define	RPMVERIFY_ALL		~(RPMVERIFY_NONE)
+
+/** \ingroup rpmcli
+ * Verify file attributes and MD5 sum.
  * @param root		path to top of install tree
  * @param h		header
+ * @param filenum	index of file in header file info arrays
+ * @retval result	address of failure flags
+ * @param omitMask	bit(s) to disable verify checks
+ * @return		0 on success (or not installed), 1 on error
  */
 int rpmVerifyFile(const char * root, Header h, int filenum,
 	/*@out@*/ int * result, int omitMask);
 
 /** \ingroup rpmcli
+ * Return exit code from running verify script in header.
  * @param root		path to top of install tree
  * @param h		header
- * @param err		file handle
+ * @param err		file handle to use for stderr
+ * @return		0 on success
  */
 int rpmVerifyScript(const char * root, Header h, FD_t err);
 
-/* --- query/verify mode options */
+/** \ingroup rpmcli
+ * The command line argument will be used to retrieve header(s) ...
+ */
+typedef enum rpmQVSources_e {
+    RPMQV_PACKAGE = 0,	/*!< ... from package name db search. */
+    RPMQV_PATH,		/*!< ... from file path db search. */
+    RPMQV_ALL,		/*!< ... from each installed package. */
+    RPMQV_RPM, 		/*!< ... from reading binary rpm package. */
+    RPMQV_GROUP,	/*!< ... from group db search. */
+    RPMQV_WHATPROVIDES,	/*!< ... from provides db search. */
+    RPMQV_WHATREQUIRES,	/*!< ... from requires db search. */
+    RPMQV_TRIGGEREDBY,	/*!< ... from trigger db search. */
+    RPMQV_DBOFFSET,	/*!< ... from database header instance. */
+    RPMQV_SPECFILE	/*!< ... from spec file parse (query only). */
+} rpmQVSources;
 
-/* XXX SPECFILE is not verify sources */
 /** \ingroup rpmcli
+ * Bit(s) to control rpmQuery() operation, stored in qva_flags.
  */
-enum rpmQVSources { RPMQV_PACKAGE = 0, RPMQV_PATH, RPMQV_ALL, RPMQV_RPM, 
-		       RPMQV_GROUP, RPMQV_WHATPROVIDES, RPMQV_WHATREQUIRES,
-		       RPMQV_TRIGGEREDBY, RPMQV_DBOFFSET, RPMQV_SPECFILE };
+typedef enum rpmQueryFlags_e {
+    QUERY_FOR_LIST	= (1 << 1),	/*!< from --list */
+    QUERY_FOR_STATE	= (1 << 2),	/*!< from --state */
+    QUERY_FOR_DOCS	= (1 << 3),	/*!< from --docfiles */
+    QUERY_FOR_CONFIG	= (1 << 4),	/*!< from --configfiles */
+    QUERY_FOR_DUMPFILES	= (1 << 8)	/*!< from --dump */
+} rpmQueryFlags;
 
 /** \ingroup rpmcli
+ * Bit(s) to control rpmVerify() operation, stored in qva_flags.
  */
-struct rpmQVArguments {
-    enum rpmQVSources qva_source;
-    int 	qva_sourceCount;	/* > 1 is an error */
-    int		qva_flags;
-    int		qva_verbose;
-    const char *qva_queryFormat;
-    const char *qva_prefix;
-    char	qva_mode;
-    char	qva_char;
-};
+typedef enum rpmVerifyFlags_e {
+    VERIFY_FILES	= (1 <<  9),	/*!< from --nofiles */
+    VERIFY_DEPS		= (1 << 10),	/*!< from --nodeps */
+    VERIFY_SCRIPT	= (1 << 11),	/*!< from --noscripts */
+    VERIFY_MD5		= (1 << 12)	/*!< from --nomd5 */
+} rpmVerifyFlags;
+
 /** \ingroup rpmcli
- */
-typedef	struct rpmQVArguments QVA_t;
+ * Describe query/verify command line request.
+ */
+typedef struct rpmQVArguments {
+    rpmQVSources qva_source;	/*!< Identify CLI arg type. */
+    int 	qva_sourceCount;	/*!< Exclusive check (>1 is error). */
+    int		qva_flags;		/*!< Bit(s) to control operation. */
+    int		qva_verbose;		/*!< (unused) */
+    const char *qva_queryFormat;	/*!< Format for headerSprintf(). */
+    const char *qva_prefix;		/*!< Path to top of install tree. */
+    char	qva_mode;		/*!< 'q' is query, 'v' is verify mode */
+    char	qva_char;		/*!< (unused) always ' ' */
+} QVA_t;
 
 /** \ingroup rpmcli
  */
-extern struct rpmQVArguments		rpmQVArgs;
+extern QVA_t rpmQVArgs;
 
 /** \ingroup rpmcli
  */
-extern struct poptOption		rpmQVSourcePoptTable[];
+extern struct poptOption rpmQVSourcePoptTable[];
 
 /** \ingroup rpmcli
  * @param qva		parsed query/verify options
@@ -1032,33 +1148,15 @@ extern struct poptOption		rpmQVSourcePoptTable[];
 typedef	int (*QVF_t) (QVA_t *qva, rpmdb db, Header h);
 
 /** \ingroup rpmcli
+ * Display query/verify information for each header in iterator.
  * @param qva		parsed query/verify options
  * @param mi		rpm database iterator
- * @param showPackage	query/verify routine
+ * @param showPackage	query/verify display routine
+ * @return		result of last non-zero showPackage() return
  */
 int showMatches(QVA_t *qva, /*@only@*/ /*@null@*/ rpmdbMatchIterator mi,
 	QVF_t showPackage);
 
-#define	QUERY_FOR_LIST		(1 << 1)
-#define	QUERY_FOR_STATE		(1 << 2)
-#define	QUERY_FOR_DOCS		(1 << 3)
-#define	QUERY_FOR_CONFIG	(1 << 4)
-#define	QUERY_FOR_DUMPFILES     (1 << 8)
-
-/**
- * Return name of tag from value.
- * @param tag		tag value
- * @return		name of tag
- */
-/*@observer@*/ const char *const tagName(int tag)	/*@*/;
-
-/**
- * Return value of tag from name.
- * @param targstr	name of tag
- * @return		tag value
- */
-int tagValue(const char *tagstr)			/*@*/;
-
 /** \ingroup rpmcli
  */
 extern int specedit;
@@ -1068,56 +1166,63 @@ extern int specedit;
 extern struct poptOption rpmQueryPoptTable[];
 
 /** \ingroup rpmcli
+ * Display list of tags that can be used in --queryformat.
  * @param f	file handle to use for display
  */
 void rpmDisplayQueryTags(FILE * f);
 
 /** \ingroup rpmcli
+ * Common query/verify source interface, called once for each CLI arg.
  * @param qva		parsed query/verify options
  * @param source	type of source to query/verify
  * @param arg		name of source to query/verify
  * @param db		rpm database
- * @param showPackage	query/verify routine
+ * @param showPackage	query/verify specific display routine
+ * @return		showPackage() result, 1 if rpmdbInitIterator() is NULL
  */
-int rpmQueryVerify(QVA_t *qva, enum rpmQVSources source, const char * arg,
+int rpmQueryVerify(QVA_t *qva, rpmQVSources source, const char * arg,
 	rpmdb db, QVF_t showPackage);
 
 /** \ingroup rpmcli
+ * Display results of package query.
+ * @todo Devise a meaningful return code.
  * @param qva		parsed query/verify options
  * @param db		rpm database (unused for queries)
  * @param h		header to use for query
+ * @return		0 always
  */
 int showQueryPackage(QVA_t *qva, rpmdb db, Header h);
 
 /** \ingroup rpmcli
+ * Display package information.
  * @param qva		parsed query/verify options
  * @param source	type of source to query
  * @param arg		name of source to query
+ * @return		rpmQueryVerify() result, or 1 on rpmdbOpen() failure
  */
-int rpmQuery(QVA_t *qva, enum rpmQVSources source, const char * arg);
-
-#define	VERIFY_FILES		(1 <<  9)
-#define	VERIFY_DEPS		(1 << 10)
-#define	VERIFY_SCRIPT		(1 << 11)
-#define	VERIFY_MD5		(1 << 12)
+int rpmQuery(QVA_t *qva, rpmQVSources source, const char * arg);
 
 /** \ingroup rpmcli
  */
 extern struct poptOption rpmVerifyPoptTable[];
 
 /** \ingroup rpmcli
+ * Display results of package verify.
  * @param qva		parsed query/verify options
  * @param db		rpm database
  * @param h		header to use for verify
+ * @return		result of last non-zero verify return
  */
 int showVerifyPackage(QVA_t *qva, /*@only@*/ rpmdb db, Header h);
 
 /** \ingroup rpmcli
+ * Verify package install.
  * @param qva		parsed query/verify options
  * @param source	type of source to verify
  * @param arg		name of source to verify
+ * @return		rpmQueryVerify() result, or 1 on rpmdbOpen() failure
  */
-int rpmVerify(QVA_t *qva, enum rpmQVSources source, const char *arg);
+int rpmVerify(QVA_t *qva, rpmQVSources source, const char *arg);
 
 /*@}*/
 /* ==================================================================== */
@@ -1125,95 +1230,116 @@ int rpmVerify(QVA_t *qva, enum rpmQVSources source, const char *arg);
 /*@{*/
 /* --- install/upgrade/erase modes */
 
-#define	INSTALL_PERCENT		(1 << 0)
-#define	INSTALL_HASH		(1 << 1)
-#define	INSTALL_NODEPS		(1 << 2)
-#define	INSTALL_NOORDER		(1 << 3)
-#define	INSTALL_LABEL		(1 << 4)  /* set if we're being verbose */
-#define	INSTALL_UPGRADE		(1 << 5)
-#define	INSTALL_FRESHEN		(1 << 6)
-
-#define	UNINSTALL_NODEPS	(1 << 0)
-#define	UNINSTALL_ALLMATCHES	(1 << 1)
+/** \ingroup rpmcli
+ * Bit(s) to control rpmInstall() operation.
+ */
+typedef enum rpmInstallInterfaceFlags_e {
+    INSTALL_PERCENT	= (1 << 0),	/*!< from --percent */
+    INSTALL_HASH	= (1 << 1),	/*!< from --hash */
+    INSTALL_NODEPS	= (1 << 2),	/*!< from --nodeps */
+    INSTALL_NOORDER	= (1 << 3),	/*!< from --noorder */
+    INSTALL_LABEL	= (1 << 4),	/*!< from --verbose (notify) */
+    INSTALL_UPGRADE	= (1 << 5),	/*!< from --upgrade */
+    INSTALL_FRESHEN	= (1 << 6)	/*!< from --freshen */
+} rpmInstallInterfaceFlags;
 
 /** \ingroup rpmcli
+ * Install/upgrade/freshen binary rpm package.
  * @param rootdir	path to top of install tree
  * @param argv		array of package file names (NULL terminated)
+ * @param transFlags	bits to control rpmRunTransactions()
+ * @param interfaceFlags bits to control rpmInstall()
+ * @param probFilter 	bits to filter problem types
+ * @param relocations	package file relocations
+ * @return		0 on success
+ */
+int rpmInstall(const char * rootdir, const char ** argv,
+		rpmtransFlags transFlags, 
+		rpmInstallInterfaceFlags interfaceFlags,
+		rpmprobFilterFlags probFilter,
+		rpmRelocation * relocations);
+
+/** \ingroup rpmcli
+ * Install source rpm package.
+ * @param prefix	path to top of install tree
+ * @param arg		source rpm file name
+ * @retval specFile	address of (installed) spec file name
+ * @retval cookie
+ * @return		0 on success
  */
-int rpmInstall(const char * rootdir, const char ** argv, int installFlags, 
-	      int interfaceFlags, int probFilter, rpmRelocation * relocations);
+int rpmInstallSource(const char * prefix, const char * arg,
+		/*@out@*/ const char ** specFile, /*@out@*/ char ** cookie);
 
 /** \ingroup rpmcli
+ * Bit(s) to control rpmErase() operation.
  */
-int rpmInstallSource(const char * prefix, const char * arg, const char ** specFile,
-		    char ** cookie);
+typedef enum rpmEraseInterfaceFlags_e {
+    UNINSTALL_NODEPS	= (1 << 0),	/*!< from --nodeps */
+    UNINSTALL_ALLMATCHES= (1 << 1)	/*!< from --allmatches */
+} rpmEraseInterfaceFlags;
 
 /** \ingroup rpmcli
+ * Erase binary rpm package.
  * @param rootdir	path to top of install tree
  * @param argv		array of package file names (NULL terminated)
+ * @param transFlags	bits to control rpmRunTransactions()
+ * @param interfaceFlags bits to control rpmInstall()
+ * @return		0 on success
  */
-int rpmErase(const char * rootdir, const char ** argv, int uninstallFlags, 
-		 int interfaceFlags);
+int rpmErase(const char * rootdir, const char ** argv,
+		rpmtransFlags transFlags, 
+		rpmEraseInterfaceFlags interfaceFlags);
 
 /*@}*/
 /* ==================================================================== */
 /** \name RPMK */
 /*@{*/
 
-/**************************************************/
-/*                                                */
-/* Signature Tags                                 */
-/*                                                */
-/* These go in the sig Header to specify          */
-/* individual signature types.                    */
-/*                                                */
-/**************************************************/
-
 /** \ingroup signature
  * Tags found in signature header from package.
  */
 enum rpmtagSignature {
-	RPMSIGTAG_SIZE		= 1000,
+    RPMSIGTAG_SIZE	= 1000,	/*!< Size in bytes. */
 /* the md5 sum was broken *twice* on big endian machines */
-	RPMSIGTAG_LEMD5_1	= 1001,
-	RPMSIGTAG_PGP		= 1002,
-	RPMSIGTAG_LEMD5_2	= 1003,
-	RPMSIGTAG_MD5		= 1004,
-	RPMSIGTAG_GPG		= 1005,
-	RPMSIGTAG_PGP5		= 1006,	/* XXX legacy use only */
+    RPMSIGTAG_LEMD5_1	= 1001,	/*!< Broken MD5, take 1 */
+    RPMSIGTAG_PGP	= 1002,	/*!< PGP 2.6.3 signature. */
+    RPMSIGTAG_LEMD5_2	= 1003,	/*!< Broken MD5, take 2 */
+    RPMSIGTAG_MD5	= 1004,	/*!< MD5 signature. */
+    RPMSIGTAG_GPG	= 1005, /*!< GnuPG signature. */
+    RPMSIGTAG_PGP5	= 1006,	/*!< PGP5 signature @deprecated legacy. */
 
 /* Signature tags by Public Key Algorithm (RFC 2440) */
 /* N.B.: These tags are tenative, the values may change */
-	RPMTAG_PK_BASE		= 512,
-	RPMTAG_PK_RSA_ES	= RPMTAG_PK_BASE+1,
-	RPMTAG_PK_RSA_E		= RPMTAG_PK_BASE+2,
-	RPMTAG_PK_RSA_S		= RPMTAG_PK_BASE+3,
-	RPMTAG_PK_ELGAMAL_E	= RPMTAG_PK_BASE+16,
-	RPMTAG_PK_DSA		= RPMTAG_PK_BASE+17,
-	RPMTAG_PK_ELLIPTIC	= RPMTAG_PK_BASE+18,
-	RPMTAG_PK_ECDSA		= RPMTAG_PK_BASE+19,
-	RPMTAG_PK_ELGAMAL_ES	= RPMTAG_PK_BASE+20,
-	RPMTAG_PK_DH		= RPMTAG_PK_BASE+21,
-
-	RPMTAG_HASH_BASE	= 512+64,
-	RPMTAG_HASH_MD5		= RPMTAG_HASH_BASE+1,
-	RPMTAG_HASH_SHA1	= RPMTAG_HASH_BASE+2,
-	RPMTAG_HASH_RIPEMD160	= RPMTAG_HASH_BASE+3,
-	RPMTAG_HASH_MD2		= RPMTAG_HASH_BASE+5,
-	RPMTAG_HASH_TIGER192	= RPMTAG_HASH_BASE+6,
-	RPMTAG_HASH_HAVAL_5_160	= RPMTAG_HASH_BASE+7
+    RPMTAG_PK_BASE	= 512,		/*!< @todo Implement. */
+    RPMTAG_PK_RSA_ES	= RPMTAG_PK_BASE+1,	/*!< (unused */
+    RPMTAG_PK_RSA_E	= RPMTAG_PK_BASE+2,	/*!< (unused) */
+    RPMTAG_PK_RSA_S	= RPMTAG_PK_BASE+3,	/*!< (unused) */
+    RPMTAG_PK_ELGAMAL_E	= RPMTAG_PK_BASE+16,	/*!< (unused) */
+    RPMTAG_PK_DSA	= RPMTAG_PK_BASE+17,	/*!< (unused) */
+    RPMTAG_PK_ELLIPTIC	= RPMTAG_PK_BASE+18,	/*!< (unused) */
+    RPMTAG_PK_ECDSA	= RPMTAG_PK_BASE+19,	/*!< (unused) */
+    RPMTAG_PK_ELGAMAL_ES= RPMTAG_PK_BASE+20,	/*!< (unused) */
+    RPMTAG_PK_DH	= RPMTAG_PK_BASE+21,	/*!< (unused) */
+
+    RPMTAG_HASH_BASE	= 512+64,	/*!< @todo Implement. */
+    RPMTAG_HASH_MD5	= RPMTAG_HASH_BASE+1,	/*!< (unused) */
+    RPMTAG_HASH_SHA1	= RPMTAG_HASH_BASE+2,	/*!< (unused) */
+    RPMTAG_HASH_RIPEMD160= RPMTAG_HASH_BASE+3,	/*!< (unused) */
+    RPMTAG_HASH_MD2	= RPMTAG_HASH_BASE+5,	/*!< (unused) */
+    RPMTAG_HASH_TIGER192= RPMTAG_HASH_BASE+6,	/*!< (unused) */
+    RPMTAG_HASH_HAVAL_5_160= RPMTAG_HASH_BASE+7	/*!< (unused) */
 };
 
 /**
  *  Return codes from verifySignature().
  */
-enum rpmVerifySignatureReturn {
-	RPMSIG_OK	= 0,	/*!< Signature is OK. */
-	RPMSIG_UNKNOWN	= 1,	/*!< Signature is unknown. */
-	RPMSIG_BAD	= 2,	/*!< Signature does not verify. */
-	RPMSIG_NOKEY	= 3,	/*!< Key is unavailable. */
-	RPMSIG_NOTTRUSTED = 4	/*!< Signature is OK, but key is not trusted. */
-};
+typedef enum rpmVerifySignatureReturn_e {
+    RPMSIG_OK		= 0,	/*!< Signature is OK. */
+    RPMSIG_UNKNOWN	= 1,	/*!< Signature is unknown. */
+    RPMSIG_BAD		= 2,	/*!< Signature does not verify. */
+    RPMSIG_NOKEY	= 3,	/*!< Key is unavailable. */
+    RPMSIG_NOTTRUSTED = 4	/*!< Signature is OK, but key is not trusted. */
+} rpmVerifySignatureReturn;
 
 /** \ingroup signature
  * Verify a signature from a package.
@@ -1224,7 +1350,7 @@ enum rpmVerifySignatureReturn {
  * @param result	detailed text result of signature verification
  * @return		result of signature verification
  */
-enum rpmVerifySignatureReturn rpmVerifySignature(const char *file,
+rpmVerifySignatureReturn rpmVerifySignature(const char *file,
 		int_32 sigTag, void *sig, int count, char *result);
 
 /** \ingroup signature
@@ -1234,24 +1360,31 @@ void rpmFreeSignature(Header h);
 
 /* --- checksig/resign */
 
-#define	CHECKSIG_PGP (1 << 0)
-#define	CHECKSIG_MD5 (1 << 1)
-#define	CHECKSIG_GPG (1 << 2)
+/** \ingroup rpmcli
+ * Bit(s) to control rpmCheckSig() operation.
+ */
+typedef enum rpmCheckSigFlags_e {
+    CHECKSIG_NONE	= 0,		/*!< Don't check any signatures. */
+    CHECKSIG_PGP	= (1 << 0),	/*!< if not --nopgp */
+    CHECKSIG_MD5	= (1 << 1),	/*!< if not --nomd5 */
+    CHECKSIG_GPG	= (1 << 2)	/*!< if not --nogpg */
+} rpmCheckSigFlags;
 
 /** \ingroup rpmcli
- * @param flags
+ * Check elements in signature header.
+ * @param flags		bit(s) to enable signature checks
  * @param argv		array of package file names (NULL terminated)
  * @return		0 on success
  */
-int rpmCheckSig(int flags, const char ** argv);
+int rpmCheckSig(rpmCheckSigFlags flags, const char ** argv);
 
 /** \ingroup rpmcli
- * Type of signature operation to perform.
+ * Bit(s) to control rpmReSign() operation.
  */
-enum rpmKtype {
-	RPMK_NEW_SIGNATURE = 0,		/*!< Discard previous signature. */
-	RPMK_ADD_SIGNATURE		/*!< Add element to signature. */
-};
+typedef enum rpmResignFlags_e {
+    RESIGN_NEW_SIGNATURE = 0,	/*!< from --resign */
+    RESIGN_ADD_SIGNATURE	/*!< from --addsign */
+} rpmResignFlags;
 
 /** \ingroup rpmcli
  * Create/modify elements in signature header.
@@ -1260,7 +1393,7 @@ enum rpmKtype {
  * @param argv		array of package file names (NULL terminated)
  * @return		0 on success
  */
-int rpmReSign(enum rpmKtype add, char *passPhrase, const char ** argv);
+int rpmReSign(rpmResignFlags add, char *passPhrase, const char ** argv);
 
 /*@}*/
 
diff --git a/lib/signature.c b/lib/signature.c
index 1a4c7169e..cbce534e0 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -423,7 +423,7 @@ int rpmAddSignature(Header header, const char *file, int_32 sigTag, const char *
     return ret;
 }
 
-static enum rpmVerifySignatureReturn
+static rpmVerifySignatureReturn
 verifySizeSignature(const char *datafile, int_32 size, char *result)
 {
     struct stat statbuf;
@@ -442,7 +442,7 @@ verifySizeSignature(const char *datafile, int_32 size, char *result)
 
 #define	X(_x)	(unsigned)((_x) & 0xff)
 
-static enum rpmVerifySignatureReturn
+static rpmVerifySignatureReturn
 verifyMD5Signature(const char *datafile, unsigned char *sig, 
 			      char *result, md5func fn)
 {
@@ -476,7 +476,7 @@ verifyMD5Signature(const char *datafile, unsigned char *sig,
     return RPMSIG_OK;
 }
 
-static enum rpmVerifySignatureReturn
+static rpmVerifySignatureReturn
 verifyPGPSignature(const char *datafile, void *sig, int count, char *result)
 {
     int pid, status, outpipe[2];
@@ -588,7 +588,7 @@ verifyPGPSignature(const char *datafile, void *sig, int count, char *result)
     return res;
 }
 
-static enum rpmVerifySignatureReturn
+static rpmVerifySignatureReturn
 verifyGPGSignature(const char *datafile, void *sig, int count, char *result)
 {
     int pid, status, outpipe[2];
@@ -785,7 +785,7 @@ char *rpmGetPassPhrase(const char *prompt, const int sigTag)
     return pass;
 }
 
-enum rpmVerifySignatureReturn
+rpmVerifySignatureReturn
 rpmVerifySignature(const char *file, int_32 sigTag, void *sig, int count,
 		    char *result)
 {
diff --git a/lib/transaction.c b/lib/transaction.c
index 9f3a5f170..7c7dc2c11 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -584,7 +584,7 @@ static int psTrim(rpmProblemSet filter, rpmProblemSet target)
      * This is good, as it lets us perform this trim in linear time, rather
      * then logarithmic or quadratic.
      */
-    rpmProblem * f, * t;
+    rpmProblem f, t;
     int gotProblems = 0;
 
     f = filter->probs;
@@ -657,7 +657,7 @@ static enum fileActions decideFileFate(const char * dirName,
 			const char * baseName, short dbMode,
 			const char * dbMd5, const char * dbLink, short newMode,
 			const char * newMd5, const char * newLink, int newFlags,
-			int brokenMd5, int transFlags)
+			int brokenMd5, rpmtransFlags transFlags)
 {
     char buffer[1024];
     const char * dbAttr, * newAttr;
@@ -770,7 +770,8 @@ static int filecmp(short mode1, const char * md51, const char * link1,
 static int handleInstInstalledFiles(TFI_t * fi, rpmdb db,
 			            struct sharedFileInfo * shared,
 			            int sharedCount, int reportConflicts,
-				    rpmProblemSet probs, int transFlags)
+				    rpmProblemSet probs,
+				    rpmtransFlags transFlags)
 {
     Header h;
     int i;
@@ -1214,11 +1215,10 @@ static void skipFiles(TFI_t * fi, int noDocs)
 
 #define	NOTIFY(_x)	if (notify) (void) notify _x
 
-/* Return -1 on error, > 0 if newProbs is set, 0 if everything happened */
-
-int rpmRunTransactions(rpmTransactionSet ts, rpmCallbackFunction notify,
-		       void * notifyData, rpmProblemSet okProbs,
-		       rpmProblemSet * newProbs, int transFlags, int ignoreSet)
+int rpmRunTransactions(	rpmTransactionSet ts,
+			rpmCallbackFunction notify, rpmCallbackData notifyData,
+			rpmProblemSet okProbs, rpmProblemSet * newProbs,
+			rpmtransFlags transFlags, rpmprobFilterFlags ignoreSet)
 {
     int i, j;
     int rc, ourrc = 0;
diff --git a/lib/uninstall.c b/lib/uninstall.c
index 09384c57a..ee54d29df 100644
--- a/lib/uninstall.c
+++ b/lib/uninstall.c
@@ -19,12 +19,12 @@ static char * SCRIPT_PATH = "PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin";
 /**
  * Remove (or rename) file according to file disposition.
  * @param file		file
- * @param flags
+ * @param fileAttrs	file attributes (from package header)
  * @param mode		file type
  * @param action	file disposition
  * @return
  */
-static int removeFile(const char * file, unsigned int flags, short mode, 
+static int removeFile(const char * file, rpmfileAttrs fileAttrs, short mode, 
 		      enum fileActions action)
 {
     int rc = 0;
@@ -63,7 +63,7 @@ static int removeFile(const char * file, unsigned int flags, short mode,
 	    }
 	} else {
 	    if (unlink(file)) {
-		if (errno != ENOENT || !(flags & RPMFILE_MISSINGOK)) {
+		if (errno != ENOENT || !(fileAttrs & RPMFILE_MISSINGOK)) {
 		    rpmError(RPMERR_UNLINK, 
 			      _("removal of %s failed: %s"),
 				file, strerror(errno));
@@ -87,10 +87,10 @@ static int removeFile(const char * file, unsigned int flags, short mode,
 }
 
 int removeBinaryPackage(const char * rootdir, rpmdb rpmdb, unsigned int offset,
-			Header h,
-			int flags, rpmCallbackFunction notify,
-			void * notifyData, const void * pkgKey,
-			enum fileActions * actions, FD_t scriptFd)
+			Header h, rpmtransFlags transFlags,
+			rpmCallbackFunction notify, rpmCallbackData notifyData,
+			const void * pkgKey, enum fileActions * actions,
+			FD_t scriptFd)
 {
     const char * name, * version, * release;
     const char ** baseNames;
@@ -99,8 +99,8 @@ int removeBinaryPackage(const char * rootdir, rpmdb rpmdb, unsigned int offset,
     int fileCount;
     int i;
 
-    if (flags & RPMTRANS_FLAG_JUSTDB)
-	flags |= RPMTRANS_FLAG_NOSCRIPTS;
+    if (transFlags & RPMTRANS_FLAG_JUSTDB)
+	transFlags |= RPMTRANS_FLAG_NOSCRIPTS;
 
     headerNVR(h, &name, &version, &release);
 
@@ -112,7 +112,7 @@ int removeBinaryPackage(const char * rootdir, rpmdb rpmdb, unsigned int offset,
 	return 1;
     scriptArg -= 1;
 
-    if (!(flags & RPMTRANS_FLAG_NOTRIGGERS)) {
+    if (!(transFlags & RPMTRANS_FLAG_NOTRIGGERS)) {
 	/* run triggers from this package which are keyed on installed 
 	   packages */
 	if (runImmedTriggers(rootdir, rpmdb, RPMSENSE_TRIGGERUN, h, -1, scriptFd))
@@ -123,17 +123,17 @@ int removeBinaryPackage(const char * rootdir, rpmdb rpmdb, unsigned int offset,
 	    return 1;
     }
 
-    if (!(flags & RPMTRANS_FLAG_TEST)) {
+    if (!(transFlags & RPMTRANS_FLAG_TEST)) {
 	rc = runInstScript(rootdir, h, RPMTAG_PREUN, RPMTAG_PREUNPROG, scriptArg,
-		          (flags & RPMTRANS_FLAG_NOSCRIPTS), scriptFd);
+		          (transFlags & RPMTRANS_FLAG_NOSCRIPTS), scriptFd);
 	if (rc)
 	    return 1;
     }
     
     rpmMessage(RPMMESS_DEBUG, _("will remove files test = %d\n"), 
-		flags & RPMTRANS_FLAG_TEST);
+		transFlags & RPMTRANS_FLAG_TEST);
 
-    if (!(flags & RPMTRANS_FLAG_JUSTDB) &&
+    if (!(transFlags & RPMTRANS_FLAG_JUSTDB) &&
 	headerGetEntry(h, RPMTAG_BASENAMES, NULL, (void **) &baseNames, 
 	               &fileCount)) {
 	const char ** fileMd5List;
@@ -193,7 +193,7 @@ int removeBinaryPackage(const char * rootdir, rpmdb rpmdb, unsigned int offset,
 	    rpmMessage(RPMMESS_DEBUG, _("   file: %s action: %s\n"),
 			fileName, fileActionString(actions[i]));
 
-	    if (!(flags & RPMTRANS_FLAG_TEST)) {
+	    if (!(transFlags & RPMTRANS_FLAG_TEST)) {
 		if (notify) {
 		    (void)notify(h, RPMCALLBACK_UNINST_PROGRESS,
 			i, actions[i], fileName, notifyData);
@@ -213,14 +213,14 @@ int removeBinaryPackage(const char * rootdir, rpmdb rpmdb, unsigned int offset,
 	free(fileMd5List);
     }
 
-    if (!(flags & RPMTRANS_FLAG_TEST)) {
+    if (!(transFlags & RPMTRANS_FLAG_TEST)) {
 	rpmMessage(RPMMESS_DEBUG, _("running postuninstall script (if any)\n"));
 	rc = runInstScript(rootdir, h, RPMTAG_POSTUN, RPMTAG_POSTUNPROG,
-			scriptArg, (flags & RPMTRANS_FLAG_NOSCRIPTS), scriptFd);
+			scriptArg, (transFlags & RPMTRANS_FLAG_NOSCRIPTS), scriptFd);
 	/* XXX postun failures are not cause for erasure failure. */
     }
 
-    if (!(flags & RPMTRANS_FLAG_NOTRIGGERS)) {
+    if (!(transFlags & RPMTRANS_FLAG_NOTRIGGERS)) {
 	/* Run postun triggers which are set off by this package's removal. */
 	rc = runTriggers(rootdir, rpmdb, RPMSENSE_TRIGGERPOSTUN, h,
 			-1, scriptFd);
@@ -228,7 +228,7 @@ int removeBinaryPackage(const char * rootdir, rpmdb rpmdb, unsigned int offset,
 	    return 2;
     }
 
-    if (!(flags & RPMTRANS_FLAG_TEST))
+    if (!(transFlags & RPMTRANS_FLAG_TEST))
 	rpmdbRemove(rpmdb, offset);
 
     return 0;
diff --git a/lib/verify.c b/lib/verify.c
index 669242f35..25f6a9f62 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -349,7 +349,6 @@ static int verifyDependencies(/*@only@*/ rpmdb rpmdb, Header h) {
     return 0;
 }
 
-/** */
 int showVerifyPackage(QVA_t *qva, rpmdb rpmdb, Header h)
 {
     int ec, rc;
@@ -369,8 +368,7 @@ int showVerifyPackage(QVA_t *qva, rpmdb rpmdb, Header h)
     return ec;
 }
 
-/** */
-int rpmVerify(QVA_t *qva, enum rpmQVSources source, const char *arg)
+int rpmVerify(QVA_t *qva, rpmQVSources source, const char *arg)
 {
     rpmdb rpmdb = NULL;
     int rc;
diff --git a/perl/Makefile.in b/perl/Makefile.in
index 34c649df2..bc329d02c 100644
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
@@ -97,7 +97,6 @@ LIBDIR = @LIBDIR@
 LIBMISC = @LIBMISC@
 LIBOBJS = @LIBOBJS@
 LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@
-LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
diff --git a/po/cs.po b/po/cs.po
index 8843f64bd..d8a4e884f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-0400\n"
 "PO-Revision-Date: 2000-08-08 22:37+0100\n"
 "Last-Translator: Milan Kerslager <milan.kerslager@spsselib.hiedu.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "chyba: nemohu otevřít %s/packages.rpm\n"
@@ -2945,7 +2945,7 @@ msgstr "otevření %s selhalo: %s\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "nelze provést dotaz na zdrojové balíčky starého formátu\n"
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "nezdá se, že by %s byl balíček typu RPM\n"
@@ -3009,7 +3009,7 @@ msgstr "záznam balíčku číslo: %u\n"
 msgid "record %d could not be read\n"
 msgstr "záznam %d nelze přečíst\n"
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balíček %s není nainstalován\n"
@@ -3312,104 +3312,104 @@ msgstr "mažu adresář %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "nemohu odstranit adresář %s: %s\n"
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr "počítám balíčky pro instalaci\n"
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr "nalezeno %d balíčků\n"
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr "hledám balíčky pro stažení\n"
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "přeskakuji %s - rpmGlob selhal(%d)\n"
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Stahuji %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... jako %s\n"
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "přeskakuji %s - přenos selhal - %s\n"
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "přijato %d balíčků\n"
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nemohu otevřít soubor %s: %s\n"
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nemůže být nainstalován\n"
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nemohu otevřít databázi balíčků v %s\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "balíček %s není přemístitelný\n"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba při čtení ze souboru %s\n"
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "soubor %s vyžaduje novější verzi RPM\n"
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "nalezeno %d zdrojových a %d binárních balíčků\n"
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr "nevyřešené závislosti:\n"
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr "instaluji binární balíčky\n"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" určuje více balíčků\n"
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstranění těchto balíčků by porušilo závislosti:\n"
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nemohu otevřít %s: %s\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instaluji %s\n"
diff --git a/po/da.po b/po/da.po
index be8829890..a4694421a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-0400\n"
 "PO-Revision-Date: 2000-03-07 05:17+01:00\n"
 "Last-Translator: K. Christiansen <kenneth@gnu.org>\n"
 "Language-Team: Danish/Dansk <dansk@klid.dk>\n"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "Kan ikke ĺbne %s/packages.rpm\n"
@@ -2909,7 +2909,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2973,7 +2973,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3250,104 +3250,104 @@ msgstr "fjener kataloget %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr "fundet %d pakke(r)\n"
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr "leder efter pakker til at hente\n"
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Modtager %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "modtager %d pakker\n"
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kan ikke ĺbne fil %s: %s\n"
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "Kan ikke ĺbne %s/packages.rpm\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr "installerer binćre pakker\n"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan ikke ĺbne %s: %s\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
diff --git a/po/de.po b/po/de.po
index 91981044d..a559667da 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -45,7 +45,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, fuzzy, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
@@ -3195,7 +3195,7 @@ msgstr "öffnen von %s fehlgeschlagen: %s\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s scheint kein RPM-Paket zu sein\n"
@@ -3262,7 +3262,7 @@ msgstr "ungültige Paket-Nummer: %s\n"
 msgid "record %d could not be read\n"
 msgstr "Eintrag %d konnte nicht gelesen werden\n"
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "Paket %s ist nicht installiert\n"
@@ -3547,109 +3547,109 @@ msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 msgid "failed to remove directory %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 #, fuzzy
 msgid "counting packages to install\n"
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, fuzzy, c-format
 msgid "found %d packages\n"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 #, fuzzy
 msgid "looking for packages to download\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
 
 # , c-format
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Hole %s heraus\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "Fehler: %s kann nicht installiert werden\n"
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "Paket installieren"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" bezeichnet mehrere Pakete\n"
 
 # oder besser: "... verletzen" ?
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installiere %s\n"
diff --git a/po/es.po b/po/es.po
index 3237da2f5..d4b636fcb 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -2886,7 +2886,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2950,7 +2950,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 2a534e71b..d020ac93f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -9,7 +9,7 @@ msgstr ""
 "Xgettext-Options: --default-domain=rpm --add-comments --keyword=_ "
 "--keyword=N_\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, fuzzy, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
@@ -3111,7 +3111,7 @@ msgstr "%s:n avaus ei onnistunut: %s\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s ei vaikuta RPM-paketilta\n"
@@ -3176,7 +3176,7 @@ msgstr "virheellinen paketin numero: %s\n"
 msgid "record %d could not be read\n"
 msgstr "tietuetta %d ei voitu lukea\n"
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
@@ -3455,107 +3455,107 @@ msgstr "virhe luotaessa hakemistoa %s: %s"
 msgid "failed to remove directory %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 #, fuzzy
 msgid "counting packages to install\n"
 msgstr "asennukselle ei määritelty paketteja"
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, fuzzy, c-format
 msgid "found %d packages\n"
 msgstr "kysele kaikki paketit"
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 #, fuzzy
 msgid "looking for packages to download\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Haen: %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "virhe: %s ei voida asentaa\n"
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr "puuttuvat riippuvuudet:\n"
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "asenna paketti"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" määrittää useita paketteja\n"
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n"
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr "Asennan: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 77fc2a0b3..8d3eb1f29 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-08-27 20:56-0400\n"
+msgstr "POT-Creation-Date: 2000-08-29 15:35-0400\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -3120,7 +3120,7 @@ msgstr "La construction a échoué.\n"
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -3185,7 +3185,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
@@ -3463,105 +3463,105 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 #, fuzzy
 msgid "counting packages to install\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "aucun package n'a été spécifié pour l'installation"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 3237da2f5..d4b636fcb 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -2886,7 +2886,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2950,7 +2950,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 3237da2f5..d4b636fcb 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -2886,7 +2886,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2950,7 +2950,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 3237da2f5..d4b636fcb 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -2886,7 +2886,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2950,7 +2950,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index bc3c68049..a2cfe53e4 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 1.37\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-0400\n"
 "PO-Revision-Date: 2000-08-02 13:00+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "get ekki opnađ %s/packages.rpm\n"
@@ -2901,7 +2901,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2965,7 +2965,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3242,104 +3242,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "get ekki opnađ pakka gagnagrunn í\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 3237da2f5..d4b636fcb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -2886,7 +2886,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2950,7 +2950,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 2cb690ecc..15d407476 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: EUC-JP\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, fuzzy, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "%s/packages.rpm ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
@@ -83,7 +83,7 @@ msgstr "ĽżĄźĽ˛ĽĂĽČ %s ÍѤ˺îŔŽĂć\n"
 # build root [BuildRoot]
 # net share [ĽÍĽĂĽČśŚÍ­]
 # reloate [şĆÇŰĂÖ/°ÜĆ°¤š¤ë]
-# $Id: ja.po,v 1.110 2000/08/28 01:50:49 jbj Exp $
+# $Id: ja.po,v 1.111 2000/08/29 22:04:37 jbj Exp $
 #: rpm.c:178 rpmqv.c:257
 #, c-format
 msgid "rpm: %s\n"
@@ -3077,7 +3077,7 @@ msgstr "%s ¤ÎĽŞĄźĽ×Ľó¤ËźşÇÔ: %s\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "ľěˇÁź°¤ÎĽ˝ĄźĽšĽŃĽĂĽąĄźĽ¸¤ňĚ䤤šç¤ď¤ť¤ë¤ł¤Č¤Ď¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s ¤Ď RPM ĽŃĽĂĽąĄźĽ¸¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
@@ -3142,7 +3142,7 @@ msgstr "ĽŃĽĂĽąĄźĽ¸ĽěĽłĄźĽÉČÖšć %d\n"
 msgid "record %d could not be read\n"
 msgstr "ĽěĽłĄźĽÉ %d ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż\n"
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
@@ -3423,104 +3423,104 @@ msgstr "ĽÇĽŁĽěĽŻĽČĽę¤ÎşîŔŽ: %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "ĽÇĽŁĽěĽŻĽČĽę %s ¤Îşď˝üźşÇÔ: %s\n"
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr "Ľ¤ĽóĽšĽČĄźĽë¤š¤ëĽŃĽĂĽąĄźĽ¸¤ňżô¤¨¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ň¸Ť¤Ä¤ą¤Ţ¤ˇ¤ż\n"
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr "ĽŔĽŚĽóĽíĄźĽÉ¤š¤ëĽŃĽĂĽąĄźĽ¸¤ňĂľ¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "%s ¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š - ĹžÁ÷źşÇÔ - %s\n"
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s ¤ňźčĆŔ¤ˇ¤Ć¤¤¤Ţ¤š\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr "%s ¤Č¤ˇ¤Ć...\n"
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s ¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š - ĹžÁ÷źşÇÔ - %s\n"
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "%d ¸Ä¤ÎĽŃĽĂĽąĄźĽ¸¤ňźčĆŔ¤ˇ¤Ţ¤ˇ¤ż\n"
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %s"
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽë¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "%s/packages.rpm ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎşĆÇŰĂ֤Ǥ­¤Ţ¤ť¤ó"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ť¤é¤ÎĆɤߚţ¤ßĽ¨ĽéĄź "
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "ĽŐĽĄĽ¤Ľë %s ¤Ë¤Ď¤č¤ężˇ¤ˇ¤¤ RPM ¤ÎĽĐĄźĽ¸ĽçĽó¤ŹÉŹÍפǤš\n"
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d ¸Ä¤ÎĽ˝ĄźĽš¤Č %d ¸Ä¤ÎĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ˇ¤ż\n"
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr "°Í¸Ŕ­¤ÎˇçÇĄ:\n"
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr "ĽĐĽ¤ĽĘĽęĽŃĽĂĽąĄźĽ¸¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ¤ĎĘŁżô¤ÎĽŃĽĂĽąĄźĽ¸¤ňťŘÄꤡ¤Ć¤¤¤Ţ¤š\n"
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr "¤ł¤ě¤é¤ÎĽŃĽĂĽąĄźĽ¸¤ňşď˝ü¤š¤ë¤Č°Í¸Ŕ­¤ňÇ˲ő¤ˇ¤Ţ¤š:\n"
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s ¤ňĽ¤ĽóĽšĽČĄźĽëĂć\n"
diff --git a/po/ko.po b/po/ko.po
index 3237da2f5..d4b636fcb 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -2886,7 +2886,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2950,7 +2950,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index 67166a5d3..afcc83a70 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-0400\n"
 "PO-Revision-Date: 2000-08-04 02:59+02:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "kan ikke ĺpne %s/packages.rpm\n"
@@ -2903,7 +2903,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2967,7 +2967,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3244,104 +3244,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan ikke ĺpne pakkedatabase i %s\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "pakke %s kan ikke relokeres\n"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "feil under lesing fra fil %s\n"
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "fil %s trenger en nyere versjon av RPM\n"
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "fant %d kilde- og %d binćrpakker\n"
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr "feilede avhengigheter:\n"
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr "installerer binćrpakker\n"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" spesifiserer flere pakker\n"
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr "fjerning av disse pakkene vil řdelegge avhengigheter:\n"
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan ikke ĺpne %s: %s\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
diff --git a/po/pl.po b/po/pl.po
index 107a426ba..bea431132 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "nie można otworzyć %s/packages.rpm\n"
@@ -3052,7 +3052,7 @@ msgstr "otwarcie %s nie powiodło się\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "pakiety w starym formacie nie mogą być odpytywane\n"
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s nie wygląda na pakiet RPM\n"
@@ -3117,7 +3117,7 @@ msgstr "numer rekordu pakietu: %d\n"
 msgid "record %d could not be read\n"
 msgstr "nie można odczytać rekordu %d\n"
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
@@ -3398,104 +3398,104 @@ msgstr "tworzenie katalogu: %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "usunięcie katalogu %s nie powiodło się: %s\n"
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr "zliczanie pakietów do zainstalowania\n"
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr "znaleziono %d pakietów\n"
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr "szukanie pakietów do ściągnięcia\n"
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "%s pomijany - transmisja %s nie powiodła się\n"
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Ściąganie %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr "... jako %s\n"
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s pomijany - transmisja %s nie powiodła się\n"
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "ściągnięto %d pakietów\n"
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nie można otworzyć pliku %s: %s"
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie może być zainstalowany\n"
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie można otworzyć %s/packages.rpm\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "pakiet %s nie jest przesuwalny\n"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "błąd czytania z pliku %s\n"
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "plik %s wymaga nowszej wersji RPM\n"
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "znaleziono %d pakietów źródłowych i %d binarnych\n"
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr "niespełnione zależności:\n"
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr "instalacja pakietów binarnych\n"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" określa wiele pakietów\n"
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr "usunięcie tych pakietów zerwie zależności:\n"
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie można otworzyć %s\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instalacja %s\n"
diff --git a/po/pt.po b/po/pt.po
index 319bad1f5..6044985a1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-0400\n"
 "PO-Revision-Date: 2000-08-01 21:11+01:00\n"
 "Last-Translator: Pedro Morais <morais@poli.org>\n"
 "Language-Team: pt <morais@poli.org>\n"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-latin1\n"
 "Content-Transfer-Encoding: none\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -2883,7 +2883,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2947,7 +2947,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3226,104 +3226,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5cd1676c7..dd382242c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,9 +2,9 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-08-27 20:56-0400\n"
+msgstr "POT-Creation-Date: 2000-08-29 15:35-0400\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -3184,7 +3184,7 @@ msgstr "Construçăo falhou.\n"
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -3249,7 +3249,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "năo foi passado pacote para instalaçăo"
@@ -3548,21 +3548,21 @@ msgstr "RPM versăo %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 #, fuzzy
 msgid "counting packages to install\n"
 msgstr "năo foi passado pacote para instalaçăo"
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, fuzzy, c-format
 msgid "found %d packages\n"
 msgstr "pesquise todos os pacotes"
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
@@ -3575,92 +3575,92 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, fuzzy, c-format
 msgid "Retrieving %s\n"
 msgstr "RPM versăo %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
 # , c-format
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "năo foi passado pacote para instalaçăo"
 
 # , c-format
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "năo foi passado pacote para instalaçăo"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 #, fuzzy
 msgid "failed dependencies:\n"
 msgstr "lista dependęncias do pacote"
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instale pacote"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 #, fuzzy
 msgid "removing these packages would break dependencies:\n"
 msgstr "lista dependęncias do pacote"
 
 # , c-format
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "Năo consegui abrir: %s\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index cbd4d8d76..d2d9d9621 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -2881,7 +2881,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2945,7 +2945,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3222,104 +3222,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index c554e467b..a878fda92 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 16:42-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -2554,39 +2554,39 @@ msgstr ""
 msgid "renaming %s to %s\n"
 msgstr ""
 
-#: lib/install.c:803 lib/install.c:1070 lib/uninstall.c:40
+#: lib/install.c:803 lib/install.c:1071 lib/uninstall.c:40
 #, c-format
 msgid "rename of %s to %s failed: %s"
 msgstr ""
 
-#: lib/install.c:892
+#: lib/install.c:893
 msgid "source package expected, binary found"
 msgstr ""
 
-#: lib/install.c:939
+#: lib/install.c:940
 #, c-format
 msgid "package: %s-%s-%s files test = %d\n"
 msgstr ""
 
-#: lib/install.c:999
+#: lib/install.c:1000
 msgid "stopping install as we're running --test\n"
 msgstr ""
 
-#: lib/install.c:1004
+#: lib/install.c:1005
 msgid "running preinstall script (if any)\n"
 msgstr ""
 
-#: lib/install.c:1029
+#: lib/install.c:1030
 #, c-format
 msgid "warning: %s created as %s"
 msgstr ""
 
-#: lib/install.c:1066
+#: lib/install.c:1067
 #, c-format
 msgid "warning: %s saved as %s"
 msgstr ""
 
-#: lib/install.c:1154
+#: lib/install.c:1155
 msgid "running postinstall scripts (if any)\n"
 msgstr ""
 
@@ -2877,80 +2877,80 @@ msgid "can't query %s: %s\n"
 msgstr ""
 
 #. XXX Fstrerror
-#: lib/query.c:497
+#: lib/query.c:496
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:515
+#: lib/query.c:514
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:523 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
 
-#: lib/query.c:528
+#: lib/query.c:527
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:561
+#: lib/query.c:560
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:584
+#: lib/query.c:583
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:594
+#: lib/query.c:593
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:604
+#: lib/query.c:603
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:614
+#: lib/query.c:613
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:625
+#: lib/query.c:624
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:655
+#: lib/query.c:654
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:658
+#: lib/query.c:657
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:684
+#: lib/query.c:683
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:687
+#: lib/query.c:686
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:691
+#: lib/query.c:690
 #, c-format
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:701 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 93415f692..add939365 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-0400\n"
 "PO-Revision-Date: 2000-08-08 01:20+0300\n"
 "Last-Translator: Leon Kanter <leon@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -10,7 +10,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Date: 1999-04-03 12:20+0200\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "ĎŰÉÂËÁ ĎÔËŇŮÔÉŃ %s/packages.rpm\n"
@@ -2954,7 +2954,7 @@ msgstr "ĎÔËŇŮÔÉĹ %s ÎĹ ŐÄÁĚĎÓŘ\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "ÚÁĐŇĎÓŮ Ë SRPM × ÓÔÁŇĎÍ ĆĎŇÍÁÔĹ ÎĹ ĐĎÄÄĹŇÖÉ×ÁŔÔÓŃ\n"
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s ÎĹ ĐĎČĎÖ ÎÁ ĐÁËĹÔ RPM...\n"
@@ -3018,7 +3018,7 @@ msgstr "ÚÁĐÉÓŘ ĐÁËĹÔÁ ÎĎÍĹŇ %d\n"
 msgid "record %d could not be read\n"
 msgstr "ÚÁĐÉÓŘ %d ÎĹ ŢÉÔÁĹÔÓŃ\n"
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "ĐÁËĹÔ %s ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n"
@@ -3297,104 +3297,104 @@ msgstr "ÓĎÚÄÁŔ ËÁÔÁĚĎÇ: %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "ŐÄÁĚĹÎÉĹ ËÁÔÁĚĎÇÁ %s ÎĹ ŐÄÁĚĎÓŘ: %s\n"
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr "ÓŢÉÔÁŔ ĐÁËĹÔŮ ÄĚŃ ŐÓÔÁÎĎ×ËÉ\n"
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr "ÎÁĘÄĹÎĎ %d ĐÁËĹÔĎ×\n"
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr "ÉÝŐ ĐÁËĹÔŮ ÄĚŃ ĐĎĚŐŢĹÎÉŃ Ó ftp/http\n"
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "ĐŇĎĐŐÓËÁŔ %s - ĎŰÉÂËÁ ĐĹŇĹÄÁŢÉ - %s\n"
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "đĎĚŐŢÁŔ %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... ËÁË %s\n"
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "ĐŇĎĐŐÓËÁŔ %s - ĎŰÉÂËÁ ĐĹŇĹÄÁŢÉ - %s\n"
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "ĐĎĚŐŢĹÎĎ %d ĐÁËĹÔĎ×\n"
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ÎĹ ÍĎÖĹÔ ÂŮÔŘ ŐÓÔÁÎĎ×ĚĹÎ\n"
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ %s/packages.rpm\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "ĐÁËĹÔ %s - ÎĹ ĐĹŇĹÍĹÝÁĹÍŮĘ\n"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "ĎŰÉÂËÁ ŢÔĹÎÉŃ ÉÚ ĆÁĘĚÁ %s\n"
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "ĆÁĘĚ %s ÔŇĹÂŐĹÔ ÂĎĚĹĹ ÎĎ×ĎĘ ×ĹŇÓÉÉ RPM\n"
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "ÎÁĘÄĹÎĎ %d ÉÓČĎÄÎŮČ É %d ÂÉÎÁŇÎŮČ ĐÁËĹÔĎ×\n"
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr "ÎĹŐÄĎ×ĚĹÔ×ĎŇĹÎÎŮĹ ÚÁ×ÉÓÉÍĎÓÔÉ:\n"
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr "ŐÓÔÁÎÁ×ĚÉ×ÁŔ ÂÉÎÁŇÎŮĹ ĐÁËĹÔŮ\n"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ÚÁÄÁĹÔ ÎĹÓËĎĚŘËĎ ĐÁËĹÔĎ×\n"
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr "ŐÄÁĚĹÎÉĹ ÜÔÉČ ĐÁËĹÔĎ× ÎÁŇŐŰÉÔ ÚÁ×ÉÓÉÍĎÓÔÉ:\n"
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "ÎĹ ÍĎÇŐ ĎÔËŇŮÔŘ %s\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr "őÓÔÁÎÁ×ĚÉ×ÁŔ %s\n"
diff --git a/po/sk.po b/po/sk.po
index 829969ee8..570633a02 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "nie je možné otvoriť %s/packages.rpm\n"
@@ -3058,7 +3058,7 @@ msgstr "otvorenie %s zlyhalo\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "nie je možné pýtať sa zdrojových balíkov v starom formáte\n"
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s zrejme nie je RPM balík\n"
@@ -3123,7 +3123,7 @@ msgstr "požaduje sa záznam číslo %d\n"
 msgid "record %d could not be read\n"
 msgstr "záznam %d nie je možné prečítať\n"
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balík %s nie je nainštalovaný\n"
@@ -3404,104 +3404,104 @@ msgstr "vytvára sa adresár %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstrániť adresár %s: %s\n"
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr "počítajú sa balíky pre inštaláciu\n"
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr "nájdených %d balíkov\n"
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr "hľadajú sa balíky, ktoré treba preniesť\n"
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "%s vynechané - prenos zlyhal - %s\n"
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Prenáša sa %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr "... ako %s\n"
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s vynechané - prenos zlyhal - %s\n"
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "prenieslo sa %d balíkov\n"
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nie je možné otvoriť súbor %s: %s"
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie je možné nainštalovať\n"
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "nie je možné otvoriť %s/packages.rpm\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "balík %s nie je nainštalovaný\n"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba pri vytváraní dočasného súboru %s"
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "nájdených %d zdrojových a %d binárnych balíkov\n"
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr "nevyriešené závislosti:\n"
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr "inštalujú sa binárne balíky\n"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" špecifikuje viac balíkov\n"
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstránenie týchto balíkov by porušilo závislosti:\n"
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie je možné otvoriť %s\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr "Inštaluje sa %s\n"
diff --git a/po/sl.po b/po/sl.po
index 8df21454d..40f362eab 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.95 2000/08/28 01:50:50 jbj Exp $
+# $Id: sl.po,v 1.96 2000/08/29 22:04:38 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-0400\n"
 "PO-Revision-Date: 2000-02-17 22:25+01:00\n"
 "Last-Translator: Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "datoteke %s/packages.rpm ni možno odpreti\n"
@@ -3045,7 +3045,7 @@ msgstr "odpiranje %s neuspešno: %s\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "poizvedba po izvornih paketih v stari obliki ni možna\n"
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s najverjetneje ni paket RPM\n"
@@ -3110,7 +3110,7 @@ msgstr "številka zapisa paketa: %d\n"
 msgid "record %d could not be read\n"
 msgstr "zapisa %d ni možno prebrati\n"
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s ni nameščen\n"
@@ -3389,104 +3389,104 @@ msgstr "ustvarjamo imenik: %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspešna odstranitev imenika %s: %s\n"
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr "štetje paketov za namestitev\n"
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr "najdeno %d paketov\n"
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr "iskanje paketov za prenos po omrežju\n"
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "preskakujemo %s - rpmGlob neuspešen(%d)\n"
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Prenašamo %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... kot %s\n"
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "preskakujemo %s - prenos neuspešen - %s\n"
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "prenesli smo %d paketov\n"
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "ni možno odpreti datoteke %s: %s\n"
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ni možno namestiti\n"
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "paketa ni možno odpreti: %s\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paketa %s ni možno prestaviti\n"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "napaka pri branju iz datoteke %s\n"
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "datoteka %s zahteva novejšo različico RPM\n"
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "najdeno %d izvornih in %d binarnih paketov\n"
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr "neuspešne soodvisnosti:\n"
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr "nameščamo binarne pakete\n"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" določa večterne pakete\n"
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n"
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "ni možno odpreti %s: %s\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr "Nameščamo %s\n"
diff --git a/po/sr.po b/po/sr.po
index 1e08fb8c6..c7aca367a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,13 +1,13 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
 "Xgettext-Options: --default-domain=rpm --add-comments --keyword=_ "
 "--keyword=N_\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, fuzzy, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n"
@@ -3070,7 +3070,7 @@ msgstr "neuspelo otvaranje %s: %s\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "Upit se ne može izvesti nad izvorni paketima u starom formatu\n"
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s ne liči na RPM paket\n"
@@ -3135,7 +3135,7 @@ msgstr "pogrešan broj paketa: %s\n"
 msgid "record %d could not be read\n"
 msgstr "ne mogu da pročitam slog %d\n"
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
@@ -3414,107 +3414,107 @@ msgstr "greška kod kreiranja direktorijuma %s: %s"
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 #, fuzzy
 msgid "counting packages to install\n"
 msgstr "nedostaje paket za instalaciju"
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, fuzzy, c-format
 msgid "found %d packages\n"
 msgstr "upit nad svim paketima"
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 #, fuzzy
 msgid "looking for packages to download\n"
 msgstr "greška kod potrage za paketom %s\n"
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n"
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Pribavljam %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "greška: preskačem %s - neuspelo prenošenje - %s\n"
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "greška: %s se ne može instalirati\n"
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "greška: ne mogu da otvorim %s%s/packages.rpm\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "greška kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "grupa %s ne sadrži nijedan paket\n"
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr "loše međuzavisnosti:\n"
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instaliraj paket"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" određuje više paketa\n"
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr "uklanjanje oviha paketa će narušiti zavisnosti:\n"
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "greška: ne mogu da otvorim %s\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instaliram %s\n"
diff --git a/po/sv.po b/po/sv.po
index 7f860e562..71860b51d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-0400\n"
 "PO-Revision-Date: 2000-08-07 16:53+0200\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "kan inte öppna %s/packages.rpm\n"
@@ -2938,7 +2938,7 @@ msgstr "misslyckades öppna %s: %s\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "källpaket i gammalt format gĺr ej att frĺga om\n"
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s verkar inte vara ett RPM-paket\n"
@@ -3002,7 +3002,7 @@ msgstr "paketpost nummer: %u\n"
 msgid "record %d could not be read\n"
 msgstr "post %d kunde inte läsas\n"
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s är inte installerat\n"
@@ -3305,104 +3305,104 @@ msgstr "tar bort katalog %s\n"
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr "räknar paket att installera\n"
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr "hittade %d paket\n"
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr "letar efter paket att hämta\n"
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "hoppar över %s - rpmGlob misslyckades(%d)\n"
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Hämtar %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hoppar över %s - överföring misslyckades - %s\n"
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr "hämtade %d paket\n"
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kan inte öppna filen %s: %s\n"
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s kan inte installeras\n"
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "kan inte öppna paketdatabas i %s\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paket %s är inte relokerbart\n"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "fel vid läsning frĺn fil %s\n"
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "filen %s behöver en nyare version av RPM\n"
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "hittade %d käll- och %d binärpaket\n"
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr "ouppfyllda beroenden:\n"
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr "installerar binärpaket\n"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" anger flera paket\n"
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n"
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan inte öppna %s: %s\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerar %s\n"
diff --git a/po/tr.po b/po/tr.po
index abbc8087e..2fee5a053 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, fuzzy, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "hata: %s%s/packages.rpm açýlamýyor\n"
@@ -3123,7 +3123,7 @@ msgstr "%s 'ye erisimde belirtilen hata oluţtu: %s\n"
 msgid "old format source packages cannot be queried\n"
 msgstr "eski tip kaynak paketleri sorgulanamýyor\n"
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr "%s bir RPM paketi deđil (gibi)\n"
@@ -3188,7 +3188,7 @@ msgstr "geçersiz paket numarsý: %s\n"
 msgid "record %d could not be read\n"
 msgstr "%d numaralý kayýt okunamadý\n"
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s pakedi yüklenmemiţ\n"
@@ -3467,107 +3467,107 @@ msgstr "%s dizinin oluţturulmasýnda hata: %s"
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s açýlamadý: %s"
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 #, fuzzy
 msgid "counting packages to install\n"
 msgstr "yüklenecek paketler belirtilmedi"
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, fuzzy, c-format
 msgid "found %d packages\n"
 msgstr "Tüm paketleri sorgulama"
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 #, fuzzy
 msgid "looking for packages to download\n"
 msgstr "%s pakedi aranýrken hata oluţtu\n"
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, fuzzy, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr "hata: %s atlanýyor - aktarým baţarýsýz - %s\n"
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s alýnýyor\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hata: %s atlanýyor - aktarým baţarýsýz - %s\n"
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "%s dosyasý açýlamýyor: "
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "hata: %s yüklenemedi\n"
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, fuzzy, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr "hata: %s%s/packages.rpm açýlamýyor\n"
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "%s pakedi yüklenmemiţ\n"
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "%s dizinin oluţturulmasýnda hata: %s"
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%s grubu hiç paket içermiyor\n"
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr "bađýmlýlýk hatasý, aţađýdaki paketlere ihtiyacýnýz var:\n"
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "paket yüklemek"
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" birden fazla paketi tanýmlýyor\n"
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr "bu paketin silinmesi aţađýdaki bađýmlýlýklarý etkileyecektir:\n"
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "hata: %s eriţilemiyor\n"
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s yükleniyor\n"
diff --git a/po/uk.po b/po/uk.po
index 3237da2f5..d4b636fcb 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -2886,7 +2886,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2950,7 +2950,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index 3237da2f5..d4b636fcb 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -2886,7 +2886,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2950,7 +2950,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 3237da2f5..d4b636fcb 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -2886,7 +2886,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2950,7 +2950,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 3237da2f5..d4b636fcb 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0\n"
-"POT-Creation-Date: 2000-08-27 20:56-0400\n"
+"POT-Creation-Date: 2000-08-29 15:35-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"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: build.c:25 lib/rpminstall.c:455
+#: build.c:25 lib/rpminstall.c:458
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
@@ -2886,7 +2886,7 @@ msgstr ""
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:524 lib/rpminstall.c:238
+#: lib/query.c:524 lib/rpminstall.c:240
 #, c-format
 msgid "%s does not appear to be a RPM package\n"
 msgstr ""
@@ -2950,7 +2950,7 @@ msgstr ""
 msgid "record %d could not be read\n"
 msgstr ""
 
-#: lib/query.c:702 lib/rpminstall.c:468
+#: lib/query.c:702 lib/rpminstall.c:471
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -3227,104 +3227,104 @@ msgstr ""
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:133
+#: lib/rpminstall.c:134
 msgid "counting packages to install\n"
 msgstr ""
 
-#: lib/rpminstall.c:137
+#: lib/rpminstall.c:138
 #, c-format
 msgid "found %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:142
+#: lib/rpminstall.c:143
 msgid "looking for packages to download\n"
 msgstr ""
 
-#: lib/rpminstall.c:157
+#: lib/rpminstall.c:158
 #, c-format
 msgid "skipping %s - rpmGlob failed(%d)\n"
 msgstr ""
 
-#: lib/rpminstall.c:172
+#: lib/rpminstall.c:173
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:182
+#: lib/rpminstall.c:183
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:186
+#: lib/rpminstall.c:187
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:213
+#: lib/rpminstall.c:214
 #, c-format
 msgid "retrieved %d packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:224 lib/rpminstall.c:393
+#: lib/rpminstall.c:226 lib/rpminstall.c:395
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:242 lib/rpminstall.c:533
+#: lib/rpminstall.c:244 lib/rpminstall.c:536
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:257
+#: lib/rpminstall.c:259
 #, c-format
 msgid "cannot open Packages database in %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:277
+#: lib/rpminstall.c:279
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:322
+#: lib/rpminstall.c:324
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:327
+#: lib/rpminstall.c:329
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:344
+#: lib/rpminstall.c:346
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:355
+#: lib/rpminstall.c:357
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:373
+#: lib/rpminstall.c:375
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:471
+#: lib/rpminstall.c:474
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:494
+#: lib/rpminstall.c:497
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:522
+#: lib/rpminstall.c:525
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:528
+#: lib/rpminstall.c:531
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
diff --git a/python/Makefile.in b/python/Makefile.in
index b9eb16ad0..61a38e8c9 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -97,7 +97,6 @@ LIBDIR = @LIBDIR@
 LIBMISC = @LIBMISC@
 LIBOBJS = @LIBOBJS@
 LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@
-LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 9a2d626b2..d2ac0eafb 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -1729,10 +1729,11 @@ static PyObject * rpmtransRun(rpmtransObject * s, PyObject * args) {
 
     list = PyList_New(0);
     for (i = 0; i < probs->numProblems; i++) {
-	prob = Py_BuildValue("s(isi)", rpmProblemString(probs->probs[i]),
-			     probs->probs[i].type,
-			     probs->probs[i].str1,
-			     probs->probs[i].ulong1);
+	rpmProblem myprob = probs->probs + i;
+	prob = Py_BuildValue("s(isi)", rpmProblemString(myprob),
+			     myprob->type,
+			     myprob->str1,
+			     myprob->ulong1);
 	PyList_Append(list, prob);
 	Py_DECREF(prob);
     }
diff --git a/rpm.c b/rpm.c
index d69042d85..e9d109291 100755
--- a/rpm.c
+++ b/rpm.c
@@ -536,7 +536,7 @@ int main(int argc, const char ** argv)
     int installFlags = 0, uninstallFlags = 0, interfaceFlags = 0;
     int verifyFlags;
     int checksigFlags = 0;
-    enum rpmKtype addSign = RPMK_NEW_SIGNATURE;
+    rpmResignFlags addSign = RESIGN_NEW_SIGNATURE;
     char * passPhrase = "";
     const char * optArg;
     pid_t pipeChild = 0;
@@ -721,7 +721,7 @@ int main(int argc, const char ** argv)
 	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_RESIGN)
 		argerror(_("only one major mode may be specified"));
 	    bigMode = MODE_RESIGN;
-	    addSign = RPMK_NEW_SIGNATURE;
+	    addSign = RESIGN_NEW_SIGNATURE;
 	    signIt = 1;
 	    break;
 
@@ -729,7 +729,7 @@ int main(int argc, const char ** argv)
 	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_RESIGN)
 		argerror(_("only one major mode may be specified"));
 	    bigMode = MODE_RESIGN;
-	    addSign = RPMK_ADD_SIGNATURE;
+	    addSign = RESIGN_ADD_SIGNATURE;
 	    signIt = 1;
 	    break;
 
diff --git a/rpm.spec b/rpm.spec
index 4ca172ef2..a2875faec 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -208,6 +208,7 @@ fi
 %{__prefix}%{__share}/man/man[18]/*.[18]*
 %lang(pl) %{__prefix}%{__share}/man/pl/man[18]/*.[18]*
 %lang(ru) %{__prefix}%{__share}/man/ru/man[18]/*.[18]*
+%lang(sk) %{__prefix}%{__share}/man/sk/man[18]/*.[18]*
 
 %files build
 %defattr(-,root,root)
diff --git a/rpmio/rpmio.h b/rpmio/rpmio.h
index 7ec637483..b60e23b2b 100644
--- a/rpmio/rpmio.h
+++ b/rpmio/rpmio.h
@@ -18,47 +18,121 @@
 #define USE_COOKIE_SEEK_POINTER 1
 #endif
 
+
+/** \ingroup rpmio
+ */
 typedef	/*@abstract@*/ /*@refcounted@*/ struct _FD_s * FD_t;
+
+/** \ingroup rpmio
+ */
 typedef /*@observer@*/ struct FDIO_s * FDIO_t;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+/** \ingroup rpmio
+ * \name RPMIO Vectors.
+ */
+/*@{*/
 typedef ssize_t fdio_read_function_t (void *cookie, char *buf, size_t nbytes);
+
+/** \ingroup rpmio
+ */
 typedef ssize_t fdio_write_function_t (void *cookie, const char *buf, size_t nbytes);
+
+/** \ingroup rpmio
+ */
 #ifdef USE_COOKIE_SEEK_POINTER
 typedef int fdio_seek_function_t (void *cookie, _IO_off64_t * offset, int whence);
 #else
 typedef int fdio_seek_function_t (void *cookie, off_t offset, int whence);
 #endif
+
+/** \ingroup rpmio
+ */
 typedef int fdio_close_function_t (void *cookie);
 
+
+/** \ingroup rpmio
+ */
 typedef /*@null@*/ FD_t fdio_ref_function_t ( /*@only@*/ void * cookie,
 		const char * msg, const char * file, unsigned line);
+
+/** \ingroup rpmio
+ */
 typedef /*@null@*/ FD_t fdio_deref_function_t ( /*@only@*/ FD_t fd,
 		const char * msg, const char * file, unsigned line);
 
+
+/** \ingroup rpmio
+ */
 typedef /*@null@*/ FD_t fdio_new_function_t (const char * msg,
 		const char * file, unsigned line);
 
+
+/** \ingroup rpmio
+ */
 typedef int fdio_fileno_function_t (void * cookie);
 
+
+/** \ingroup rpmio
+ */
 typedef FD_t fdio_open_function_t (const char * path, int flags, mode_t mode);
+
+/** \ingroup rpmio
+ */
 typedef FD_t fdio_fopen_function_t (const char * path, const char * fmode);
+
+/** \ingroup rpmio
+ */
 typedef void * fdio_ffileno_function_t (FD_t fd);
+
+/** \ingroup rpmio
+ */
 typedef int fdio_fflush_function_t (FD_t fd);
+/*@}*/
+
 
+/** \ingroup rpmrpc
+ * \name RPMRPC Vectors.
+ */
+/*@{*/
 typedef int fdio_mkdir_function_t (const char * path, mode_t mode);
+
+/** \ingroup rpmrpc
+ */
 typedef int fdio_chdir_function_t (const char * path);
+
+/** \ingroup rpmrpc
+ */
 typedef int fdio_rmdir_function_t (const char * path);
+
+/** \ingroup rpmrpc
+ */
 typedef int fdio_rename_function_t (const char * oldpath, const char * newpath);
+
+/** \ingroup rpmrpc
+ */
 typedef int fdio_unlink_function_t (const char * path);
 
+
+/** \ingroup rpmrpc
+ */
 typedef int fdio_stat_function_t (const char * path, struct stat * st);
+
+/** \ingroup rpmrpc
+ */
 typedef int fdio_lstat_function_t (const char * path, struct stat * st);
+
+/** \ingroup rpmrpc
+ */
 typedef int fdio_access_function_t (const char * path, int amode);
+/*@}*/
 
+
+/** \ingroup rpmio
+ */
 struct FDIO_s {
   fdio_read_function_t *	read;
   fdio_write_function_t *	write;
@@ -82,57 +156,157 @@ struct FDIO_s {
   fdio_unlink_function_t *	_unlink;
 };
 
+
+/** \ingroup rpmio
+ * \name RPMIO Interface.
+ */
+/*@{*/
+
+/** \ingroup rpmio
+ */
 /*@observer@*/ const char * Fstrerror(FD_t fd);
 
+/** \ingroup rpmio
+ */
 size_t	Fread	(/*@out@*/ void * buf, size_t size, size_t nmemb, FD_t fd);
+
+/** \ingroup rpmio
+ */
 size_t	Fwrite	(const void *buf, size_t size, size_t nmemb, FD_t fd);
 
+
+/** \ingroup rpmio
+ */
 #ifdef USE_COOKIE_SEEK_POINTER
 int	Fseek	(FD_t fd, _IO_off64_t offset, int whence);
 #else
 int	Fseek	(FD_t fd, off_t offset, int whence);
 #endif
+
+/** \ingroup rpmio
+ */
 int	Fclose	( /*@killref@*/ FD_t fd);
+
+/** \ingroup rpmio
+ */
 FD_t	Fdopen	(FD_t fd, const char * fmode);
+
+/** \ingroup rpmio
+ */
 FD_t	Fopen	(const char * path, const char * fmode);
 
+
+/** \ingroup rpmio
+ */
 int	Fflush	(FD_t fd);
+
+/** \ingroup rpmio
+ */
 int	Ferror	(FD_t fd);
+
+/** \ingroup rpmio
+ */
 int	Fileno	(FD_t fd);
 
+
+/** \ingroup rpmio
+ */
 int	Fcntl	(FD_t, int op, void *lip);
+
+/** \ingroup rpmio
+ */
 #ifdef USE_COOKIE_SEEK_POINTER
 ssize_t Pread(FD_t fd, void * buf, size_t count, _IO_off64_t offset);
 #else
 ssize_t Pread(FD_t fd, void * buf, size_t count, off_t offset);
 #endif
+
+/** \ingroup rpmio
+ */
 #ifdef USE_COOKIE_SEEK_POINTER
 ssize_t Pwrite(FD_t fd, const void * buf, size_t count, _IO_off64_t offset);
 #else
 ssize_t Pwrite(FD_t fd, const void * buf, size_t count, off_t offset);
 #endif
+/*@}*/
+
+/** \ingroup rpmrpc
+ * \name RPMRPC Interface.
+ */
+/*@{*/
 int	Mkdir	(const char * path, mode_t mode);
+
+/** \ingroup rpmrpc
+ */
 int	Chdir	(const char * path);
+
+/** \ingroup rpmrpc
+ */
 int	Rmdir	(const char * path);
+
+/** \ingroup rpmrpc
+ */
 int	Rename	(const char * oldpath, const char * newpath);
+
+/** \ingroup rpmrpc
+ */
 int	Link	(const char * oldpath, const char * newpath);
+
+/** \ingroup rpmrpc
+ */
 int	Unlink	(const char * path);
+
+/** \ingroup rpmrpc
+ */
 int	Readlink(const char * path, char * buf, size_t bufsiz);
 
+
+/** \ingroup rpmrpc
+ */
 int	Stat	(const char * path, /*@out@*/ struct stat * st);
+
+/** \ingroup rpmrpc
+ */
 int	Lstat	(const char * path, /*@out@*/ struct stat * st);
+
+/** \ingroup rpmrpc
+ */
 int	Access	(const char * path, int amode);
 
+
+/** \ingroup rpmrpc
+ */
 int	Glob	(const char * pattern, int flags,
 		int errfunc(const char * epath, int eerrno), /*@out@*/ glob_t * pglob);
+
+/** \ingroup rpmrpc
+ */
 void	Globfree( /*@only@*/ glob_t * pglob);
 
+
+/** \ingroup rpmrpc
+ */
 DIR *	Opendir	(const char * name);
+
+/** \ingroup rpmrpc
+ */
 struct dirent *	Readdir	(DIR * dir);
+
+/** \ingroup rpmrpc
+ */
 int	Closedir(DIR * dir);
+/*@}*/
+
 
+/** \ingroup rpmio
+ * \name RPMIO Utilities.
+ */
+/*@{*/
 off_t	fdSize	(FD_t fd);
 
+
+/** \ingroup rpmio
+ */
 /*@null@*/ FD_t fdDup(int fdno);
 #ifdef UNUSED
 /*@null@*/ FILE *fdFdopen( /*@only@*/ void * cookie, const char * mode);
@@ -140,13 +314,28 @@ off_t	fdSize	(FD_t fd);
 
 /* XXX Legacy interfaces needed by gnorpm, rpmfind et al */
 
+
+/** \ingroup rpmio
+ */
 /*@-shadow@*/
 int	fdFileno(void * cookie);
 /*@=shadow@*/
 
+
+/** \ingroup rpmio
+ */
 /*@null@*/ FD_t fdOpen(const char *path, int flags, mode_t mode);
+
+/** \ingroup rpmio
+ */
 ssize_t fdRead(void * cookie, /*@out@*/ char * buf, size_t count);
+
+/** \ingroup rpmio
+ */
 ssize_t	fdWrite(void * cookie, const char * buf, size_t count);
+
+/** \ingroup rpmio
+ */
 int	fdClose( /*@only@*/ void * cookie);
 
 /* XXX FD_t reference count debugging wrappers */
@@ -154,7 +343,13 @@ int	fdClose( /*@only@*/ void * cookie);
 #define	fdFree(_fd, _msg)	fdio->_fdderef(_fd, _msg, __FILE__, __LINE__)
 #define	fdNew(_msg)		fdio->_fdnew(_msg, __FILE__, __LINE__)
 
+
+/** \ingroup rpmio
+ */
 int	fdWritable(FD_t fd, int secs);
+
+/** \ingroup rpmio
+ */
 int	fdReadable(FD_t fd, int secs);
 
 /*
@@ -173,22 +368,56 @@ int	fdReadable(FD_t fd, int secs);
 #define FTPERR_NIC_ABORT_IN_PROGRESS -11
 #define FTPERR_UNKNOWN               -100
 
+
+/** \ingroup rpmio
+ */
 /*@dependent@*/ /*@null@*/ void * ufdGetUrlinfo(FD_t fd);
+
+/** \ingroup rpmio
+ */
 /*@observer@*/ const char * urlStrerror(const char * url);
 
+
+/** \ingroup rpmio
+ */
 int	ufdCopy(FD_t sfd, FD_t tfd);
+
+/** \ingroup rpmio
+ */
 int	ufdGetFile( /*@killref@*/ FD_t sfd, FD_t tfd);
+
+/** \ingroup rpmio
+ */
 /*@observer@*/ const char *const ftpStrerror(int errorNumber);
 
 int	timedRead(FD_t fd, /*@out@*/ void * bufptr, int length);
 #define	timedRead	ufdio->read
 
+
+/** \ingroup rpmio
+ */
 /*@observer@*/ extern FDIO_t fdio;
+
+/** \ingroup rpmio
+ */
 /*@observer@*/ extern FDIO_t fpio;
+
+/** \ingroup rpmio
+ */
 /*@observer@*/ extern FDIO_t ufdio;
+
+/** \ingroup rpmio
+ */
 /*@observer@*/ extern FDIO_t gzdio;
+
+/** \ingroup rpmio
+ */
 /*@observer@*/ extern FDIO_t bzdio;
+
+/** \ingroup rpmio
+ */
 /*@observer@*/ extern FDIO_t fadio;
+/*@}*/
 
 #ifdef __cplusplus
 }
diff --git a/rpmio/rpmmessages.h b/rpmio/rpmmessages.h
index 545c5a70f..4c337033f 100644
--- a/rpmio/rpmmessages.h
+++ b/rpmio/rpmmessages.h
@@ -15,23 +15,32 @@
 #define	RPMMESS_QUIET (RPMMESS_NORMAL + 1)
 
 typedef enum rpmCallbackType_e {
-    RPMCALLBACK_INST_PROGRESS, RPMCALLBACK_INST_START,
-    RPMCALLBACK_INST_OPEN_FILE, RPMCALLBACK_INST_CLOSE_FILE,
-    RPMCALLBACK_TRANS_PROGRESS, RPMCALLBACK_TRANS_START, RPMCALLBACK_TRANS_STOP,
-    RPMCALLBACK_UNINST_PROGRESS, RPMCALLBACK_UNINST_START, RPMCALLBACK_UNINST_STOP
+    RPMCALLBACK_INST_PROGRESS,
+    RPMCALLBACK_INST_START,
+    RPMCALLBACK_INST_OPEN_FILE,
+    RPMCALLBACK_INST_CLOSE_FILE,
+    RPMCALLBACK_TRANS_PROGRESS,
+    RPMCALLBACK_TRANS_START,
+    RPMCALLBACK_TRANS_STOP,
+    RPMCALLBACK_UNINST_PROGRESS,
+    RPMCALLBACK_UNINST_START,
+    RPMCALLBACK_UNINST_STOP
 } rpmCallbackType;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+typedef void * rpmCallbackData;
 typedef void * (*rpmCallbackFunction)(const void * h, 
 				      const rpmCallbackType what, 
 				      const unsigned long amount, 
 				      const unsigned long total,
-				      const void * pkgKey, void * data);
+				      const void * pkgKey,
+				      rpmCallbackData data);
 
-void	urlSetCallback(rpmCallbackFunction notify, void *notifyData, int notifyCount);
+void	urlSetCallback(rpmCallbackFunction notify, rpmCallbackData notifyData,
+		int notifyCount);
 
 void rpmIncreaseVerbosity(void);
 void rpmSetVerbosity(int level);
diff --git a/rpmqv.c b/rpmqv.c
index 88fd92b70..0d2a9ccd5 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -655,8 +655,8 @@ int main(int argc, const char ** argv)
 #endif
 
 #if defined(IAM_RPMK)
-    enum rpmKtype addSign = RPMK_NEW_SIGNATURE;
-    int checksigFlags = 0;
+    rpmResignFlags addSign = RESIGN_NEW_SIGNATURE;
+    rpmCheckSigFlags checksigFlags = CHECKSIG_NONE;
 #endif
 
 #if defined(IAM_RPMBT) || defined(IAM_RPMK)
@@ -887,7 +887,7 @@ int main(int argc, const char ** argv)
 	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_RESIGN)
 		argerror(_("only one major mode may be specified"));
 	    bigMode = MODE_RESIGN;
-	    addSign = RPMK_NEW_SIGNATURE;
+	    addSign = RESIGN_NEW_SIGNATURE;
 	    signIt = 1;
 	    break;
 
@@ -895,7 +895,7 @@ int main(int argc, const char ** argv)
 	    if (bigMode != MODE_UNKNOWN && bigMode != MODE_RESIGN)
 		argerror(_("only one major mode may be specified"));
 	    bigMode = MODE_RESIGN;
-	    addSign = RPMK_ADD_SIGNATURE;
+	    addSign = RESIGN_ADD_SIGNATURE;
 	    signIt = 1;
 	    break;
 #endif	/* IAM_RPMK */