Sanity (make dist).

CVS patchset: 3776
CVS date: 2000/05/31 13:19:37

16 files changed, 263 insertions, 251 deletions

diff --git a/build/pack.c b/build/pack.c
index 52cfa4791..e2d34a92b 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -300,6 +300,8 @@ int writeRPM(Header h, const char *fileName, int type,
     else
     	compressFilelist(h);
 
+    providePackageNVR(h);
+
     /* Create and add the cookie */
     if (cookie) {
 	sprintf(buf, "%s %d", buildHost(), (int) time(NULL));
diff --git a/po/cs.po b/po/cs.po
index 03b2f9a00..0df9064e8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-30 19:00-0400\n"
+"POT-Creation-Date: 2000-05-31 07:50-0400\n"
 "PO-Revision-Date: 1998-10-10 10:10+0200\n"
 "Last-Translator: Pavel Makovec <pavelm@terminal.cz>\n"
 "Language-Team: Czech <pavelm@terminal.cz>\n"
@@ -1784,7 +1784,7 @@ msgstr "pro sestavení nezadány ¾ádné soubory .spec"
 msgid "no tar files given for build"
 msgstr "pro sestavení nezadány ¾ádné soubory tar"
 
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Nelze otevøít %s pro ètení: %s."
@@ -2107,51 +2107,51 @@ msgstr "%s není typu RPM\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "chyba pøi vytváøení adresáøe %s: %s"
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:359
+#: build/pack.c:361
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "nelze otevøít %s\n"
 
-#: build/pack.c:391
+#: build/pack.c:393
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "Nelze zapsat %s"
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Probíhá generování podpisu: %d\n"
 
-#: build/pack.c:422
+#: build/pack.c:424
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Nelze zapsat %s"
 
-#: build/pack.c:432
+#: build/pack.c:434
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Nelze zapsat %s"
 
-#: build/pack.c:442
+#: build/pack.c:444
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Nelze zapsat %s"
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, fuzzy, c-format
 msgid "Wrote: %s\n"
 msgstr "rpm: %s\n"
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:537
+#: build/pack.c:539
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nelze otevøít soubor %s: "
diff --git a/po/de.po b/po/de.po
index 6cc6e4966..0fa7d4ca0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.5.2\n"
-"POT-Creation-Date: 2000-05-30 19:00-0400\n"
+"POT-Creation-Date: 2000-05-31 07:50-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"
@@ -1848,7 +1848,7 @@ msgid "no tar files given for build"
 msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
 
 # , c-format
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
@@ -2185,56 +2185,56 @@ msgstr "Fehler: %s scheint zu keinem RPM-Paket zu gehören\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr ""
 
 # , c-format
-#: build/pack.c:359
+#: build/pack.c:361
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/pack.c:391
+#: build/pack.c:393
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "PGP-Signatur generieren"
 
 # , c-format
-#: build/pack.c:422
+#: build/pack.c:424
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:432
+#: build/pack.c:434
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:442
+#: build/pack.c:444
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:537
+#: build/pack.c:539
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
diff --git a/po/fi.po b/po/fi.po
index 543b53a18..d5429d0c5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-05-30 19:00-0400\n"
+"POT-Creation-Date: 2000-05-31 07:50-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -1819,7 +1819,7 @@ msgstr "käännökselle ei annettu määrittelytiedostoja"
 msgid "no tar files given for build"
 msgstr "käännökselle ei määritelty tar-tiedostoja"
 
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "En voi avata %s luettavaksi: %s."
@@ -2142,51 +2142,51 @@ msgstr "virhe: %s ei vaikuta RPM paketilta\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:359
+#: build/pack.c:361
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/pack.c:391
+#: build/pack.c:393
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: build/pack.c:422
+#: build/pack.c:424
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:432
+#: build/pack.c:434
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:442
+#: build/pack.c:444
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:537
+#: build/pack.c:539
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
diff --git a/po/fr.po b/po/fr.po
index b9b8c888a..7d63fd15a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-05-30 19:00-0400\n"
+msgstr "POT-Creation-Date: 2000-05-31 07:50-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
 #, c-format
@@ -1808,7 +1808,7 @@ msgstr "aucun package n'a été spécifié pour la construction"
 msgid "no tar files given for build"
 msgstr "aucun package n'a été spécifié pour la construction"
 
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "impossible d'ouvrir: %s\n"
@@ -2126,51 +2126,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:359
+#: build/pack.c:361
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:391
+#: build/pack.c:393
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "      --sign            - genère une signature PGP"
 
-#: build/pack.c:422
+#: build/pack.c:424
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:432
+#: build/pack.c:434
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:442
+#: build/pack.c:444
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:537
+#: build/pack.c:539
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
diff --git a/po/ja.po b/po/ja.po
index 8972e7688..d3f7b4f78 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.4\n"
-"POT-Creation-Date: 2000-05-30 19:00-0400\n"
+"POT-Creation-Date: 2000-05-31 07:50-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"
@@ -242,7 +242,7 @@ msgstr "copyright ¤¬¤¢¤ê¤Þ¤»¤ó!\n"
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.61 2000/05/30 23:04:09 jbj Exp $
+# $Id: ja.po,v 1.62 2000/05/31 13:19:38 jbj Exp $
 #: rpm.c:182 rpmqv.c:277
 #, c-format
 msgid "rpm: %s\n"
@@ -1746,7 +1746,7 @@ msgstr "ºîÀ®¤Î¤¿¤á¤Î spec ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
 msgid "no tar files given for build"
 msgstr "ºîÀ®(build)¤Î¤¿¤á¤Î tar ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
@@ -2068,51 +2068,51 @@ msgstr "readRPM: %s ¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: %s ¤«¤é¤Î¥Ø¥Ã¥À¤ÎÆɤ߹þ¤ß\n"
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr "ÉÔÀµ¤Ê CSA ¥Ç¡¼¥¿"
 
-#: build/pack.c:359
+#: build/pack.c:361
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: build/pack.c:391
+#: build/pack.c:393
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "½ð̾¤ÎÀ¸À®Ãæ: %d\n"
 
-#: build/pack.c:422
+#: build/pack.c:424
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "sigtarget ¤ÎÆɤ߹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:432
+#: build/pack.c:434
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "sigtarget ¤ÎÆɤ߹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:442
+#: build/pack.c:444
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "½ñ¤­¹þ¤ßÃæ: %s\n"
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î ½ÐÎÏ¥Õ¥¡¥¤¥ë̾¤òÀ¸À®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
 
-#: build/pack.c:537
+#: build/pack.c:539
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 743eaed26..43e39df14 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm-3.0.2\n"
-"POT-Creation-Date: 2000-05-30 19:00-0400\n"
+"POT-Creation-Date: 2000-05-31 07:50-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"
@@ -1758,7 +1758,7 @@ msgstr "nie podano nazw plików spec do budowania"
 msgid "no tar files given for build"
 msgstr "nie podano nazw plików tar do budowania"
 
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Nie mo¿na otworzyæ pliku tymczasowego"
@@ -2079,51 +2079,51 @@ msgstr "readRPM: %s nie jest pakietem RPM\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: czytanie nag³ówka z %s\n"
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr "B³êdne dane CSA"
 
-#: build/pack.c:359
+#: build/pack.c:361
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Nie mo¿na otworzyæ %s\n"
 
-#: build/pack.c:391
+#: build/pack.c:393
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Generowanie sygnatury: %d\n"
 
-#: build/pack.c:422
+#: build/pack.c:424
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Nie mo¿na odczytaæ sigtarget: %s"
 
-#: build/pack.c:432
+#: build/pack.c:434
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Nie mo¿na odczytaæ sigtarget: %s"
 
-#: build/pack.c:442
+#: build/pack.c:444
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nie mo¿na wygenerowaæ wyj¶ciowej nazwy dla pakietu %s: %s\n"
 
-#: build/pack.c:537
+#: build/pack.c:539
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie mo¿na utworzyæ %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4b3dd464a..2e066786a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,7 +2,7 @@
 # Revised by Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 1998.
 #
 msgid ""
-msgstr "POT-Creation-Date: 2000-05-30 19:00-0400\n"
+msgstr "POT-Creation-Date: 2000-05-31 07:50-0400\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:422
 #, c-format
@@ -1845,7 +1845,7 @@ msgid "no tar files given for build"
 msgstr "não foram passados arquivos tar para construção"
 
 # , c-format
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Não consegui abrir: %s\n"
@@ -2185,57 +2185,57 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr ""
 
 # , c-format
-#: build/pack.c:359
+#: build/pack.c:361
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:391
+#: build/pack.c:393
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "gere assinatura PGP"
 
 # , c-format
-#: build/pack.c:422
+#: build/pack.c:424
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:432
+#: build/pack.c:434
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:442
+#: build/pack.c:444
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:537
+#: build/pack.c:539
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Não consegui abrir: %s\n"
diff --git a/po/rpm.pot b/po/rpm.pot
index 17f0933d6..18b51db3b 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-05-30 19:00-0400\n"
+"POT-Creation-Date: 2000-05-31 07:50-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"
@@ -1607,7 +1607,7 @@ msgstr ""
 msgid "no tar files given for build"
 msgstr ""
 
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 msgid "Unable to open temp file."
 msgstr ""
 
@@ -1923,51 +1923,51 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:359
+#: build/pack.c:361
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:391
+#: build/pack.c:393
 #, c-format
 msgid "Unable to write package: %s"
 msgstr ""
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:422
+#: build/pack.c:424
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:432
+#: build/pack.c:434
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr ""
 
-#: build/pack.c:442
+#: build/pack.c:444
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr ""
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:537
+#: build/pack.c:539
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 1d9b2d38a..fe0d3cf9f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-05-30 19:00-0400\n"
+"POT-Creation-Date: 2000-05-31 07:50-0400\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1762,7 +1762,7 @@ msgstr "ÎÅ ÚÁÄÁÎ spec-ÆÁÊÌ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ"
 msgid "no tar files given for build"
 msgstr "ÎÅ ÚÁÄÁÎÙ tar-ÆÁÊÌÙ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ"
 
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ"
@@ -2083,51 +2083,51 @@ msgstr "readRPM: %s - ÎÅ ÐÁËÅÔ RPM\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: ÞÉÔÁÀ ÈÅÄÅÒ ÉÚ %s\n"
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr "îÅ×ÅÒÎÙÅ ÄÁÎÎÙÅ CSA"
 
-#: build/pack.c:359
+#: build/pack.c:361
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ %s\n"
 
-#: build/pack.c:391
+#: build/pack.c:393
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "îÅ ÍÏÇÕ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s"
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "çÅÎÅÒÉÒÕÀ ÐÏÄÐÉÓØ: %d\n"
 
-#: build/pack.c:422
+#: build/pack.c:424
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "îÅ ÍÏÇÕ ÐÒÏÞÉÔÁÔØ ÃÅÌØ ÐÏÄÐÉÓÉ: %s"
 
-#: build/pack.c:432
+#: build/pack.c:434
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "îÅ ÍÏÇÕ ÐÒÏÞÉÔÁÔØ ÃÅÌØ ÐÏÄÐÉÓÉ: %s"
 
-#: build/pack.c:442
+#: build/pack.c:444
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "îÅ ÍÏÇÕ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s"
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "úÁÐÉÓÁÎ: %s\n"
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "îÅ ÍÏÇÕ ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÉÍÑ ÆÁÊÌÁ ÄÌÑ ÐÁËÅÔÁ %s: %s\n"
 
-#: build/pack.c:537
+#: build/pack.c:539
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ÎÅ ÍÏÇÕ ÓÏÚÄÁÔØ %s"
diff --git a/po/sk.po b/po/sk.po
index 4dfd8cc4f..95c403c9c 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 2.93\n"
-"POT-Creation-Date: 2000-05-30 19:00-0400\n"
+"POT-Creation-Date: 2000-05-31 07:50-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"
@@ -1767,7 +1767,7 @@ msgstr "neboli zadané ¾iadne spec-súbory pre zostavenie"
 msgid "no tar files given for build"
 msgstr "neboli zadané ¾iadne tar-súbory pre zostavenie"
 
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Nie je mo¾né otvori» doèasný súbor"
@@ -2089,51 +2089,51 @@ msgstr "readRPM: %s nie je RPM balík\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: èítanie hlavièky %s\n"
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr "Chybné CSA dáta"
 
-#: build/pack.c:359
+#: build/pack.c:361
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Otvorenie %s zlyhalo\n"
 
-#: build/pack.c:391
+#: build/pack.c:393
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "Nie je mo¾né zapísa» balík: %s"
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Vytvára sa PGP podpis: %d\n"
 
-#: build/pack.c:422
+#: build/pack.c:424
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Nie je preèíta» sigtarget: %s"
 
-#: build/pack.c:432
+#: build/pack.c:434
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Nie je preèíta» sigtarget: %s"
 
-#: build/pack.c:442
+#: build/pack.c:444
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Nie je mo¾né zapísa» balík: %s"
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapísané: %s\n"
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nie je mo¾né vytvori» meno výstupného súboru pre balík %s: %s\n"
 
-#: build/pack.c:537
+#: build/pack.c:539
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie je mo¾né zapísa» do %s: "
diff --git a/po/sl.po b/po/sl.po
index 6424ab6f9..15b3de0f1 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.46 2000/05/30 23:04:10 jbj Exp $
+# $Id: sl.po,v 1.47 2000/05/31 13:19:39 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-05-30 19:00-0400\n"
+"POT-Creation-Date: 2000-05-31 07:50-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"
@@ -1751,7 +1751,7 @@ msgstr "datoteka spec za izgradnjo manjka"
 msgid "no tar files given for build"
 msgstr "arhiv tar za izgradnjo manjka"
 
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Zaèasne datoteke ni mo¾no odpreti"
@@ -2068,51 +2068,51 @@ msgstr "readRPM: %s ni paket tipa RPM\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: branje glave %s\n"
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr "Okvarjeni podatki CSA"
 
-#: build/pack.c:359
+#: build/pack.c:361
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Ni mo¾no odpreti %s: %s\n"
 
-#: build/pack.c:391
+#: build/pack.c:393
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "Ni mo¾no zapisati paketa: %s"
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Izdelujemo podpis: %d\n"
 
-#: build/pack.c:422
+#: build/pack.c:424
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Ciljnega podpisa %s ni mo¾no odpreti: %s"
 
-#: build/pack.c:432
+#: build/pack.c:434
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Ciljni podpis %s ni berljiv: %s"
 
-#: build/pack.c:442
+#: build/pack.c:444
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Ni mo¾no zapisati paketa %s: %s"
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Neuspe¹no ustvarjanje izhodne datoteke za paket %s: %s\n"
 
-#: build/pack.c:537
+#: build/pack.c:539
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ni mo¾no ustvariti %s: %s\n"
diff --git a/po/sr.po b/po/sr.po
index 809f2690e..65254c345 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-05-30 19:00-0400\n"
+"POT-Creation-Date: 2000-05-31 07:50-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"
@@ -1767,7 +1767,7 @@ msgstr "nedostaje specifikacije za kreiranje"
 msgid "no tar files given for build"
 msgstr "nedostaju 'tar' datoteke za kreiranje"
 
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Ne mogu da otvorim %s za èitanje: %s"
@@ -2090,51 +2090,51 @@ msgstr "gre¹ka: èini se da %s nije RPM paket\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "gre¹ka kod uzimanja sloga %s iz %s"
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr ""
 
-#: build/pack.c:359
+#: build/pack.c:361
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/pack.c:391
+#: build/pack.c:393
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "napravi PGP potpis"
 
-#: build/pack.c:422
+#: build/pack.c:424
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:432
+#: build/pack.c:434
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:442
+#: build/pack.c:444
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:537
+#: build/pack.c:539
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
diff --git a/po/sv.po b/po/sv.po
index 79b715881..0395ff5f6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,12 +1,12 @@
 # Swedish messages for RPM
 # Copyright © 1999 Free Software Foundation, Inc.
 # Göran Uddeborg <göran@uddeborg.pp.se>, 1999, 2000.
-# $Revision: 1.106 $
+# $Revision: 1.107 $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-05-30 19:00-0400\n"
+"POT-Creation-Date: 2000-05-31 07:50-0400\n"
 "PO-Revision-Date: 2000-02-21 12:20+0100\n"
 "Last-Translator: Göran Uddeborg <göran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1737,7 +1737,7 @@ msgstr "ingen spec-filer angivna för tillverkning"
 msgid "no tar files given for build"
 msgstr "inga tar-filer angivna för tillverkning"
 
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "Kan inte öppna temporär fil"
@@ -2054,51 +2054,51 @@ msgstr "readRPM: %s är inte ett RPM-paket\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: läser huvud från %s\n"
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr "Felaktig CSA-data"
 
-#: build/pack.c:359
+#: build/pack.c:361
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunde inte öppna %s: %s\n"
 
-#: build/pack.c:391
+#: build/pack.c:393
 #, c-format
 msgid "Unable to write package: %s"
 msgstr "Kunde inte skriva paket: %s"
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererar signatur: %d\n"
 
-#: build/pack.c:422
+#: build/pack.c:424
 #, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "Kan inte läsa signaturen %s: %s"
 
-#: build/pack.c:432
+#: build/pack.c:434
 #, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "Kan inte läsa signaturen %s: %s"
 
-#: build/pack.c:442
+#: build/pack.c:444
 #, c-format
 msgid "Unable to write package %s: %s"
 msgstr "Kan inte skriva paket %s: %s"
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Kunde inte generera utfilnamn för paketet %s: %s\n"
 
-#: build/pack.c:537
+#: build/pack.c:539
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 779f2f1a4..487b21874 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-05-30 19:00-0400\n"
+"POT-Creation-Date: 2000-05-31 07:50-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"
@@ -1816,7 +1816,7 @@ msgstr "oluþturma için gerekli spec dosyasý belirtilmedi"
 msgid "no tar files given for build"
 msgstr "oluþturma için gereken tar dosyalarý belirttilmedi"
 
-#: build/build.c:110 build/pack.c:312
+#: build/build.c:110 build/pack.c:314
 #, fuzzy
 msgid "Unable to open temp file."
 msgstr "%s okuma eriþimi için açýlamadý:%s."
@@ -2139,52 +2139,52 @@ msgstr "hata: %s herhangi bir RPM pakedine ait görünmüyor\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "%s kaydýna %s dosyasýnda eriþilemiyor:"
 
-#: build/pack.c:324
+#: build/pack.c:326
 msgid "Bad CSA data"
 msgstr ""
 
 # , c-format
-#: build/pack.c:359
+#: build/pack.c:361
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s 'ye eriþimde hata oluþtu\n"
 
-#: build/pack.c:391
+#: build/pack.c:393
 #, fuzzy, c-format
 msgid "Unable to write package: %s"
 msgstr "%s 'nin yazýlmasý mümkün deðil"
 
-#: build/pack.c:406
+#: build/pack.c:408
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "PGP-imzasý yaratýr"
 
-#: build/pack.c:422
+#: build/pack.c:424
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s"
 msgstr "%s 'nin yazýlmasý mümkün deðil"
 
-#: build/pack.c:432
+#: build/pack.c:434
 #, fuzzy, c-format
 msgid "Unable to read sigtarget %s: %s"
 msgstr "%s 'nin yazýlmasý mümkün deðil"
 
-#: build/pack.c:442
+#: build/pack.c:444
 #, fuzzy, c-format
 msgid "Unable to write package %s: %s"
 msgstr "%s 'nin yazýlmasý mümkün deðil"
 
-#: build/pack.c:457
+#: build/pack.c:459
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:520
+#: build/pack.c:522
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:537
+#: build/pack.c:539
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s dosyasý açýlamýyor: "
diff --git a/rpm.spec b/rpm.spec
index 41a7bcb11..4097074d6 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,8 +1,11 @@
+%define	__prefix	/usr
+%{expand:%%define __share %(if [ -d %{__prefix}/share/man ]; then echo /share ; else echo %%{nil} ; fi)}
+
 Summary: The Red Hat package management system.
 Name: rpm
 %define version 4.0
 Version: %{version}
-Release: 0.25
+Release: 0.26
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/rpm-%{version}.tar.gz
 Copyright: GPL
@@ -86,9 +89,16 @@ capabilities.
 %prep
 %setup -q
 
+
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr
+%ifos linux
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix} --sysconfdir=/etc --localstatedir=/var --infodir='${prefix}%{__share}/info' --mandir='${prefix}%{__share}/man'
+%else
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{__prefix}
+%endif
+
 make
+
 %ifos linux
 make -C python
 %endif
@@ -104,8 +114,8 @@ mkdir -p $RPM_BUILD_ROOT/etc/rpm
 
 { cd $RPM_BUILD_ROOT
   strip ./bin/rpm
-  strip ./usr/bin/rpm2cpio
-  strip ./usr/lib/rpm/rpmputtext ./usr/lib/rpm/rpmgettext
+  strip .%{__prefix}/bin/rpm2cpio
+  strip .%{__prefix}/lib/rpm/rpmputtext .%{__prefix}/lib/rpm/rpmgettext
 }
 
 %clean
@@ -113,9 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %ifos linux
-if [ ! -e /etc/rpm/macros -a -e /etc/rpmrc -a -f /usr/lib/rpm/convertrpmrc.sh ] 
+if [ ! -e /etc/rpm/macros -a -e /etc/rpmrc -a -f %{__prefix}/lib/rpm/convertrpmrc.sh ] 
 then
-	sh /usr/lib/rpm/convertrpmrc.sh > /dev/null 2>&1
+	sh %{__prefix}/lib/rpm/convertrpmrc.sh > /dev/null 2>&1
 fi
 %else
 /bin/rpm --initdb
@@ -139,107 +149,107 @@ fi
 %doc RPM-PGP-KEY RPM-GPG-KEY CHANGES GROUPS doc/manual/*
 /bin/rpm
 %dir /etc/rpm
-/usr/bin/rpm2cpio
-/usr/bin/gendiff
-/usr/bin/rpmdb
-/usr/bin/rpm[eiukqv]
-/usr/lib/librpm.so.*
-/usr/lib/librpmbuild.so.*
-
-/usr/lib/rpm/brp-*
-/usr/lib/rpm/config.guess
-/usr/lib/rpm/config.sub
-/usr/lib/rpm/convertrpmrc.sh
-/usr/lib/rpm/find-prov.pl
-/usr/lib/rpm/find-provides
-/usr/lib/rpm/find-req.pl
-/usr/lib/rpm/find-requires
-/usr/lib/rpm/freshen.sh
-/usr/lib/rpm/macros
-/usr/lib/rpm/mkinstalldirs
-/usr/lib/rpm/rpmdb
-/usr/lib/rpm/rpm[eiukqv]
-/usr/lib/rpm/rpmpopt
-/usr/lib/rpm/rpmrc
-/usr/lib/rpm/vpkg-provides.sh
-/usr/lib/rpm/vpkg-provides2.sh
+%{__prefix}/bin/rpm2cpio
+%{__prefix}/bin/gendiff
+%{__prefix}/bin/rpmdb
+%{__prefix}/bin/rpm[eiukqv]
+%{__prefix}/lib/librpm.so.*
+%{__prefix}/lib/librpmbuild.so.*
+
+%{__prefix}/lib/rpm/brp-*
+%{__prefix}/lib/rpm/config.guess
+%{__prefix}/lib/rpm/config.sub
+%{__prefix}/lib/rpm/convertrpmrc.sh
+%{__prefix}/lib/rpm/find-prov.pl
+%{__prefix}/lib/rpm/find-provides
+%{__prefix}/lib/rpm/find-req.pl
+%{__prefix}/lib/rpm/find-requires
+%{__prefix}/lib/rpm/freshen.sh
+%{__prefix}/lib/rpm/macros
+%{__prefix}/lib/rpm/mkinstalldirs
+%{__prefix}/lib/rpm/rpmdb
+%{__prefix}/lib/rpm/rpm[eiukqv]
+%{__prefix}/lib/rpm/rpmpopt
+%{__prefix}/lib/rpm/rpmrc
+%{__prefix}/lib/rpm/vpkg-provides.sh
+%{__prefix}/lib/rpm/vpkg-provides2.sh
 %ifarch i386 i486 i586 i686
-/usr/lib/rpm/i[3456]86*
+%{__prefix}/lib/rpm/i[3456]86*
 %endif
 %ifarch alpha
-/usr/lib/rpm/alpha*
+%{__prefix}/lib/rpm/alpha*
 %endif
 %ifarch sparc sparc64
-/usr/lib/rpm/sparc*
+%{__prefix}/lib/rpm/sparc*
 %endif
 %ifarch ia64
-/usr/lib/rpm/ia64*
+%{__prefix}/lib/rpm/ia64*
 %endif
 %ifarch powerpc ppc
-/usr/lib/rpm/powerpc*
+%{__prefix}/lib/rpm/powerpc*
 %endif
 
-%dir /usr/src/redhat
-%dir /usr/src/redhat/BUILD
-%dir /usr/src/redhat/SPECS
-%dir /usr/src/redhat/SOURCES
-%dir /usr/src/redhat/SRPMS
-%dir /usr/src/redhat/RPMS
-/usr/src/redhat/RPMS/*
-/usr/*/locale/*/LC_MESSAGES/rpm.mo
-/usr/man/man[18]/*.[18]*
-%lang(pl) /usr/man/pl/man[18]/*.[18]*
-%lang(ru) /usr/man/ru/man[18]/*.[18]*
+%dir %{__prefix}/src/redhat
+%dir %{__prefix}/src/redhat/BUILD
+%dir %{__prefix}/src/redhat/SPECS
+%dir %{__prefix}/src/redhat/SOURCES
+%dir %{__prefix}/src/redhat/SRPMS
+%dir %{__prefix}/src/redhat/RPMS
+%{__prefix}/src/redhat/RPMS/*
+%{__prefix}/*/locale/*/LC_MESSAGES/rpm.mo
+%{__prefix}%{__share}/man/man[18]/*.[18]*
+%lang(pl) %{__prefix}%{__share}/man/pl/man[18]/*.[18]*
+%lang(ru) %{__prefix}%{__share}/man/ru/man[18]/*.[18]*
 
 %files build
 %defattr(-,root,root)
-/usr/bin/rpm[bt]
-/usr/lib/rpm/check-prereqs
-/usr/lib/rpm/cpanflute
-/usr/lib/rpm/find-lang.sh
-/usr/lib/rpm/find-provides.perl
-/usr/lib/rpm/find-requires.perl
-/usr/lib/rpm/get_magic.pl
-/usr/lib/rpm/getpo.sh
-/usr/lib/rpm/http.req
-/usr/lib/rpm/magic.prov
-/usr/lib/rpm/magic.req
-/usr/lib/rpm/perl.prov
-/usr/lib/rpm/perl.req
-/usr/lib/rpm/rpm[bt]
-/usr/lib/rpm/rpmdiff
-/usr/lib/rpm/rpmdiff.cgi
-/usr/lib/rpm/rpmgettext
-/usr/lib/rpm/rpmputtext
-/usr/lib/rpm/u_pkg.sh
+%{__prefix}/bin/rpm[bt]
+%{__prefix}/lib/rpm/check-prereqs
+%{__prefix}/lib/rpm/cpanflute
+%{__prefix}/lib/rpm/find-lang.sh
+%{__prefix}/lib/rpm/find-provides.perl
+%{__prefix}/lib/rpm/find-requires.perl
+%{__prefix}/lib/rpm/get_magic.pl
+%{__prefix}/lib/rpm/getpo.sh
+%{__prefix}/lib/rpm/http.req
+%{__prefix}/lib/rpm/magic.prov
+%{__prefix}/lib/rpm/magic.req
+%{__prefix}/lib/rpm/perl.prov
+%{__prefix}/lib/rpm/perl.req
+%{__prefix}/lib/rpm/rpm[bt]
+%{__prefix}/lib/rpm/rpmdiff
+%{__prefix}/lib/rpm/rpmdiff.cgi
+%{__prefix}/lib/rpm/rpmgettext
+%{__prefix}/lib/rpm/rpmputtext
+%{__prefix}/lib/rpm/u_pkg.sh
 
 %ifos linux
 %files python
 %defattr(-,root,root)
-/usr/lib/python1.5/site-packages/rpmmodule.so
+%{__prefix}/lib/python1.5/site-packages/rpmmodule.so
 %endif
 
 %files devel
 %defattr(-,root,root)
-/usr/include/rpm
-/usr/lib/librpm.a
-/usr/lib/librpm.la
-/usr/lib/librpm.so
-/usr/lib/librpmbuild.a
-/usr/lib/librpmbuild.la
-/usr/lib/librpmbuild.so
+%{__prefix}/include/rpm
+%{__prefix}/lib/librpm.a
+%{__prefix}/lib/librpm.la
+%{__prefix}/lib/librpm.so
+%{__prefix}/lib/librpmbuild.a
+%{__prefix}/lib/librpmbuild.la
+%{__prefix}/lib/librpmbuild.so
 
 %files -n popt
 %defattr(-,root,root)
-/usr/lib/libpopt.so.*
-/usr/*/locale/*/LC_MESSAGES/popt.mo
-/usr/man/man3/popt.3*
+%{__prefix}/lib/libpopt.so.*
+%{__prefix}/*/locale/*/LC_MESSAGES/popt.mo
+%{__prefix}%{__share}/man/man3/popt.3*
 
 # XXX These may end up in popt-devel but it hardly seems worth the effort now.
-/usr/lib/libpopt.a
-/usr/lib/libpopt.la
-/usr/lib/libpopt.so
-/usr/include/popt.h
+%{__prefix}/lib/libpopt.a
+%{__prefix}/lib/libpopt.la
+%{__prefix}/lib/libpopt.so
+%{__prefix}/include/popt.h
 
 %changelog
 * Tue May 30 2000 Matt Wilson <msw@redhat.com>