- permit build scriptlet interpreters to be individually overridden.

CVS patchset: 7759
CVS date: 2005/02/12 14:12:33

24 files changed, 141 insertions, 129 deletions

diff --git a/CHANGES b/CHANGES
index bb6f9292e..5d3c5c848 100644
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,7 @@
 	- sqlite3: run-time endian test rather than chasing <endian.h> (#146752).
 	- discover and use getmntinfo if present.
 	- perform callbacks as always (#147537).
+	- permit build scriptlet interpreters to be individually overridden.
 
 4.3.3 -> 4.4:
 	- pentium3/pentium4 arch support (pluto@PLD).
diff --git a/build/build.c b/build/build.c
index 35f84476d..67d3f4efe 100644
--- a/build/build.c
+++ b/build/build.c
@@ -64,6 +64,7 @@ int doScript(Spec spec, int what, const char *name, StringBuf sb, int test)
     const char * buildTemplate = NULL;
     const char * buildPost = NULL;
     const char * mTemplate = NULL;
+    const char * mCmd = NULL;
     const char * mPost = NULL;
     int argc = 0;
     const char **argv = NULL;
@@ -83,40 +84,47 @@ int doScript(Spec spec, int what, const char *name, StringBuf sb, int test)
 	sb = spec->prep;
 	mTemplate = "%{__spec_prep_template}";
 	mPost = "%{__spec_prep_post}";
+	mCmd = "%{__spec_prep_cmd}";
 	break;
     case RPMBUILD_BUILD:
 	name = "%build";
 	sb = spec->build;
 	mTemplate = "%{__spec_build_template}";
 	mPost = "%{__spec_build_post}";
+	mCmd = "%{__spec_build_cmd}";
 	break;
     case RPMBUILD_INSTALL:
 	name = "%install";
 	sb = spec->install;
 	mTemplate = "%{__spec_install_template}";
 	mPost = "%{__spec_install_post}";
+	mCmd = "%{__spec_install_cmd}";
 	break;
     case RPMBUILD_CHECK:
 	name = "%check";
 	sb = spec->check;
 	mTemplate = "%{__spec_check_template}";
 	mPost = "%{__spec_check_post}";
+	mCmd = "%{__spec_check_cmd}";
 	break;
     case RPMBUILD_CLEAN:
 	name = "%clean";
 	sb = spec->clean;
 	mTemplate = "%{__spec_clean_template}";
 	mPost = "%{__spec_clean_post}";
+	mCmd = "%{__spec_clean_cmd}";
 	break;
     case RPMBUILD_RMBUILD:
 	name = "--clean";
 	mTemplate = "%{__spec_clean_template}";
 	mPost = "%{__spec_clean_post}";
+	mCmd = "%{__spec_clean_cmd}";
 	break;
     case RPMBUILD_STRINGBUF:
     default:
 	mTemplate = "%{___build_template}";
 	mPost = "%{___build_post}";
+	mCmd = "%{___build_cmd}";
 	break;
     }
     if (name == NULL)	/* XXX shouldn't happen */
@@ -219,7 +227,7 @@ fprintf(stderr, "*** addMacros\n");
 	}
     }
 
-    buildCmd = rpmExpand("%{___build_cmd}", " ", buildScript, NULL);
+    buildCmd = rpmExpand(mCmd, " ", buildScript, NULL);
     (void) poptParseArgvString(buildCmd, &argc, &argv);
 
     rpmMessage(RPMMESS_NORMAL, _("Executing(%s): %s\n"), name, buildCmd);
diff --git a/po/cs.po b/po/cs.po
index 3e21c934b..c6212f045 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -358,27 +358,27 @@ msgstr "pro kontrolu nezadány ¾ádné balíèky"
 msgid "no arguments given"
 msgstr "k dotazu nezadány ¾ádné parametry"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Nelze otevøít doèasný soubor.\n"
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Provádìní(%s): %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Spu¹tìní %s selhalo (%s): %s\n"
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "©patný návratový kód z %s (%s)\n"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/da.po b/po/da.po
index d523cc8e3..6258bd203 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -353,27 +353,27 @@ msgstr "ingen parametre angivet ved verifikation"
 msgid "no arguments given"
 msgstr "ingen parametre angivet ved forespørgsel"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke åbne midlertidig fil.\n"
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Udfører(%s): %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Udførelse af %s mislykkedes (%s): %s\n"
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Fejl-afslutningsstatus fra %s (%s)\n"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/de.po b/po/de.po
index e351e5c4b..2d2aec745 100644
--- a/po/de.po
+++ b/po/de.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -411,30 +411,30 @@ msgid "no arguments given"
 msgstr "Es wurden keine Argumente für die Anfrage angegeben"
 
 # , c-format
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
 
 # , c-format
-#: build/build.c:225
+#: build/build.c:233
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Hole %s heraus\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
 # , c-format
