macro expansion (and absolute path) in %files -f arg (#9508,#9091).

CVS patchset: 3573
CVS date: 2000/02/22 03:09:53

diff --git a/.cvsignore b/.cvsignore
index 815dc4f..ce744d2 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -24,6 +24,7 @@ macros
 rpm
 rpm2cpio
 rpmconvert
+rpmpopt
 rpmrc
 stamp-h
 stamp-h.in

diff --git a/CHANGES b/CHANGES
index e030150..5c06ebd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -55,6 +55,7 @@
        - add scripts for autogenerating CPAN dependencies.
        - add sl.po from Primoz Peterlin <peterlin@biofiz.mf.uni-lj.si>.
        - updated sv.po from <goeran@uddeborg.pp.se>.
+       - macro expansion (and absolute path) in %files -f arg (#9508,#9091).
 
 3.0.2 -> 3.0.3
        - add --eval to find result of macro expansion.

diff --git a/build/files.c b/build/files.c
index 324d4a0..386752a 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -5,8 +5,6 @@
 
 #include "system.h"
 
-static int _debug = 0;
-
 #define        MYALLPERMS      07777
 
 #include <regex.h>
@@ -942,8 +940,6 @@ static int addFile(struct FileList *fl, const char * diskURL, struct stat *statp
        const char *prefixPtr = fl->prefix;
 
        (void) urlPath(fileURL, &prefixTest);
-if (_debug)
-fprintf(stderr, "*** AF prefixTest %s prefixPtr %s\n", prefixTest, prefixPtr);
        while (*prefixPtr && *prefixTest && (*prefixTest == *prefixPtr)) {
            prefixPtr++;
            prefixTest++;
@@ -1035,8 +1031,6 @@ fprintf(stderr, "*** AF prefixTest %s prefixPtr %s\n", prefixTest, prefixPtr);
 
        flp->fileURL = xstrdup(fileURL);
        flp->diskURL = xstrdup(diskURL);
-if (_debug)
-fprintf(stderr, "*** AF SAVE buildRootURL %s fileURL %s diskURL %s\n", fl->buildRootURL, fileURL, diskURL);
        flp->uname = fileUname;
        flp->gname = fileGname;
 
@@ -1081,9 +1075,6 @@ static int processBinaryFile(/*@unused@*/Package pkg, struct FileList *fl,
     const char *diskURL = NULL;
     int rc = 0;
     
-if (_debug)
-fprintf(stderr, "*** PBF fileURL %s\n", fileURL);
-
     doGlob = myGlobPatternP(fileURL);
 
     /* Check that file starts with leading "/" */
@@ -1152,10 +1143,15 @@ static int processPackageFiles(Spec spec, Package pkg,
        const char *ffn;
        FD_t fd;
 
-       /* XXX FIXME: add %{_buildsubdir} */
-       ffn = rpmGetPath("%{_builddir}/",
-           (spec->buildSubdir ? spec->buildSubdir : "") ,
-           "/", pkg->fileFile, NULL);
+       /* XXX W2DO? urlPath might be useful here. */
+       if (*pkg->fileFile == '/') {
+           ffn = rpmGetPath(pkg->fileFile, NULL);
+       } else {
+           /* XXX FIXME: add %{_buildsubdir} */
+           ffn = rpmGetPath("%{_builddir}/",
+               (spec->buildSubdir ? spec->buildSubdir : "") ,
+               "/", pkg->fileFile, NULL);
+       }
        fd = Fopen(ffn, "r.fpio");
        xfree(ffn);
 
@@ -1491,8 +1487,6 @@ int processSourceFiles(Spec spec)
            diskPath = diskURL;
 
        flp->fileURL = xstrdup(diskPath);
-if (_debug)
-fprintf(stderr, "*** PSF fileName %s diskName %s\n", flp->fileURL, flp->diskURL);
        flp->verifyFlags = RPMVERIFY_ALL;
 
        if (Stat(diskURL, &flp->fl_st)) {

diff --git a/build/parseFiles.c b/build/parseFiles.c
index 3497df9..36aaef3 100644 (file)
--- a/build/parseFiles.c
+++ b/build/parseFiles.c
@@ -31,7 +31,8 @@ int parseFiles(Spec spec)
     if ((rc = poptParseArgvString(spec->line, &argc, &argv))) {
        rpmError(RPMERR_BADSPEC, _("line %d: Error parsing %%files: %s"),
                 spec->lineNum, poptStrerror(rc));
-       return RPMERR_BADSPEC;
+       rc = RPMERR_BADSPEC;
+       goto exit;
     }
 
     optCon = poptGetContext(NULL, argc, argv, optionsTable, 0);
@@ -46,9 +47,8 @@ int parseFiles(Spec spec)
                 spec->lineNum,
                 poptBadOption(optCon, POPT_BADOPTION_NOALIAS), 
                 spec->line);
-       FREE(argv);
-       poptFreeContext(optCon);
-       return RPMERR_BADSPEC;
+       rc = RPMERR_BADSPEC;
+       goto exit;
     }
 
     if (poptPeekArg(optCon)) {
@@ -58,53 +58,54 @@ int parseFiles(Spec spec)
            rpmError(RPMERR_BADSPEC, _("line %d: Too many names: %s"),
                     spec->lineNum,
                     spec->line);
-           FREE(argv);
-           poptFreeContext(optCon);
-           return RPMERR_BADSPEC;
+           rc = RPMERR_BADSPEC;
+           goto exit;
        }
     }
 
     if (lookupPackage(spec, name, flag, &pkg)) {
        rpmError(RPMERR_BADSPEC, _("line %d: Package does not exist: %s"),
                 spec->lineNum, spec->line);
-       FREE(argv);
-       poptFreeContext(optCon);
-       return RPMERR_BADSPEC;
+       rc = RPMERR_BADSPEC;
+       goto exit;
     }
 
     if (pkg->fileList != NULL) {
        rpmError(RPMERR_BADSPEC, _("line %d: Second %%files list"),
                 spec->lineNum);
-       FREE(argv);
-       poptFreeContext(optCon);
-       return RPMERR_BADSPEC;
+       rc = RPMERR_BADSPEC;
+       goto exit;
     }
 
-    if (file) {
-       pkg->fileFile = xstrdup(file);
+    if (file)  {
+    /* XXX not necessary as readline has expanded already, but won't hurt.  */
+       pkg->fileFile = rpmGetPath(file, NULL);
     }
+
     pkg->fileList = newStringBuf();
     
     if ((rc = readLine(spec, STRIP_COMMENTS)) > 0) {
        nextPart = PART_NONE;
     } else {
-       if (rc) {
-           return rc;
-       }
+       if (rc)
+           goto exit;
        while (! (nextPart = isPart(spec->line))) {
            appendStringBuf(pkg->fileList, spec->line);
            if ((rc = readLine(spec, STRIP_COMMENTS)) > 0) {
                nextPart = PART_NONE;
                break;
            }
-           if (rc) {
-               return rc;
-           }
+           if (rc)
+               goto exit;
        }
     }
+    rc = nextPart;
 
-    FREE(argv);
-    poptFreeContext(optCon);
+exit:
+    if (argv)
+       FREE(argv);
+    if (optCon)
+       poptFreeContext(optCon);
        
-    return nextPart;
+    return rc;
 }

diff --git a/configure.in b/configure.in
index 7003070..e59c30a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -903,8 +903,8 @@ dnl # XXX Propagate -lucb to popt ...
 dnl export LIBS INCPATH CONFIG_SITE
 
 AC_CONFIG_SUBDIRS(popt)
-AC_OUTPUT([Doxyfile Makefile rpmrc macros lib/Makefile
-       build/Makefile tools/Makefile scripts/Makefile
+AC_OUTPUT([Doxyfile Makefile rpmrc macros rpmpopt scripts/brp-redhat
+       lib/Makefile build/Makefile tools/Makefile scripts/Makefile
        tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
        misc/Makefile po/Makefile.in intl/Makefile
        doc/Makefile doc/manual/Makefile

diff --git a/perl/Makefile.PL b/perl/Makefile.PL
index e740ca0..02baf9f 100644 (file)
--- a/perl/Makefile.PL
+++ b/perl/Makefile.PL
@@ -7,6 +7,7 @@ WriteMakefile(
              'NAME'    => 'rpm',
              'OBJECT'  => 'rpm.o constant.o',
              'VERSION_FROM' => 'rpm.pm',               # finds $VERSION
+             'MAKEFILE'=> 'PMakefile',
              'LIBS'    => [' -L/usr/local/lib  -ldb1 -lz -lbz2'],                      # e.g., '-lm' 
              'CCFLAGS' => '-g -O2 -D_GNU_SOURCE -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wno-char-subscripts',
              'OPTIMIZE'=> '-g',

diff --git a/po/cs.po b/po/cs.po
index d551b4a..1aa7bd2 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-17 15:48-0500\n"
+"POT-Creation-Date: 2000-02-21 12:02-0500\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"
@@ -1521,58 +1521,58 @@ msgstr ""
 msgid "File not found by glob: %s"
 msgstr "Soubor nebyl na serveru nalezen"
 
-#: build/files.c:1164
+#: build/files.c:1169
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "chyba: nelze otevøít soubor %s\n"
 
-#: build/files.c:1171 build/pack.c:99
+#: build/files.c:1176 build/pack.c:99
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1504
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "soubor %s: %s\n"
 
-#: build/files.c:1511 build/parsePrep.c:34
+#: build/files.c:1516 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1566
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Nelze spustit pgp"
 
-#: build/files.c:1571
+#: build/files.c:1576
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Nelze naèíst cílpodpisu"
 
-#: build/files.c:1653
+#: build/files.c:1658
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "chyba pgp"
 
-#: build/files.c:1657
+#: build/files.c:1662
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "%s nelze vytvoøit\n"
 
-#: build/files.c:1747
+#: build/files.c:1752
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1775 build/files.c:1784
+#: build/files.c:1780 build/files.c:1789
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "%s nelze vytvoøit\n"
 
-#: build/files.c:1891
+#: build/files.c:1896
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "soubor %s: %s\n"
@@ -1737,7 +1737,7 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:51 build/parseFiles.c:45 build/parseScript.c:173
+#: build/parseDescription.c:51 build/parseFiles.c:46 build/parseScript.c:173
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "nelze otevøít %s: %s"
@@ -1747,7 +1747,7 @@ msgstr "nelze otev
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:74 build/parseFiles.c:68 build/parseScript.c:196
+#: build/parseDescription.c:74 build/parseFiles.c:67 build/parseScript.c:196
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "balíèek %s není uveden v %s"
@@ -1761,7 +1761,7 @@ msgstr ""
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:76
+#: build/parseFiles.c:74
 msgid "line %d: Second %%files list"
 msgstr ""
 

diff --git a/po/de.po b/po/de.po
index 6dd59a6..35285ee 100644 (file)
--- 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-02-17 15:48-0500\n"
+"POT-Creation-Date: 2000-02-21 12:02-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"
@@ -1600,62 +1600,62 @@ msgstr ""
 msgid "File not found by glob: %s"
 msgstr "Datei auf dem Server nicht gefunden"
 
-#: build/files.c:1164
+#: build/files.c:1169
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/files.c:1171 build/pack.c:99
+#: build/files.c:1176 build/pack.c:99
 #, c-format
 msgid "line: %s"
 msgstr ""
 
 # , c-format
-#: build/files.c:1499
+#: build/files.c:1504
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/files.c:1511 build/parsePrep.c:34
+#: build/files.c:1516 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1566
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Konnte pgp nicht durchführen"
 
-#: build/files.c:1571
+#: build/files.c:1576
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Konnte Signatur-Ziel (»sigtarget«) nicht lesen"
 
-#: build/files.c:1653
+#: build/files.c:1658
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "pgp fehlgeschlagen"
 
 # , c-format
-#: build/files.c:1657
+#: build/files.c:1662
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
-#: build/files.c:1747
+#: build/files.c:1752
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1775 build/files.c:1784
+#: build/files.c:1780 build/files.c:1789
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/files.c:1891
+#: build/files.c:1896
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -1829,7 +1829,7 @@ msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
 # , c-format
-#: build/parseDescription.c:51 build/parseFiles.c:45 build/parseScript.c:173
+#: build/parseDescription.c:51 build/parseFiles.c:46 build/parseScript.c:173
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -1839,7 +1839,7 @@ msgstr "
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:74 build/parseFiles.c:68 build/parseScript.c:196
+#: build/parseDescription.c:74 build/parseFiles.c:67 build/parseScript.c:196
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "Paket %s wird nicht in %s aufgeführt"
@@ -1853,7 +1853,7 @@ msgstr ""
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:76
+#: build/parseFiles.c:74
 msgid "line %d: Second %%files list"
 msgstr ""
 

diff --git a/po/fi.po b/po/fi.po
index 9042b0a..535a2f1 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-02-17 15:48-0500\n"
+"POT-Creation-Date: 2000-02-21 12:02-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -1559,58 +1559,58 @@ msgstr ""
 msgid "File not found by glob: %s"
 msgstr "Tiedostoa ei löytynyt palvelimelta"
 
-#: build/files.c:1164
+#: build/files.c:1169
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/files.c:1171 build/pack.c:99
+#: build/files.c:1176 build/pack.c:99
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1504
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "en voinut avata %s: %s"
 
-#: build/files.c:1511 build/parsePrep.c:34
+#: build/files.c:1516 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1566
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "En voinut ajaa pgp:tä"
 
-#: build/files.c:1571
+#: build/files.c:1576
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "En voinut ajaa pgp:tä"
 
-#: build/files.c:1653
+#: build/files.c:1658
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "pgp epäonnistui"
 
-#: build/files.c:1657
+#: build/files.c:1662
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "%s:n luonti epäonnistui\n"
 
-#: build/files.c:1747
+#: build/files.c:1752
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1775 build/files.c:1784
+#: build/files.c:1780 build/files.c:1789
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "%s:n luonti epäonnistui\n"
 
-#: build/files.c:1891
+#: build/files.c:1896
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "en voinut avata %s: %s"
@@ -1775,7 +1775,7 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:51 build/parseFiles.c:45 build/parseScript.c:173
+#: build/parseDescription.c:51 build/parseFiles.c:46 build/parseScript.c:173
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "en voinut avata %s: %s"
@@ -1785,7 +1785,7 @@ msgstr "en voinut avata %s: %s"
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:74 build/parseFiles.c:68 build/parseScript.c:196
+#: build/parseDescription.c:74 build/parseFiles.c:67 build/parseScript.c:196
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "paketti %s ei ole %s:ssä"
@@ -1799,7 +1799,7 @@ msgstr ""
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:76
+#: build/parseFiles.c:74
 msgid "line %d: Second %%files list"
 msgstr ""
 

diff --git a/po/fr.po b/po/fr.po
index 5820f33..1b1ec92 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 msgid ""
-msgstr "POT-Creation-Date: 2000-02-17 15:48-0500\n"
+msgstr "POT-Creation-Date: 2000-02-21 12:02-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -1562,58 +1562,58 @@ msgstr ""
 msgid "File not found by glob: %s"
 msgstr "aucun package n'a été spécifié pour la désinstallation"
 
-#: build/files.c:1164
+#: build/files.c:1169
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1171 build/pack.c:99
+#: build/files.c:1176 build/pack.c:99
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1504
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1511 build/parsePrep.c:34
+#: build/files.c:1516 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1566
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1571
+#: build/files.c:1576
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1653
+#: build/files.c:1658
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "La construction a échoué.\n"
 
-#: build/files.c:1657
+#: build/files.c:1662
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1747
+#: build/files.c:1752
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1775 build/files.c:1784
+#: build/files.c:1780 build/files.c:1789
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1891
+#: build/files.c:1896
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1778,7 +1778,7 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:51 build/parseFiles.c:45 build/parseScript.c:173
+#: build/parseDescription.c:51 build/parseFiles.c:46 build/parseScript.c:173
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "impossible d'ouvrir: %s\n"
@@ -1788,7 +1788,7 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:74 build/parseFiles.c:68 build/parseScript.c:196
+#: build/parseDescription.c:74 build/parseFiles.c:67 build/parseScript.c:196
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
@@ -1802,7 +1802,7 @@ msgstr ""
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:76
+#: build/parseFiles.c:74
 msgid "line %d: Second %%files list"
 msgstr ""
 

diff --git a/po/ja.po b/po/ja.po
index 492b6d0..067d0ad 100644 (file)
--- 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-02-17 15:48-0500\n"
+"POT-Creation-Date: 2000-02-21 12:02-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"
@@ -193,7 +193,7 @@ msgstr "copyright 
 # build root [BuildRoot]
 # net share [¥Í¥Ã¥È¶¦Í­]
 # reloate [ºÆÇÛÃÖ/°ÜÆ°¤¹¤ë]
-# $Id: ja.po,v 1.17 2000/02/17 21:00:07 jbj Exp $
+# $Id: ja.po,v 1.18 2000/02/22 03:09:53 jbj Exp $
 #: rpm.c:197
 #, c-format
 msgid "rpm: %s\n"
@@ -1525,58 +1525,58 @@ msgstr "
 msgid "File not found by glob: %s"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó(by glob): %s"
 
-#: build/files.c:1164
+#: build/files.c:1169
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "%%files ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: build/files.c:1171 build/pack.c:99
+#: build/files.c:1176 build/pack.c:99
 #, c-format
 msgid "line: %s"
 msgstr "¹ÔÌÜ: %s"
 
-#: build/files.c:1499
+#: build/files.c:1504
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
 
-#: build/files.c:1511 build/parsePrep.c:34
+#: build/files.c:1516 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "ÉÔÀµ¤Ê½êÍ­¼Ô/¥°¥ë¡¼¥×: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1566
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/files.c:1571
+#: build/files.c:1576
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "%s ¤ò fork ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/files.c:1653
+#: build/files.c:1658
 #, c-format
 msgid "%s failed"
 msgstr "%s ¼ºÇÔ"
 
-#: build/files.c:1657
+#: build/files.c:1662
 #, c-format
 msgid "failed to write all data to %s"
 msgstr "Á´¤Æ¤Î¥Ç¡¼¥¿¤ò %s ¤Ë½ñ¤¯¤³¤È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿"
 
-#: build/files.c:1747
+#: build/files.c:1752
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "%s ¤òõ¤·¤Æ¤¤¤Þ¤¹: (%s ¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹)...\n"
 
-#: build/files.c:1775 build/files.c:1784
+#: build/files.c:1780 build/files.c:1789
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "%s ¤ò¸«¤Ä¤±¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿:"
 
-#: build/files.c:1891
+#: build/files.c:1896
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "¥Õ¥¡¥¤¥ë¤Î½èÍýÃæ: %s-%s-%s\n"
@@ -1741,7 +1741,7 @@ msgstr "%%changelog 
 msgid "line %d: Error parsing %%description: %s"
 msgstr "%d ¹ÔÌÜ: %%description ¤Î²òÀÏ¥¨¥é¡¼: %s"
 
-#: build/parseDescription.c:51 build/parseFiles.c:45 build/parseScript.c:173
+#: build/parseDescription.c:51 build/parseFiles.c:46 build/parseScript.c:173
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "%d ¹ÔÌÜ: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó %s:%s"
@@ -1751,7 +1751,7 @@ msgstr "%d 
 msgid "line %d: Too many names: %s"
 msgstr "%d ¹ÔÌÜ: ̾Á°¤¬Â¿¤¹¤®¤Þ¤¹: %s"
 
-#: build/parseDescription.c:74 build/parseFiles.c:68 build/parseScript.c:196
+#: build/parseDescription.c:74 build/parseFiles.c:67 build/parseScript.c:196
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "%d ¹ÔÌÜ: ¥Ñ¥Ã¥±¡¼¥¸¤¬Â¸ºß¤·¤Þ¤»¤ó: %s"
@@ -1765,7 +1765,7 @@ msgstr "%d 
 msgid "line %d: Error parsing %%files: %s"
 msgstr "%d ¹ÔÌÜ: %%files ¤Î²òÀÏ¥¨¥é¡¼: %s"
 
-#: build/parseFiles.c:76
+#: build/parseFiles.c:74
 msgid "line %d: Second %%files list"
 msgstr "%d ¹ÔÌÜ: 2ÈÖÌܤΠ%%files ¥ê¥¹¥È"
 

diff --git a/po/pl.po b/po/pl.po
index e6e4cc6..8ec099a 100644 (file)
--- 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-02-17 15:48-0500\n"
+"POT-Creation-Date: 2000-02-21 12:02-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -1483,58 +1483,58 @@ msgstr "Plik musi si
 msgid "File not found by glob: %s"
 msgstr "Nie znaleziono pliku: %s"
 
-#: build/files.c:1164
+#: build/files.c:1169
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "Nie mo¿na otworzyæ %%files pliku: %s"
 
-#: build/files.c:1171 build/pack.c:99
+#: build/files.c:1176 build/pack.c:99
 #, c-format
 msgid "line: %s"
 msgstr "linia: %s"
 
-#: build/files.c:1499
+#: build/files.c:1504
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "plik %s: %s\n"
 
-#: build/files.c:1511 build/parsePrep.c:34
+#: build/files.c:1516 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "B³êdny u¿ytkownik/grupa: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1566
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Nie mo¿na uruchomiæ %s"
 
-#: build/files.c:1571
+#: build/files.c:1576
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Nie mo¿na wykonaæ fork na %s"
 
-#: build/files.c:1653
+#: build/files.c:1658
 #, c-format
 msgid "%s failed"
 msgstr "%s nie powiod³o siê"
 
-#: build/files.c:1657
+#: build/files.c:1662
 #, c-format
 msgid "failed to write all data to %s"
 msgstr "zapisanie wszystkich danych do %s nie powiod³o siê"
 
-#: build/files.c:1747
+#: build/files.c:1752
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Wyszukiwanie wymaganych zasobów...\n"
 
-#: build/files.c:1775 build/files.c:1784
+#: build/files.c:1780 build/files.c:1789
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "Wyszukiwanie nie powiod³o siê"
 
-#: build/files.c:1891
+#: build/files.c:1896
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Przetwarzanie plików: %s\n"
@@ -1699,7 +1699,7 @@ msgstr "brak opisu w %%changelog"
 msgid "line %d: Error parsing %%description: %s"
 msgstr "linia %d: b³±d w interpretacji wpisu %%description: %s"
 
-#: build/parseDescription.c:51 build/parseFiles.c:45 build/parseScript.c:173
+#: build/parseDescription.c:51 build/parseFiles.c:46 build/parseScript.c:173
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "linia %d: B³edna opcja %s: %s"
@@ -1709,7 +1709,7 @@ msgstr "linia %d: B
 msgid "line %d: Too many names: %s"
 msgstr "linia %d: Zbyt du¿o nazw: %s"
 
-#: build/parseDescription.c:74 build/parseFiles.c:68 build/parseScript.c:196
+#: build/parseDescription.c:74 build/parseFiles.c:67 build/parseScript.c:196
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "linia %d: Pakiet nie istnieje: %s"
@@ -1723,7 +1723,7 @@ msgstr "linia %d: Drugi opis"
 msgid "line %d: Error parsing %%files: %s"
 msgstr "linia %d: B³±d w interpretacji wpisu %%files: %s"
 
-#: build/parseFiles.c:76
+#: build/parseFiles.c:74
 msgid "line %d: Second %%files list"
 msgstr "linia %d: Druga lista %%files"
 

diff --git a/po/pt_BR.po b/po/pt_BR.po
index fa99143..787e431 100644 (file)
--- 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-02-17 15:48-0500\n"
+msgstr "POT-Creation-Date: 2000-02-21 12:02-0500\n"
 
 #: build.c:25 lib/rpminstall.c:250 lib/rpminstall.c:424
 #, c-format
@@ -1598,63 +1598,63 @@ msgid "File not found by glob: %s"
 msgstr "não foi passado pacote para desinstalação"
 
 # , c-format
-#: build/files.c:1164
+#: build/files.c:1169
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "Não consegui abrir: %s\n"
 
-#: build/files.c:1171 build/pack.c:99
+#: build/files.c:1176 build/pack.c:99
 #, c-format
 msgid "line: %s"
 msgstr ""
 
 # , c-format
-#: build/files.c:1499
+#: build/files.c:1504
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1511 build/parsePrep.c:34
+#: build/files.c:1516 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 # , c-format
 #. XXX this error message is probably not seen.
-#: build/files.c:1566
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build/files.c:1571
+#: build/files.c:1576
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Não consegui ler o arquivo spec de %s\n"
 
-#: build/files.c:1653
+#: build/files.c:1658
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "Construção falhou.\n"
 
 # , c-format
-#: build/files.c:1657
+#: build/files.c:1662
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "Não consegui abrir o pipe tar: %s\n"
 
-#: build/files.c:1747
+#: build/files.c:1752
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
 # , c-format
-#: build/files.c:1775 build/files.c:1784
+#: build/files.c:1780 build/files.c:1789
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "Não consegui abrir o pipe tar: %s\n"
 
-#: build/files.c:1891
+#: build/files.c:1896
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1829,7 +1829,7 @@ msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
 # , c-format
-#: build/parseDescription.c:51 build/parseFiles.c:45 build/parseScript.c:173
+#: build/parseDescription.c:51 build/parseFiles.c:46 build/parseScript.c:173
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "Não consegui abrir: %s\n"
@@ -1839,7 +1839,7 @@ msgstr "N
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:74 build/parseFiles.c:68 build/parseScript.c:196
+#: build/parseDescription.c:74 build/parseFiles.c:67 build/parseScript.c:196
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
@@ -1853,7 +1853,7 @@ msgstr ""
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:76
+#: build/parseFiles.c:74
 msgid "line %d: Second %%files list"
 msgstr ""
 

diff --git a/po/rpm.pot b/po/rpm.pot
index 06ee4f0..54be9c7 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-17 15:48-0500\n"
+"POT-Creation-Date: 2000-02-21 20:45-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"
@@ -1306,168 +1306,168 @@ msgstr ""
 msgid "syntax error in expression"
 msgstr ""
 
-#: build/files.c:204
+#: build/files.c:202
 #, c-format
 msgid "TIMECHECK failure: %s\n"
 msgstr ""
 
-#: build/files.c:249 build/files.c:331 build/files.c:494
+#: build/files.c:247 build/files.c:329 build/files.c:492
 #, c-format
 msgid "Missing '(' in %s %s"
 msgstr ""
 
-#: build/files.c:260 build/files.c:448 build/files.c:505
+#: build/files.c:258 build/files.c:446 build/files.c:503
 #, c-format
 msgid "Missing ')' in %s(%s"
 msgstr ""
 
-#: build/files.c:298 build/files.c:473
+#: build/files.c:296 build/files.c:471
 #, c-format
 msgid "Invalid %s token: %s"
 msgstr ""
 
-#: build/files.c:347
+#: build/files.c:345
 #, c-format
 msgid "Non-white space follows %s(): %s"
 msgstr ""
 
-#: build/files.c:385
+#: build/files.c:383
 #, c-format
 msgid "Bad syntax: %s(%s)"
 msgstr ""
 
-#: build/files.c:395
+#: build/files.c:393
 #, c-format
 msgid "Bad mode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:407
+#: build/files.c:405
 #, c-format
 msgid "Bad dirmode spec: %s(%s)"
 msgstr ""
 
-#: build/files.c:531
+#: build/files.c:529
 msgid "Unusual locale length: \"%.*s\" in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:541
+#: build/files.c:539
 msgid "Duplicate locale %.*s in %%lang(%s)"
 msgstr ""
 
-#: build/files.c:637
+#: build/files.c:635
 msgid "Hit limit for %%docdir"
 msgstr ""
 
-#: build/files.c:643
+#: build/files.c:641
 msgid "Only one arg for %%docdir"
 msgstr ""
 
 #. We already got a file -- error
-#: build/files.c:668
+#: build/files.c:666
 #, c-format
 msgid "Two files on one line: %s"
 msgstr ""
 
-#: build/files.c:681
+#: build/files.c:679
 #, c-format
 msgid "File must begin with \"/\": %s"
 msgstr ""
 
-#: build/files.c:693
+#: build/files.c:691
 msgid "Can't mix special %%doc with other forms: %s"
 msgstr ""
 
-#: build/files.c:779
+#: build/files.c:777
 #, c-format
 msgid "File listed twice: %s"
 msgstr ""
 
-#: build/files.c:872
+#: build/files.c:870
 #, c-format
 msgid "Symlink points to BuildRoot: %s -> %s"
 msgstr ""
 
-#: build/files.c:952
+#: build/files.c:948
 #, c-format
 msgid "File doesn't match prefix (%s): %s"
 msgstr ""
 
-#: build/files.c:962
+#: build/files.c:958
 #, c-format
 msgid "File not found: %s"
 msgstr ""
 
-#: build/files.c:1005
+#: build/files.c:1001
 #, c-format
 msgid "Bad owner/group: %s\n"
 msgstr ""
 
-#: build/files.c:1019
+#: build/files.c:1015
 #, c-format
 msgid "File %4d: %07o %s.%s\t %s\n"
 msgstr ""
 
-#: build/files.c:1093
+#: build/files.c:1084
 #, c-format
 msgid "File needs leading \"/\": %s"
 msgstr ""
 
-#: build/files.c:1122
+#: build/files.c:1113
 #, c-format
 msgid "File not found by glob: %s"
 msgstr ""
 
-#: build/files.c:1164
+#: build/files.c:1160
 msgid "Could not open %%files file %s: %s"
 msgstr ""
 
-#: build/files.c:1171 build/pack.c:99
+#: build/files.c:1167 build/pack.c:99
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1493
 #, c-format
 msgid "Bad file: %s: %s"
 msgstr ""
 
-#: build/files.c:1511 build/parsePrep.c:34
+#: build/files.c:1505 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1566
+#: build/files.c:1560
 #, c-format
 msgid "Couldn't exec %s: %s"
 msgstr ""
 
-#: build/files.c:1571
+#: build/files.c:1565
 #, c-format
 msgid "Couldn't fork %s: %s"
 msgstr ""
 
-#: build/files.c:1653
+#: build/files.c:1647
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: build/files.c:1657
+#: build/files.c:1651
 #, c-format
 msgid "failed to write all data to %s"
 msgstr ""
 
-#: build/files.c:1747
+#: build/files.c:1741
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1775 build/files.c:1784
+#: build/files.c:1769 build/files.c:1778
 #, c-format
 msgid "Failed to find %s:"
 msgstr ""
 
-#: build/files.c:1891
+#: build/files.c:1885
 #, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr ""
@@ -1632,7 +1632,7 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:51 build/parseFiles.c:45 build/parseScript.c:173
+#: build/parseDescription.c:51 build/parseFiles.c:46 build/parseScript.c:173
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr ""
@@ -1642,7 +1642,7 @@ msgstr ""
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:74 build/parseFiles.c:68 build/parseScript.c:196
+#: build/parseDescription.c:74 build/parseFiles.c:67 build/parseScript.c:196
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr ""
@@ -1656,7 +1656,7 @@ msgstr ""
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:76
+#: build/parseFiles.c:74
 msgid "line %d: Second %%files list"
 msgstr ""
 

diff --git a/po/ru.po b/po/ru.po
index d3c564f..6109be5 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-02-17 15:48-0500\n"
+"POT-Creation-Date: 2000-02-21 12:02-0500\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1491,58 +1491,58 @@ msgstr "
 msgid "File not found by glob: %s"
 msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s"
 
-#: build/files.c:1164
+#: build/files.c:1169
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ %%files: %s"
 
-#: build/files.c:1171 build/pack.c:99
+#: build/files.c:1176 build/pack.c:99
 #, c-format
 msgid "line: %s"
 msgstr "ÓÔÒÏËÁ: %s"
 
-#: build/files.c:1499
+#: build/files.c:1504
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "ÆÁÊÌ %s: %s\n"
 
-#: build/files.c:1511 build/parsePrep.c:34
+#: build/files.c:1516 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "îÅ×ÅÒÎÁÑ ÐÁÒÁ ÈÏÚÑÉÎ/ÇÒÕÐÐÁ: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1566
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "îÅ ÍÏÇÕ ÉÓÐÏÌÎÉÔØ %s"
 
-#: build/files.c:1571
+#: build/files.c:1576
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "îÅ ÍÏÇÕ ÆÏÒËÎÕÔØ %s"
 
-#: build/files.c:1653
+#: build/files.c:1658
 #, c-format
 msgid "%s failed"
 msgstr "%s ÎÅ ÕÄÁÌÏÓØ"
 
-#: build/files.c:1657
+#: build/files.c:1662
 #, c-format
 msgid "failed to write all data to %s"
 msgstr "ÚÁÐÉÓØ ×ÓÅÈ ÄÁÎÎÙÈ × %s ÎÅ ÕÄÁÌÁÓØ"
 
-#: build/files.c:1747
+#: build/files.c:1752
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "ïÐÒÅÄÅÌÑÀ ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ...\n"
 
-#: build/files.c:1775 build/files.c:1784
+#: build/files.c:1780 build/files.c:1789
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "ïÛÉÂËÁ ÏÐÒÅÄÅÌÅÎÉÑ ÓÅÒ×ÉÓÏ×, ÐÒÅÄÏÓÔÁ×ÌÑÅÍÙÈ ÐÁËÅÔÏÍ"
 
-#: build/files.c:1891
+#: build/files.c:1896
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "ïÂÒÁÂÁÔÙ×ÁÀ ÆÁÊÌÙ: %s\n"
@@ -1707,7 +1707,7 @@ msgstr "
 msgid "line %d: Error parsing %%description: %s"
 msgstr "ÓÔÒÏËÁ %d: ïÛÉÂËÁ ÒÁÚÂÏÒÁ %%description: %s"
 
-#: build/parseDescription.c:51 build/parseFiles.c:45 build/parseScript.c:173
+#: build/parseDescription.c:51 build/parseFiles.c:46 build/parseScript.c:173
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "ÓÔÒÏËÁ %d: îÅ×ÅÒÎÁÑ ÏÐÃÉÑ %s: %s"
@@ -1717,7 +1717,7 @@ msgstr "
 msgid "line %d: Too many names: %s"
 msgstr "ÓÔÒÏËÁ %d: óÌÉÛËÏÍ ÍÎÏÇÏ ÉÍÅÎ: %s"
 
-#: build/parseDescription.c:74 build/parseFiles.c:68 build/parseScript.c:196
+#: build/parseDescription.c:74 build/parseFiles.c:67 build/parseScript.c:196
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "ÓÔÒÏËÁ %d: ðÁËÅÔ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ: %s"
@@ -1731,7 +1731,7 @@ msgstr "
 msgid "line %d: Error parsing %%files: %s"
 msgstr "ÓÔÒÏËÁ %d: ïÛÉÂËÁ ÒÁÚÂÏÒÁ %%files: %s"
 
-#: build/parseFiles.c:76
+#: build/parseFiles.c:74
 msgid "line %d: Second %%files list"
 msgstr "ÓÔÒÏËÁ %d: ÷ÔÏÒÏÊ ÓÐÉÓÏË %%files"
 

diff --git a/po/sk.po b/po/sk.po
index ab487d5..35c70f7 100644 (file)
--- 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-02-17 15:48-0500\n"
+"POT-Creation-Date: 2000-02-21 12:02-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"
@@ -1494,58 +1494,58 @@ msgstr "S
 msgid "File not found by glob: %s"
 msgstr "Súbor nebol nájdený: %s"
 
-#: build/files.c:1164
+#: build/files.c:1169
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s"
 
-#: build/files.c:1171 build/pack.c:99
+#: build/files.c:1176 build/pack.c:99
 #, c-format
 msgid "line: %s"
 msgstr "riadok: %s"
 
-#: build/files.c:1499
+#: build/files.c:1504
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "súbor %s: %s\n"
 
-#: build/files.c:1511 build/parsePrep.c:34
+#: build/files.c:1516 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr "Chybný vlastník/skupina: %s"
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1566
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Nie je mo¾né spusti» %s"
 
-#: build/files.c:1571
+#: build/files.c:1576
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Nie je mo¾né vytvori» proces %s"
 
-#: build/files.c:1653
+#: build/files.c:1658
 #, c-format
 msgid "%s failed"
 msgstr "%s zlyhalo"
 
-#: build/files.c:1657
+#: build/files.c:1662
 #, c-format
 msgid "failed to write all data to %s"
 msgstr "nepodarilo sa zapísa» v¹etky dáta do %s"
 
-#: build/files.c:1747
+#: build/files.c:1752
 #, fuzzy, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr "Zis»ujú sa po¾adované vlastnosti...\n"
 
-#: build/files.c:1775 build/files.c:1784
+#: build/files.c:1780 build/files.c:1789
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "Nepodarilo sa zisti» poskytované vlastnosti"
 
-#: build/files.c:1891
+#: build/files.c:1896
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "Spracovávajú sa súbory: %s\n"
@@ -1710,7 +1710,7 @@ msgstr "
 msgid "line %d: Error parsing %%description: %s"
 msgstr "riadok %d: Chyba pri analýze %%description: %s"
 
-#: build/parseDescription.c:51 build/parseFiles.c:45 build/parseScript.c:173
+#: build/parseDescription.c:51 build/parseFiles.c:46 build/parseScript.c:173
 #, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "riadok %d: Chybná voµba %s: %s"
@@ -1720,7 +1720,7 @@ msgstr "riadok %d: Chybn
 msgid "line %d: Too many names: %s"
 msgstr "riadok %d: Priveµa názvov: %s"
 
-#: build/parseDescription.c:74 build/parseFiles.c:68 build/parseScript.c:196
+#: build/parseDescription.c:74 build/parseFiles.c:67 build/parseScript.c:196
 #, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "riadok %d: Balík neexistuje: %s"
@@ -1734,7 +1734,7 @@ msgstr "riadok %d: Druh
 msgid "line %d: Error parsing %%files: %s"
 msgstr "riadok %d: Chyba pri analýze %%files: %s"
 
-#: build/parseFiles.c:76
+#: build/parseFiles.c:74
 msgid "line %d: Second %%files list"
 msgstr "riadok %d: Druhý %%files zoznam"
 

diff --git a/po/sl.po b/po/sl.po
index 64a55fc..449120e 100644 (file)
--- 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.2 2000/02/17 21:49:52 jbj Exp $
+# $Id: sl.po,v 1.3 2000/02/22 03:09:55 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 3.0.4\n"
-"POT-Creation-Date: 2000-02-17 16:41-0500\n"
+"POT-Creation-Date: 2000-02-21 12:02-0500\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"

diff --git a/po/sr.po b/po/sr.po
index f99daaf..0980ddd 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-02-17 15:48-0500\n"
+"POT-Creation-Date: 2000-02-21 12:02-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 "From: Erik Troan <ewt@lacrosse.redhat.com>\n"
@@ -1520,58 +1520,58 @@ msgstr ""
 msgid "File not found by glob: %s"
 msgstr "Datoteka nije pronaðena na serveru"
 
-#: build/files.c:1164
+#: build/files.c:1169
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/files.c:1171 build/pack.c:99
+#: build/files.c:1176 build/pack.c:99
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1504
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/files.c:1511 build/parsePrep.c:34
+#: build/files.c:1516 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1566
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "Ne mogu da izvr¹im PGP"
 
-#: build/files.c:1571
+#: build/files.c:1576
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Ne mogu da proèitam 'sigtarget'"
 
-#: build/files.c:1653
+#: build/files.c:1658
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "PGP omanuo"
 
-#: build/files.c:1657
+#: build/files.c:1662
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "neuspelo kreiranje %s\n"
 
-#: build/files.c:1747
+#: build/files.c:1752
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1775 build/files.c:1784
+#: build/files.c:1780 build/files.c:1789
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "neuspelo kreiranje %s\n"
 
-#: build/files.c:1891
+#: build/files.c:1896
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -1736,7 +1736,7 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:51 build/parseFiles.c:45 build/parseScript.c:173
+#: build/parseDescription.c:51 build/parseFiles.c:46 build/parseScript.c:173
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "neuspelo otvaranje %s: %s"
@@ -1746,7 +1746,7 @@ msgstr "neuspelo otvaranje %s: %s"
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:74 build/parseFiles.c:68 build/parseScript.c:196
+#: build/parseDescription.c:74 build/parseFiles.c:67 build/parseScript.c:196
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "paket %s nije naveden u %s"
@@ -1760,7 +1760,7 @@ msgstr ""
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:76
+#: build/parseFiles.c:74
 msgid "line %d: Second %%files list"
 msgstr ""
 

diff --git a/po/tr.po b/po/tr.po
index adf5f11..f3d5013 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-17 15:48-0500\n"
+"POT-Creation-Date: 2000-02-21 12:02-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"
@@ -1556,58 +1556,58 @@ msgstr ""
 msgid "File not found by glob: %s"
 msgstr "Dosya sunucuda bulunamadý"
 
-#: build/files.c:1164
+#: build/files.c:1169
 #, fuzzy
 msgid "Could not open %%files file %s: %s"
 msgstr "hata: %s dosyasý okunamadý\n"
 
-#: build/files.c:1171 build/pack.c:99
+#: build/files.c:1176 build/pack.c:99
 #, c-format
 msgid "line: %s"
 msgstr ""
 
-#: build/files.c:1499
+#: build/files.c:1504
 #, fuzzy, c-format
 msgid "Bad file: %s: %s"
 msgstr "%s açýlamadý: %s"
 
-#: build/files.c:1511 build/parsePrep.c:34
+#: build/files.c:1516 build/parsePrep.c:34
 #, c-format
 msgid "Bad owner/group: %s"
 msgstr ""
 
 #. XXX this error message is probably not seen.
-#: build/files.c:1566
+#: build/files.c:1571
 #, fuzzy, c-format
 msgid "Couldn't exec %s: %s"
 msgstr "PGP çalýþtýrýlamadý"
 
-#: build/files.c:1571
+#: build/files.c:1576
 #, fuzzy, c-format
 msgid "Couldn't fork %s: %s"
 msgstr "Ýmza hedefi 'sigtarget' okunamadý"
 
-#: build/files.c:1653
+#: build/files.c:1658
 #, fuzzy, c-format
 msgid "%s failed"
 msgstr "PGP hata verdi"
 
-#: build/files.c:1657
+#: build/files.c:1662
 #, fuzzy, c-format
 msgid "failed to write all data to %s"
 msgstr "%s yaratýlamýyor\n"
 
-#: build/files.c:1747
+#: build/files.c:1752
 #, c-format
 msgid "Finding  %s: (using %s)...\n"
 msgstr ""
 
-#: build/files.c:1775 build/files.c:1784
+#: build/files.c:1780 build/files.c:1789
 #, fuzzy, c-format
 msgid "Failed to find %s:"
 msgstr "%s yaratýlamýyor\n"
 
-#: build/files.c:1891
+#: build/files.c:1896
 #, fuzzy, c-format
 msgid "Processing files: %s-%s-%s\n"
 msgstr "%s açýlamadý: %s"
@@ -1773,7 +1773,7 @@ msgstr ""
 msgid "line %d: Error parsing %%description: %s"
 msgstr ""
 
-#: build/parseDescription.c:51 build/parseFiles.c:45 build/parseScript.c:173
+#: build/parseDescription.c:51 build/parseFiles.c:46 build/parseScript.c:173
 #, fuzzy, c-format
 msgid "line %d: Bad option %s: %s"
 msgstr "%s açýlamadý: %s"
@@ -1783,7 +1783,7 @@ msgstr "%s a
 msgid "line %d: Too many names: %s"
 msgstr ""
 
-#: build/parseDescription.c:74 build/parseFiles.c:68 build/parseScript.c:196
+#: build/parseDescription.c:74 build/parseFiles.c:67 build/parseScript.c:196
 #, fuzzy, c-format
 msgid "line %d: Package does not exist: %s"
 msgstr "%s paketi %s altýnda gözükmüyor"
@@ -1797,7 +1797,7 @@ msgstr ""
 msgid "line %d: Error parsing %%files: %s"
 msgstr ""
 
-#: build/parseFiles.c:76
+#: build/parseFiles.c:74
 msgid "line %d: Second %%files list"
 msgstr ""
 

diff --git a/rpmpopt b/rpmpopt.in
similarity index 95%
rename from rpmpopt
rename to rpmpopt.in
index 7ae4c80..43b20ef 100644 (file)
--- a/rpmpopt
+++ b/rpmpopt.in
@@ -72,3 +72,6 @@ rpm alias -F --freshen
 
 rpm alias --redhatprovides -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatprovides
 rpm alias --redhatrequires -q --define '_dbpath /usr/lib/rpmdb/%{_arch}-%{_vendor}-%{_os}/redhat' --whatrequires
+
+# Build policies enabled from command line. Last policy applies.
+rpm alias --buildpolicy --define '__spec_install_post @RPMCONFIGDIR@/brp-!#:+'

diff --git a/scripts/.cvsignore b/scripts/.cvsignore
index f3c7a7c..701ba10 100644 (file)
--- a/scripts/.cvsignore
+++ b/scripts/.cvsignore
@@ -1 +1,2 @@
 Makefile
+brp-redhat

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index e6f8555..408d15c 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -3,7 +3,7 @@
 AUTOMAKE_OPTIONS = 1.4 foreign
 
 EXTRA_DIST = \
-       brp-compress brp-strip brp-strip-comment-note \
+       brp-compress brp-redhat brp-strip brp-strip-comment-note \
        check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl \
        cpanflute find-provides.perl find-requires.perl \
        freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req \
@@ -16,9 +16,14 @@ all:
 
 configdir = ${prefix}/lib/rpm
 config_SCRIPTS = \
-       brp-compress brp-strip brp-strip-comment-note \
+       brp-compress brp-redhat brp-strip brp-strip-comment-note \
        check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl \
        cpanflute find-provides.perl find-requires.perl \
        freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req \
        perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \
        vpkg-provides.sh vpkg-provides2.sh
+
+brp-redhat: brp-redhat.in ../config.status
+       cd .. \
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+               $(SHELL) ./config.status

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index d07394c..0aa4a4a 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -153,20 +153,20 @@ varprefix = @varprefix@
 
 AUTOMAKE_OPTIONS = 1.4 foreign
 
-EXTRA_DIST =   brp-compress brp-strip brp-strip-comment-note   check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl     cpanflute find-provides.perl find-requires.perl         freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req  perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh         vpkg-provides.sh vpkg-provides2.sh
+EXTRA_DIST =   brp-compress brp-redhat brp-strip brp-strip-comment-note        check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl     cpanflute find-provides.perl find-requires.perl         freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req  perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh         vpkg-provides.sh vpkg-provides2.sh
 
 
 installprefix = $(DESTDIR)
 
 configdir = ${prefix}/lib/rpm
-config_SCRIPTS =       brp-compress brp-strip brp-strip-comment-note   check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl     cpanflute find-provides.perl find-requires.perl         freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req  perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh         vpkg-provides.sh vpkg-provides2.sh
+config_SCRIPTS =       brp-compress brp-redhat brp-strip brp-strip-comment-note        check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl     cpanflute find-provides.perl find-requires.perl         freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req  perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh         vpkg-provides.sh vpkg-provides2.sh
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
+CONFIG_CLEAN_FILES =  brp-redhat
 SCRIPTS =  $(config_SCRIPTS)
 
-DIST_COMMON =  Makefile.am Makefile.in
+DIST_COMMON =  Makefile.am Makefile.in brp-redhat.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -182,6 +182,8 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+brp-redhat: $(top_builddir)/config.status brp-redhat.in
+       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 install-configSCRIPTS: $(config_SCRIPTS)
        @$(NORMAL_INSTALL)
@@ -290,6 +292,11 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 all:
 
+brp-redhat: brp-redhat.in ../config.status
+       cd .. \
+         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+               $(SHELL) ./config.status
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/scripts/brp-redhat.in b/scripts/brp-redhat.in
new file mode 100755 (executable)
index 0000000..9e2e4dd
--- /dev/null
+++ b/scripts/brp-redhat.in
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# These are the build root policies that Red Hat invokes at the end
+# of the %install scriptlet.
+
+# Compress man pages (Red Hat uses GNU gzip)
+@RPMCONFIGDIR@/brp-compress
+
+# Strip ELF binaries (Red Hat uses GNU binutils).
+@RPMCONFIGDIR@/brp-strip
+
+# Strip even more sections (Red Hat uses GNU binutils).
+@RPMCONFIGDIR@/brp-strip-comment-note