diff options
-rw-r--r-- | CHANGES | 1 | ||||
-rw-r--r-- | build/files.c | 12 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | macros.in | 12 | ||||
-rw-r--r-- | po/cs.po | 20 | ||||
-rw-r--r-- | po/da.po | 20 | ||||
-rw-r--r-- | po/de.po | 20 | ||||
-rw-r--r-- | po/en_RN.po | 20 | ||||
-rw-r--r-- | po/es.po | 20 | ||||
-rw-r--r-- | po/eu_ES.po | 20 | ||||
-rw-r--r-- | po/fi.po | 20 | ||||
-rw-r--r-- | po/fr.po | 20 | ||||
-rw-r--r-- | po/gl.po | 20 | ||||
-rw-r--r-- | po/hu.po | 20 | ||||
-rw-r--r-- | po/id.po | 20 | ||||
-rw-r--r-- | po/is.po | 20 | ||||
-rw-r--r-- | po/it.po | 20 | ||||
-rw-r--r-- | po/ja.po | 20 | ||||
-rw-r--r-- | po/ko.po | 20 | ||||
-rw-r--r-- | po/no.po | 20 | ||||
-rw-r--r-- | po/pl.po | 20 | ||||
-rw-r--r-- | po/pt.po | 20 | ||||
-rw-r--r-- | po/pt_BR.po | 20 | ||||
-rw-r--r-- | po/ro.po | 20 | ||||
-rw-r--r-- | po/rpm.pot | 20 | ||||
-rw-r--r-- | po/ru.po | 20 | ||||
-rw-r--r-- | po/sk.po | 20 | ||||
-rw-r--r-- | po/sl.po | 22 | ||||
-rw-r--r-- | po/sr.po | 20 | ||||
-rw-r--r-- | po/sv.po | 20 | ||||
-rw-r--r-- | po/tr.po | 20 | ||||
-rw-r--r-- | po/uk.po | 20 | ||||
-rw-r--r-- | po/wa.po | 20 | ||||
-rw-r--r-- | po/zh.po | 20 | ||||
-rw-r--r-- | po/zh_CN.GB2312.po | 20 | ||||
-rw-r--r-- | rpm.spec.in | 1 | ||||
-rw-r--r-- | scripts/.cvsignore | 3 | ||||
-rw-r--r-- | scripts/Makefile.am | 8 | ||||
-rw-r--r-- | scripts/find-php-provides | 21 | ||||
-rw-r--r-- | scripts/find-php-requires | 31 | ||||
-rwxr-xr-x | scripts/find-provides.php | 19 | ||||
-rwxr-xr-x | scripts/find-requires.php | 46 | ||||
-rw-r--r-- | scripts/macros.php.in | 9 | ||||
-rwxr-xr-x | scripts/tgpg | 35 |
44 files changed, 506 insertions, 318 deletions
@@ -197,6 +197,7 @@ - prevent stale locks in __db files by closing databases on signals. - make --querytags a common option, fix errant regex (#70135). - db3: increase mpool and cachesize, compile w/o --enable-debug. + - configurable (default off) build failure if missing %%doc files (PLD). 4.0.3 -> 4.0.4: - solaris: translate i86pc to i386 (#57182). diff --git a/build/files.c b/build/files.c index b51152b85..40bc41765 100644 --- a/build/files.c +++ b/build/files.c @@ -1995,7 +1995,17 @@ static int processPackageFiles(Spec spec, Package pkg, /* Now process special doc, if there is one */ if (specialDoc) { if (installSpecialDoc) { - (void) doScript(spec, RPMBUILD_STRINGBUF, "%doc", pkg->specialDoc, test); + static int _missing_doc_files_terminate_build = 0; + static int oneshot = 0; + int rc; + if (!oneshot) { + _missing_doc_files_terminate_build = + rpmExpandNumeric("%{?_missing_doc_files_terminate_build}"); + oneshot = 1; + } + rc = doScript(spec, RPMBUILD_STRINGBUF, "%doc", pkg->specialDoc, test); + if (rc && _missing_doc_files_terminate_build) + fl.processingFailed = rc; } /* Reset for %doc */ diff --git a/configure.ac b/configure.ac index 47125058d..9b3fa14cb 100644 --- a/configure.ac +++ b/configure.ac @@ -1187,7 +1187,9 @@ AC_CONFIG_SUBDIRS(popt beecrypt zlib libelf db3) AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile - scripts/Makefile scripts/brp-redhat tools/Makefile + scripts/Makefile scripts/brp-redhat + scripts/macros.perl scripts/macros.php scripts/macros.python + tools/Makefile tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile misc/Makefile intl/Makefile po/Makefile.in doc/Makefile @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: /usr/lib/rpm/macros # \verbatim # -# $Id: macros.in,v 1.113 2002/07/31 13:11:26 jbj Exp $ +# $Id: macros.in,v 1.114 2002/07/31 15:13:46 jbj Exp $ # # This is a global RPM configuration file. All changes made here will # be lost when the rpm package is upgraded. Any per-system configuration @@ -281,7 +281,9 @@ #%vendor #============================================================================== -# ---- Package version macro. +# ---- Build configuration macros. +# +# Package version macro. # The type of package to produce, for compatibility with legacy # versions of rpm. # @@ -293,6 +295,12 @@ # %_package_version 30005 +# +# Should missing %doc files terminate a build? +# +# Note: The default value is 0 for legacy compatibility. +%_missing_doc_files_terminate_build 0 + #============================================================================== # ---- Database configuration macros. # Macros used to configure Berkley db parameters. @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n" "Language-Team: Czech <cs@li.org>\n" @@ -525,7 +525,7 @@ msgstr "Soubor nesouhlasí s prefixem (%s): %s\n" msgid "File not found: %s\n" msgstr "Soubor nenalezen: %s\n" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "©patný vlastník/skupina: %s\n" @@ -560,43 +560,43 @@ msgstr "Nemohu otevøít %%files soubor %s: %s\n" msgid "line: %s\n" msgstr "øádek: %s\n" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "©patný soubor: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Nemohu spustit %s: %s\n" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Nemohu provést fork %s: %s\n" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "%s selhalo\n" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "Nemohu zapsat v¹echna data do %s\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "Hledám %s: (pou¾it %s)...\n" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "Selhalo vyhledání %s:\n" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Zpracovávám soubory: %s-%s-%s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -520,7 +520,7 @@ msgstr "Fil passer ikke til præfiks (%s): %s\n" msgid "File not found: %s\n" msgstr "Fil ikke fundet: %s\n" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Ugyldig ejer/gruppe: %s\n" @@ -555,43 +555,43 @@ msgstr "Kunne ikke åbne '%%files'-fil %s: %s\n" msgid "line: %s\n" msgstr "linie: %s\n" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ugyldig fil: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Kunne ikke udføre %s: %s\n" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Kunne ikke fraspalte ny proces til %s: %s\n" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "%s mislykkedes\n" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "kunne ikke skrive alle data til %s\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "Finder %s: (benytter %s)...\n" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "Kunne ikke finde %s:\n" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Gennemløber filer: %s-%s-%s\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -594,7 +594,7 @@ msgstr "Lesen von %s fehlgeschlagen: %s." msgid "File not found: %s\n" msgstr "Datei auf dem Server nicht gefunden" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -632,46 +632,46 @@ msgid "line: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" # , c-format -#: build/files.c:2236 +#: build/files.c:2246 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Konnte pgp nicht durchführen" -#: build/files.c:2316 +#: build/files.c:2326 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Konnte Signatur-Ziel (»sigtarget«) nicht lesen" -#: build/files.c:2400 +#: build/files.c:2410 #, fuzzy, c-format msgid "%s failed\n" msgstr "pgp fehlgeschlagen" # , c-format -#: build/files.c:2404 +#: build/files.c:2414 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "anlegen von %s fehlgeschlagen\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" # , c-format -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "anlegen von %s fehlgeschlagen\n" # , c-format -#: build/files.c:2728 +#: build/files.c:2738 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Öffnen von %s fehlgeschlagen: %s" diff --git a/po/en_RN.po b/po/en_RN.po index 9c3f9a6fb..781492516 100644 --- a/po/en_RN.po +++ b/po/en_RN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -510,7 +510,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -545,43 +545,43 @@ msgstr "" msgid "line: %s\n" msgstr "" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -510,7 +510,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -545,43 +545,43 @@ msgstr "" msgid "line: %s\n" msgstr "" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" diff --git a/po/eu_ES.po b/po/eu_ES.po index 9c3f9a6fb..781492516 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -510,7 +510,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -545,43 +545,43 @@ msgstr "" msgid "line: %s\n" msgstr "" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\n" "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n" "Language-Team: Finnish <linux@sot.com>\n" "Content-Type: text/plain; charset=\n" @@ -533,7 +533,7 @@ msgstr "En voi lukea %s: %s." msgid "File not found: %s\n" msgstr "Tiedostoa ei löytynyt palvelimelta" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -568,43 +568,43 @@ msgstr "virhe: tiedostoa %s ei voi avata\n" msgid "line: %s\n" msgstr "en voinut avata %s: %s" -#: build/files.c:2236 +#: build/files.c:2246 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "en voinut avata %s: %s" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "En voinut ajaa pgp:tä" -#: build/files.c:2316 +#: build/files.c:2326 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "En voinut ajaa pgp:tä" -#: build/files.c:2400 +#: build/files.c:2410 #, fuzzy, c-format msgid "%s failed\n" msgstr "pgp epäonnistui" -#: build/files.c:2404 +#: build/files.c:2414 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "%s:n luonti epäonnistui\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "%s:n luonti epäonnistui\n" -#: build/files.c:2728 +#: build/files.c:2738 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "en voinut avata %s: %s" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -557,7 +557,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "aucun package n'a t spcifi pour la dsinstallation" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -592,43 +592,43 @@ msgstr "impossible d'ouvrir: %s\n" msgid "line: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2236 +#: build/files.c:2246 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "impossible d'ouvrir: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2316 +#: build/files.c:2326 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2400 +#: build/files.c:2410 #, fuzzy, c-format msgid "%s failed\n" msgstr "La construction a chou.\n" -#: build/files.c:2404 +#: build/files.c:2414 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "impossible d'ouvrir: %s\n" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" @@ -505,7 +505,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -540,43 +540,43 @@ msgstr "" msgid "line: %s\n" msgstr "" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -510,7 +510,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -545,43 +545,43 @@ msgstr "" msgid "line: %s\n" msgstr "" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -510,7 +510,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -545,43 +545,43 @@ msgstr "" msgid "line: %s\n" msgstr "" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen <ra@hp.is>\n" "Language-Team: is <kde-isl@mmedia.is>\n" @@ -508,7 +508,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "Skráin fannst ekki: %s\n" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -543,43 +543,43 @@ msgstr "Gat ekki opnað %%files skrána %s: %s\n" msgid "line: %s\n" msgstr "lína: %s\n" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ógild skrá %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Gat ekki keyrt %s: %s\n" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Gat ekki búið til undirferli (fork) %s: %s\n" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "%s brást\n" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "gat ekki ritað öll gögn í %s\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "gat ekki fundið %s:\n" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -510,7 +510,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -545,43 +545,43 @@ msgstr "" msgid "line: %s\n" msgstr "" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -550,7 +550,7 @@ msgstr "¥Õ¥¡¥¤¥ë¤Ï prefix (%s) ¤È°ìÃפ·¤Þ¤»¤ó: %s" msgid "File not found: %s\n" msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "ÉÔÀµ¤Ê½êͼÔ/¥°¥ë¡¼¥×: %s\n" @@ -585,43 +585,43 @@ msgstr "%%files ¤ò¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó: %s" msgid "line: %s\n" msgstr "¹ÔÌÜ: %s" -#: build/files.c:2236 +#: build/files.c:2246 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "¥Õ¥¡¥¤¥ë %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "%s ¤ò¼Â¹Ô¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/files.c:2316 +#: build/files.c:2326 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "%s ¤ò fork ¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿: %s" -#: build/files.c:2400 +#: build/files.c:2410 #, fuzzy, c-format msgid "%s failed\n" msgstr "%s ¼ºÇÔ" -#: build/files.c:2404 +#: build/files.c:2414 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "Á´¤Æ¤Î¥Ç¡¼¥¿¤ò %s ¤Ë½ñ¤¯¤³¤È¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: build/files.c:2562 +#: build/files.c:2572 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "%s ¤òõ¤·¤Æ¤¤¤Þ¤¹: (%s ¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹)...\n" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "%s ¤ò¸«¤Ä¤±¤ë¤Î¤Ë¼ºÇÔ¤·¤Þ¤·¤¿:" -#: build/files.c:2728 +#: build/files.c:2738 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "¥Õ¥¡¥¤¥ë¤Î½èÍýÃæ: %s-%s-%s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\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" @@ -519,7 +519,7 @@ msgstr "ÆÄÀÏÀÌ prefix (%s)¿Í ÀÏÄ¡ÇÏÁö ¾ÊÀ½: %s\n" msgid "File not found: %s\n" msgstr "ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "À߸øµÈ ¼ÒÀ¯ÀÚ/±×·ì: %s\n" @@ -554,43 +554,43 @@ msgstr "%s ÆÄÀÏÀÇ %%files¸¦ ¿ ¼ö ¾øÀ½: %s\n" msgid "line: %s\n" msgstr "Çà: %s\n" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "À߸øµÈ ÆÄÀÏ: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "%s(À»)¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½: %s\n" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "%s(À»)¸¦ fork ÇÒ ¼ö ¾øÀ½: %s\n" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "%s(ÀÌ)°¡ ½ÇÆÐÇß½À´Ï´Ù\n" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "%s¿¡ ¸ðµç ÀڷḦ ±â·ÏÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "%s(À»)¸¦ ã´Â Áß: (%s »ç¿ë)...\n" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "%s(À»)¸¦ ã´Âµ¥ ½ÇÆÐÇÔ:\n" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "ÆÄÀÏ Ã³¸® Áß: %s-%s-%s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian <no@li.org>\n" @@ -519,7 +519,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "Fil ikke funnet: %s\n" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Ugyldig eier/gruppe: %s\n" @@ -554,43 +554,43 @@ msgstr "Kunne ikke åpne spec fil %s: %s\n" msgid "line: %s\n" msgstr "Installerer %s\n" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ugyldig fil %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Kunne ikke kjøre %s: %s\n" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "klarte ikke å åpne %s: %s\n" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "%s feilet\n" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "kunne ikke skrive alle data til %s\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "Klarte ikke å finne %s:\n" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -541,7 +541,7 @@ msgstr "Plik nie zgadza siê z prefiksem (%s): %s" msgid "File not found: %s\n" msgstr "Nie znaleziono pliku: %s" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "B³êdny u¿ytkownik/grupa: %s\n" @@ -576,43 +576,43 @@ msgstr "Nie mo¿na otworzyæ %%files pliku: %s" msgid "line: %s\n" msgstr "linia: %s" -#: build/files.c:2236 +#: build/files.c:2246 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "plik %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Nie mo¿na uruchomiæ %s" -#: build/files.c:2316 +#: build/files.c:2326 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Nie mo¿na wykonaæ fork na %s" -#: build/files.c:2400 +#: build/files.c:2410 #, fuzzy, c-format msgid "%s failed\n" msgstr "%s nie powiod³o siê" -#: build/files.c:2404 +#: build/files.c:2414 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "zapisanie wszystkich danych do %s nie powiod³o siê" -#: build/files.c:2562 +#: build/files.c:2572 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "Wyszukiwanie wymaganych zasobów...\n" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Wyszukiwanie nie powiod³o siê" -#: build/files.c:2728 +#: build/files.c:2738 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Przetwarzanie plików: %s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\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" @@ -527,7 +527,7 @@ msgstr "O ficheiro não corresponde ao prefixo (%s): %s\n" msgid "File not found: %s\n" msgstr "Ficheiro não encontrado: %s\n" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Dono/grupo inválido: %s\n" @@ -562,43 +562,43 @@ msgstr "Não consegui abrir o ficheiro do %%files %s: %s\n" msgid "line: %s\n" msgstr "linha: %s\n" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "Ficheiro inválido: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Não consegui executar o %s: %s\n" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Não consegui executar à parte o %s: %s\n" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "O %s falhou\n" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "não consegui escrever todos os dados em %s\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "A procurar o %s: (usando o %s)...\n" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "Não consegui encontrar o %s:\n" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "A processar os ficheiros: %s-%s-%s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index a03f015bc..c8d6e5959 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\n" #: build.c:40 #, fuzzy @@ -573,7 +573,7 @@ msgstr "No consegui ler o arquivo spec de %s\n" msgid "File not found: %s\n" msgstr "no foi passado pacote para desinstalao" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -613,47 +613,47 @@ msgid "line: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:2236 +#: build/files.c:2246 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" # , c-format -#: build/files.c:2316 +#: build/files.c:2326 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "No consegui ler o arquivo spec de %s\n" -#: build/files.c:2400 +#: build/files.c:2410 #, fuzzy, c-format msgid "%s failed\n" msgstr "Construo falhou.\n" # , c-format -#: build/files.c:2404 +#: build/files.c:2414 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "No consegui abrir o pipe tar: %s\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" # , c-format -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "No consegui abrir o pipe tar: %s\n" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\n" "PO-Revision-Date: 1999-04-10 12:00+EST\n" "Last-Translator: Cristian Gafton <gafton@redhat.com>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -505,7 +505,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -540,43 +540,43 @@ msgstr "" msgid "line: %s\n" msgstr "" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" diff --git a/po/rpm.pot b/po/rpm.pot index 0f1287774..50026b33e 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -511,7 +511,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -546,43 +546,43 @@ msgstr "" msgid "line: %s\n" msgstr "" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\n" "PO-Revision-Date: 2002-04-09 16:44-0400\n" "Last-Translator: Eugene Kanter, <eugene@bcl.bz>\n" "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n" @@ -531,7 +531,7 @@ msgstr "æÁÊÌ ÎÅ ÓÏÏÔ×ÅÔÓÔÕÅÔ ÐÒÅÆÉËÓÕ (%s): %s\n" msgid "File not found: %s\n" msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "îÅ×ÅÒÎÁÑ ÐÁÒÁ ×ÌÁÄÅÌÅÃ/ÇÒÕÐÐÁ: %s\n" @@ -566,43 +566,43 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %%files %s: %s\n" msgid "line: %s\n" msgstr "ÓÔÒÏËÁ: %s\n" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "îÅ×ÅÒÎÙÊ ÆÁÊÌ %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ %s: %s\n" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "óÂÏÊ ×ÅÔ×ÌÅÎÉÑ %s: %s\n" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "%s ÎÅ ÕÄÁÌÏÓØ\n" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "ÚÁÐÉÓØ ×ÓÅÈ ÄÁÎÎÙÈ × %s ÎÅ ÕÄÁÌÁÓØ\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "ðÏÉÓË %s (ÉÓÐÏÌØÚÕÑ %s): ...\n" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ %s:\n" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "ïÂÒÁÂÁÔÙ×ÁÀÔÓÑ ÆÁÊÌÙ: %s-%s-%s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -538,7 +538,7 @@ msgstr "Súbor nesúhlasí s prefixom (%s): %s." msgid "File not found: %s\n" msgstr "Súbor nebol nájdený: %s" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Chybný vlastník/skupina: %s\n" @@ -573,43 +573,43 @@ msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s" msgid "line: %s\n" msgstr "riadok: %s" -#: build/files.c:2236 +#: build/files.c:2246 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "súbor %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Nie je mo¾né spusti» %s" -#: build/files.c:2316 +#: build/files.c:2326 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Nie je mo¾né vytvori» proces %s" -#: build/files.c:2400 +#: build/files.c:2410 #, fuzzy, c-format msgid "%s failed\n" msgstr "%s zlyhalo" -#: build/files.c:2404 +#: build/files.c:2414 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "nepodarilo sa zapísa» v¹etky dáta do %s" -#: build/files.c:2562 +#: build/files.c:2572 #, fuzzy, c-format msgid "Finding %s: (using %s)...\n" msgstr "Zis»ujú sa po¾adované vlastnosti...\n" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Nepodarilo sa zisti» poskytované vlastnosti" -#: build/files.c:2728 +#: build/files.c:2738 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Spracovávajú sa súbory: %s\n" @@ -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.293 2002/07/31 13:12:22 jbj Exp $ +# $Id: sl.po,v 1.294 2002/07/31 15:14:47 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -537,7 +537,7 @@ msgstr "Datoteka se ne ujema s predpono (%s): %s" msgid "File not found: %s\n" msgstr "Datoteke ni mogoèe najti: %s" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Neobstojeè lastnik/skupina: %s\n" @@ -572,43 +572,43 @@ msgstr "Datoteke %s iz %%files ni mo¾no odpreti: %s" msgid "line: %s\n" msgstr "vrstica: %s" -#: build/files.c:2236 +#: build/files.c:2246 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "Po¹kodovana datoteka: %s: %s" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Ni mo¾no izvesti %s: %s" -#: build/files.c:2316 +#: build/files.c:2326 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Vejitev %s ni mo¾na: %s" -#: build/files.c:2400 +#: build/files.c:2410 #, fuzzy, c-format msgid "%s failed\n" msgstr "%s neuspe¹en" -#: build/files.c:2404 +#: build/files.c:2414 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "pisanje podatkov v %s je bilo neuspe¹no" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "Iskanje %s: (z uporabo %s)...\n" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "Neuspe¹no iskanje %s:" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Obdeloavnje datotek: %s-%s-%s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\n" "Content-Type: text/plain; charset=\n" "Date: 1998-05-02 21:41:47-0400\n" @@ -526,7 +526,7 @@ msgstr "Neuspelo èitanje %s: %s." msgid "File not found: %s\n" msgstr "Datoteka nije pronaðena na serveru" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -561,43 +561,43 @@ msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n" msgid "line: %s\n" msgstr "neuspelo otvaranje %s: %s" -#: build/files.c:2236 +#: build/files.c:2246 #, fuzzy, c-format msgid "Bad file: %s: %s\n" msgstr "neuspelo otvaranje %s: %s" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, fuzzy, c-format msgid "Couldn't exec %s: %s\n" msgstr "Ne mogu da izvr¹im PGP" -#: build/files.c:2316 +#: build/files.c:2326 #, fuzzy, c-format msgid "Couldn't fork %s: %s\n" msgstr "Ne mogu da proèitam 'sigtarget'" -#: build/files.c:2400 +#: build/files.c:2410 #, fuzzy, c-format msgid "%s failed\n" msgstr "PGP omanuo" -#: build/files.c:2404 +#: build/files.c:2414 #, fuzzy, c-format msgid "failed to write all data to %s\n" msgstr "neuspelo kreiranje %s\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, fuzzy, c-format msgid "Failed to find %s:\n" msgstr "neuspelo kreiranje %s\n" -#: build/files.c:2728 +#: build/files.c:2738 #, fuzzy, c-format msgid "Processing files: %s-%s-%s\n" msgstr "neuspelo otvaranje %s: %s" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.1\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\n" "PO-Revision-Date: 2002-07-11 22:49+0200\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -520,7 +520,7 @@ msgstr "Filen matchar inte prefixet (%s): %s\n" msgid "File not found: %s\n" msgstr "Filen hittades inte: %s\n" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Felaktig ägare/grupp: %s\n" @@ -555,43 +555,43 @@ msgstr "Kunde inte öppna %%files-fil %s: %s\n" msgid "line: %s\n" msgstr "rad: %s\n" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "Felaktig fil: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "Kunde inte köra %s: %s\n" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "Kunde inte grena %s: %s\n" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "%s misslyckades\n" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "kunde inte skriva all data till %s\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "Letar upp %s: (använder %s)...\n" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "Misslyckades med att hitta %s:\n" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Bearbetar filer: %s-%s-%s\n" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-0400\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -530,7 +530,7 @@ msgstr "Dosya önek (%s) ile uyumsuz: %s\n" msgid "File not found: %s\n" msgstr "Dosya bulunamadý: %s\n" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "Kullanýcý/grup hatalý: %s\n" @@ -565,43 +565,43 @@ msgstr "%%files dosya %s dosyasýnda açýlamadý: %s\n" msgid "line: %s\n" msgstr "satýr: %s\n" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "Dosya hatalý: %s: %s\n" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "%s icra edilemedi: %s\n" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "%s ayrýlamadý: %s\n" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "%s baþarýsýz\n" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "tüm veri %s içine yazýlamadý\n" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "%s aranýyor: (%s kullanarak)...\n" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "%s bulunamadý:\n" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "Ýþlenen dosyalar: %s-%s-%s\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -510,7 +510,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -545,43 +545,43 @@ msgstr "" msgid "line: %s\n" msgstr "" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -510,7 +510,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -545,43 +545,43 @@ msgstr "" msgid "line: %s\n" msgstr "" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -510,7 +510,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -545,43 +545,43 @@ msgstr "" msgid "line: %s\n" msgstr "" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po index 9c3f9a6fb..781492516 100644 --- a/po/zh_CN.GB2312.po +++ b/po/zh_CN.GB2312.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-07-31 09:09-0400\n" +"POT-Creation-Date: 2002-07-31 10:12-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" @@ -510,7 +510,7 @@ msgstr "" msgid "File not found: %s\n" msgstr "" -#: build/files.c:1624 build/files.c:2248 build/parsePrep.c:50 +#: build/files.c:1624 build/files.c:2258 build/parsePrep.c:50 #, c-format msgid "Bad owner/group: %s\n" msgstr "" @@ -545,43 +545,43 @@ msgstr "" msgid "line: %s\n" msgstr "" -#: build/files.c:2236 +#: build/files.c:2246 #, c-format msgid "Bad file: %s: %s\n" msgstr "" #. XXX this error message is probably not seen. -#: build/files.c:2311 +#: build/files.c:2321 #, c-format msgid "Couldn't exec %s: %s\n" msgstr "" -#: build/files.c:2316 +#: build/files.c:2326 #, c-format msgid "Couldn't fork %s: %s\n" msgstr "" -#: build/files.c:2400 +#: build/files.c:2410 #, c-format msgid "%s failed\n" msgstr "" -#: build/files.c:2404 +#: build/files.c:2414 #, c-format msgid "failed to write all data to %s\n" msgstr "" -#: build/files.c:2562 +#: build/files.c:2572 #, c-format msgid "Finding %s: (using %s)...\n" msgstr "" -#: build/files.c:2591 build/files.c:2605 +#: build/files.c:2601 build/files.c:2615 #, c-format msgid "Failed to find %s:\n" msgstr "" -#: build/files.c:2728 +#: build/files.c:2738 #, c-format msgid "Processing files: %s-%s-%s\n" msgstr "" diff --git a/rpm.spec.in b/rpm.spec.in index e28896974..8cf5f00ea 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -518,6 +518,7 @@ fi * Wed Jul 31 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.60 - make --querytags a common option, fix errant regex (#70135). - db3: increase mpool and cachesize, compile w/o --enable-debug. +- configurable (default off) build failure if missing %%doc files (PLD). * Tue Jul 30 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.59 - prevent stale locks in __db files by closing databases on signals. diff --git a/scripts/.cvsignore b/scripts/.cvsignore index 586a6bc13..97057e172 100644 --- a/scripts/.cvsignore +++ b/scripts/.cvsignore @@ -1,3 +1,6 @@ Makefile Makefile.in brp-redhat +macros.perl +macros.php +macros.python diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 7ab18694f..e52b7747f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -11,8 +11,10 @@ EXTRA_DIST = \ find-requires.perl get_magic.pl getpo.sh http.req \ magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi \ rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \ - sql.prov sql.req tcl.req trpm u_pkg.sh \ - vpkg-provides.sh vpkg-provides2.sh + sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \ + vpkg-provides.sh vpkg-provides2.sh \ + macros.perl* macros.python* \ + macros.php* find-*.php find-php-* installprefix = $(DESTDIR) @@ -28,5 +30,5 @@ config_SCRIPTS = \ find-requires.perl get_magic.pl getpo.sh http.req \ magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi \ rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \ - sql.prov sql.req tcl.req trpm u_pkg.sh \ + sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \ vpkg-provides.sh vpkg-provides2.sh diff --git a/scripts/find-php-provides b/scripts/find-php-provides new file mode 100644 index 000000000..369a67462 --- /dev/null +++ b/scripts/find-php-provides @@ -0,0 +1,21 @@ +#!/bin/sh +ulimit -c 0 +cd `rpm --eval %{_builddir}` + +filelist=`sed "s/['\"]/\\\&/g"` +if [ -f __rpm_noautoprovfiles ] ; then + for i in `cat __rpm_noautoprovfiles`; do + filelist=`echo $filelist | sed "s![[:space:]]*$i[[:space:]]*!!g"` + done +fi + + +echo $filelist|/usr/lib/rpm/find-provides +provides_php=`echo $filelist | xargs /usr/lib/rpm/php.prov` +if [ -f __rpm_noautoprov ] ; then + for i in `cat __rpm_noautoprov`; do + provides_php=`echo $provides_php | sed "s!\<$i[[:space:]]*!!g"` + done +fi + +echo "$provides_php" diff --git a/scripts/find-php-requires b/scripts/find-php-requires new file mode 100644 index 000000000..20c750252 --- /dev/null +++ b/scripts/find-php-requires @@ -0,0 +1,31 @@ +#!/bin/sh +ulimit -c 0 +cd `rpm --eval %{_builddir}` + +filelist=`sed "s/['\"]/\\\&/g"` +if [ -f __rpm_noautoreqfiles ] ; then + for i in `cat __rpm_noautoreqfiles`; do + filelist=`echo $filelist | sed "s![[:space:]]*$i[[:space:]]*!!g"` + done +fi + +requires="`echo $filelist | /usr/lib/rpm/find-requires`" +requires_php="`echo $filelist | xargs /usr/lib/rpm/php.req`" + +if [ -f __rpm_noautoreq ] ; then + for i in `cat __rpm_noautoreq`; do + requires_php=`echo $requires_php | sed "s!\<$i[[:space:]]*!!g"` + done +fi + +requires_php_t="$requires_php" +if [ -f __rpm_noautoreqdep ] ; then + for i in `cat __rpm_noautoreqdep`; do + requires_php_t=`echo $requires_php_t | sed "s!\<$i[[:space:]]*!!g"` + done +fi + +requires_mod="`LC_ALL=C rpm -q --whatprovides --qf "%{NAME}\n" $requires_php_t 2>/dev/null`" +echo "$requires +$requires_php +$requires_mod"| grep -v "no package provides" | sort -u diff --git a/scripts/find-provides.php b/scripts/find-provides.php new file mode 100755 index 000000000..11178bf37 --- /dev/null +++ b/scripts/find-provides.php @@ -0,0 +1,19 @@ +#!/bin/sh +if [ $# -lt 1 ]; then + echo "You have to specify input file" + exit 1 +fi + +filelist=`echo $@` +for i in $filelist; do + i=`echo $i | grep "\.php$"` + if [ -n "$i" ]; then + j=`cat $i |egrep -i "^Class" |cut -f 2 -d " "| tr -d "\r"` + if [ -n "$j" ]; then + for p in $j; do + echo "pear($p)" + done + j="" + fi + fi +done diff --git a/scripts/find-requires.php b/scripts/find-requires.php new file mode 100755 index 000000000..203aefbc8 --- /dev/null +++ b/scripts/find-requires.php @@ -0,0 +1,46 @@ +#!/bin/sh +##################################################################### +# # +# Check system dependences between php-pear modules # +# # +# Pawe³ Go³aszewski <blues@ds.pg.gda.pl> # +# ------------------------------------------------------------------# +# TODO: # +# - extension_loaded - dependencies. # +# - some clean-up... # +##################################################################### +if [ $# -lt 1 ]; then + echo "You have to specify input file" + exit 1 +fi + +for files in `echo $@`; do + files=`echo $files | grep "\.php$"` + if [ -n "$files" ]; then + # Requires trough new call: + j=`cat $files | grep -i new | egrep "(=|return)" | egrep -v "^[[:space:]*]*(\/\/|#|\*|/\*)" | tr -d "\r" | egrep "[;|(|)|{|}|,][[:space:]*]*$" | awk -F "new " '{ print $2 }' | sed "s/[(|;|.]/ /g" | cut -f 1 -d " " | sed "s/^$.*//"` + if [ -n "$j" ]; then + for feature in $j; do + echo "pear($feature)" + done + j="" + fi + # requires trough class extension + k=`cat $files | egrep -i "(^Class.*extends)" | awk -F " extends " '{ print $2 }' | sed "s/{.*/ /" | cut -f 1 -d " " | tr -d "\r"` + if [ -n "$k" ]; then + for feature in $k; do + echo "pear($feature)" + done + k="" + fi + # requires trough class:: call + l=`cat $files | grep "::" | egrep -v "^[[:space:]*]*(\/\/|#|\*|/\*)" | sed "s/[(|'|!|\"|&|@|;]/ /g" | awk -F "::" '{ print $1 }' | sed "s/.*\ \([:alphanum:]*\)/\1/" | sed "s/^$.*//" | sed "s/[.]//g" | tr -d "\r"` + if [ -n "$l" ]; then + for feature in $l; do + echo "pear($feature)" + done + l="" + fi + fi +done + diff --git a/scripts/macros.php.in b/scripts/macros.php.in new file mode 100644 index 000000000..c0da6db10 --- /dev/null +++ b/scripts/macros.php.in @@ -0,0 +1,9 @@ +# Perl specific macro definitions. +# To make use of these macros insert the following line into your spec file: +# %include @RPMCONFIGDIR@/macros.php + +%define __find_requires @RPMCONFIGDIR@/find-php-requires +%define __find_provides @RPMCONFIGDIR@/find-php-provides + +%define php_pear_dir %{_datadir}/pear + diff --git a/scripts/tgpg b/scripts/tgpg new file mode 100755 index 000000000..4ab738265 --- /dev/null +++ b/scripts/tgpg @@ -0,0 +1,35 @@ +#!/bin/sh + +for pkg in $* +do + if [ "$pkg" = "" -o ! -e "$pkg" ]; then + echo "no package supplied" 1>&2 + exit 1 + fi + + plaintext=`mktemp $0-$$.XXXXXX` + detached=`mktemp $0-$$.XXXXXX` + +# --- Extract detached signature + rpm -qp -vv --qf '%{siggpg:armor}' $pkg > $detached + +# --- Figger the offset of header+payload in the package + leadsize=96 + o=`expr $leadsize + 8` + + set `od -j $o -N 8 -t u1 $pkg` + il=`expr 256 \* \( 256 \* \( 256 \* $2 + $3 \) + $4 \) + $5` + dl=`expr 256 \* \( 256 \* \( 256 \* $6 + $7 \) + $8 \) + $9` + + sigsize=`expr 8 + 16 \* $il + $dl` + o=`expr $o + $sigsize + \( 8 - \( $sigsize \% 8 \) \) \% 8` + +# --- Extract header+payload + dd if=$pkg ibs=$o skip=1 2>/dev/null > $plaintext + +# --- Verify DSA signature using gpg + gpg --batch -vv --debug 0xfc02 --verify $detached $plaintext + +# --- Clean up + rm -f $detached $plaintext +done |