-#: build/build.c:244
+#: build/build.c:252
 #, fuzzy, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/fi.po b/po/fi.po
index 647ea24ae..d7f4634d5 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
@@ -361,28 +361,28 @@ msgstr "tarkistukselle ei annettu parametrejä"
 msgid "no arguments given"
 msgstr "kyselylle ei annettu parametrejä"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "En voi avata %s luettavaksi: %s."
 
-#: build/build.c:225
+#: build/build.c:233
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Haen: %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: build/build.c:244
+#: build/build.c:252
 #, fuzzy, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/fr.po b/po/fr.po
index 6839cf2fb..16c7630eb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM 4.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2003-07-06 01:36+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
@@ -371,27 +371,27 @@ msgstr "aucun argument fourni à la vérification"
 msgid "no arguments given"
 msgstr "aucun argument fourni"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Incapable d'ouvrir un fichier temporaire.\n"
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Exécution_de(%s): %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "L'exec de %s a échoué (%s): %s\n"
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Mauvais status de sortie pour %s (%s)\n"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/gl.po b/po/gl.po
index 293b4cb9d..6108ad6d4 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -341,27 +341,27 @@ msgstr ""
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr ""
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr ""
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/is.po b/po/is.po
index a6107cc20..8acd7268d 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -342,27 +342,27 @@ msgstr ""
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Get ekki opnað tempi skrá.\n"
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Gat ekki keyrt %s (%s): %s\n"
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/ja.po b/po/ja.po
index c0d83e53f..461651dd7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -367,28 +367,28 @@ msgstr "¸¡¾Ú¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
 msgid "no arguments given"
 msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
 
-#: build/build.c:225
+#: build/build.c:233
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "¼Â¹ÔÃæ: %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "%s ¤Î¼Â¹Ô¤Ë¼ºÇÔ (%s)"
 
-#: build/build.c:244
+#: build/build.c:252
 #, fuzzy, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s ¤ÎÉÔÀµ¤Ê½ªÎ»¥¹¥Æ¡¼¥¿¥¹ (%s)"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/ko.po b/po/ko.po
index e667db2e0..206264e04 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -352,27 +352,27 @@ msgstr "°ËÁõ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
 msgid "no arguments given"
 msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Àӽà ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "½ÇÇà Áß(%s): %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "%sÀÇ ½ÇÇà¿¡ ½ÇÆÐÇÔ (%s): %s\n"
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%sÀÇ À߸øµÈ Á¾·á »óȲ (%s)\n"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/no.po b/po/no.po
index 8343e4064..f19225aa9 100644
--- a/po/no.po
+++ b/po/no.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -350,27 +350,27 @@ msgstr "ingen argumenter oppgitt for verifisering"
 msgid "no arguments given"
 msgstr "ingen argumenter oppgitt for spørring"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Kjører(%s): %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Kjøring av %s feilet (%s): %s\n"
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Ugyldig sluttstatus fra %s (%s)\n"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/pl.po b/po/pl.po
index b682aa3d7..68a1d5378 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.3-20030515\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2003-06-08 22:42+0200\n"
 "Last-Translator: Arkadiusz Miskiewicz <arekm@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -363,27 +363,27 @@ msgstr "nie podano argumentów dla sprawdzania"
 msgid "no arguments given"
 msgstr "nie podano argumentów"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Nie mo¿na otworzyæ pliku tymczasowego.\n"
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Wykonywanie(%s): %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Wykonanie %s nie powiod³o siê (%s): %s\n"
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "B³êdny status wyj¶cia z %s (%s)\n"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/pt.po b/po/pt.po
index 3ba101d93..ed35722ec 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
@@ -360,27 +360,27 @@ msgstr "não foram indicados argumentos para a verificação"
 msgid "no arguments given"
 msgstr "não foram indicados argumentos para a pesquisa"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Não consegui abrir um ficheiro temporário.\n"
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "A executar(%s): %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "A execução de %s falhou (%s): %s\n"
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Código de saída inválido do %s (%s)\n"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d494325d3..5013e9e43 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2004-02-29 07:48+0500\n"
 "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese\n"
@@ -394,7 +394,7 @@ msgid "no arguments given"
 msgstr "no foi passado argumento para pesquisa"
 
 # , c-format
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "No consegui abrir: %s\n"
@@ -407,24 +407,24 @@ msgstr "No consegui abrir: %s\n"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: build/build.c:225
+#: build/build.c:233
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "RPM verso %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Construo falhou.\n"
 
 # , c-format
-#: build/build.c:244
+#: build/build.c:252
 #, fuzzy, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/ro.po b/po/ro.po
index ecb6c504a..d0b52f7b6 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -341,27 +341,27 @@ msgstr ""
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr ""
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr ""
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/rpm.pot b/po/rpm.pot
index 469fe547a..d2e8fb46a 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -347,27 +347,27 @@ msgstr ""
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr ""
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr ""
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr ""
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr ""
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/ru.po b/po/ru.po
index c4346961b..1dcf5582e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2002-08-27 13:36-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -360,27 +360,27 @@ msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÅÒÉÆÉËÁÃÉÉ"
 msgid "no arguments given"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ.\n"
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "÷ÙÐÏÌÎÑÅÔÓÑ(%s): %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "÷ÙÐÏÌÎÉÔØ %s ÎÅ ÕÄÁÌÏÓØ (%s): %s\n"
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "îÅ×ÅÒÎÙÊ ËÏÄ ×ÏÚ×ÒÁÔÁ ÉÚ %s (%s)\n"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/sk.po b/po/sk.po
index 6ebae1f50..4b43c3cbd 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -359,28 +359,28 @@ msgstr "neboli zadané ¾iadne argumenty pre overenie"
 msgid "no arguments given"
 msgstr "neboli zadané ¾iadne argumenty pre otázku"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Nie je mo¾né otvori» doèasný súbor"
 
-#: build/build.c:225
+#: build/build.c:233
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Vykonáva sa: %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Vykonanie %s zlyhalo (%s)"
 
-#: build/build.c:244
+#: build/build.c:252
 #, fuzzy, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Chybný výstupný kód z %s (%s)"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/sl.po b/po/sl.po
index b3e56b3a6..7430a5102 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,13 +1,13 @@
 # -*- 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.389.2.14 2005/02/10 09:04:19 jbj Exp $
+# $Id: sl.po,v 1.389.2.15 2005/02/12 14:12:36 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -358,28 +358,28 @@ msgstr "argumenti za preverjanje niso podani"
 msgid "no arguments given"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Zaèasne datoteke ni mo¾no odpreti"
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Izvajanje(%s): %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Izvajanje %s je bilo neuspe¹no (%s): %s"
 
-#: build/build.c:244
+#: build/build.c:252
 #, fuzzy, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s javi neuspe¹no izhodno kodo (%s)"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/sr.po b/po/sr.po
index 2826c6117..1eae9dfd8 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2004-02-29 07:48+0500\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
@@ -357,28 +357,28 @@ msgstr "nedostaju argumenti za proveru"
 msgid "no arguments given"
 msgstr "nedostaju argumenti za upit"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Ne mogu da otvorim %s za èitanje: %s"
 
-#: build/build.c:225
+#: build/build.c:233
 #, fuzzy, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Pribavljam %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, fuzzy, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: build/build.c:244
+#: build/build.c:252
 #, fuzzy, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/sv.po b/po/sv.po
index 97340ff47..b7955e6e7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2003-02-05 12:40+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -352,27 +352,27 @@ msgstr "inga parametrar angivna för verifiering"
 msgid "no arguments given"
 msgstr "inga argument angivna"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Kan inte öppna temporär fil.\n"
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "Kör(%s): %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "Körning (exec) av %s misslyckades (%s): %s\n"
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "Dålig slutstatus från %s (%s)\n"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/po/tr.po b/po/tr.po
index 81daf0b54..567a31407 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-10 04:01-0500\n"
+"POT-Creation-Date: 2005-02-11 13:27-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -363,27 +363,27 @@ msgstr "denetleme için hiç argüman belirtilmedi"
 msgid "no arguments given"
 msgstr "sorgulama için hiç argüman belirtilmedi"
 
-#: build/build.c:132 build/pack.c:511
+#: build/build.c:140 build/pack.c:511
 msgid "Unable to open temp file.\n"
 msgstr "Geçici dosya açýlamadý.\n"
 
-#: build/build.c:225
+#: build/build.c:233
 #, c-format
 msgid "Executing(%s): %s\n"
 msgstr "%s icra ediliyor: %s\n"
 
 #. @=boundsread@
-#: build/build.c:235
+#: build/build.c:243
 #, c-format
 msgid "Exec of %s failed (%s): %s\n"
 msgstr "%s 'in icrasý baþarýsýz (%s): %s\n"
 
-#: build/build.c:244
+#: build/build.c:252
 #, c-format
 msgid "Bad exit status from %s (%s)\n"
 msgstr "%s çýkýþýnda hata (%s)\n"
 
-#: build/build.c:355
+#: build/build.c:363
 msgid ""
 "\n"
 "\n"
diff --git a/rpm.spec.in b/rpm.spec.in
index 85fff7934..56e0603c8 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -20,7 +20,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.20
+Release: 0.22
 Group: System Environment/Base
 Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz
 License: GPL
@@ -500,6 +500,9 @@ exit 0
 %{__includedir}/popt.h
 
 %changelog
+* Fri Feb 11 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-0.22
+- permit build scriptlet interpreters to be individually overridden.
+
 * Thu Feb 10 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-0.20
 - perform callbacks as always (#147537).