diff options
author | jbj <devnull@localhost> | 1999-04-21 15:32:23 +0000 |
---|---|---|
committer | jbj <devnull@localhost> | 1999-04-21 15:32:23 +0000 |
commit | 65cc651fc4d85a5c4ebc0469f0757d7f083db3cc (patch) | |
tree | ec5cbd2891b4c83397dbc435bd21bd6a6e901b49 | |
parent | a0d3acc8a3e386940e153dcd7ddf1b110820dd96 (diff) | |
download | rpm-65cc651fc4d85a5c4ebc0469f0757d7f083db3cc.tar.gz rpm-65cc651fc4d85a5c4ebc0469f0757d7f083db3cc.tar.bz2 rpm-65cc651fc4d85a5c4ebc0469f0757d7f083db3cc.zip |
fix: noarch header gets initialized differently.
CVS patchset: 3025
CVS date: 1999/04/21 15:32:23
-rw-r--r-- | CHANGES | 1 | ||||
-rw-r--r-- | build/files.c | 7 | ||||
-rw-r--r-- | po/rpm.pot | 64 |
3 files changed, 39 insertions, 33 deletions
@@ -1,6 +1,7 @@ 3.0 -> 3.0.1 - fix: %verifyscript resurrected. (Shing-Gene Yung). - fix: % before non-alphabetic non-macro special now passed unscathed. + - fix: noarch header gets initialized differently. 2.94 -> 2.95 - fix: last update transaction set segfault bug in installer. diff --git a/build/files.c b/build/files.c index 2bf3252cc..befa248fd 100644 --- a/build/files.c +++ b/build/files.c @@ -1295,7 +1295,12 @@ int processSourceFiles(Spec spec) sourceFiles = newStringBuf(); - /* XXX This is where the source header used to be initialized. */ + /* XXX + * XXX This is where the source header for noarch packages needs + * XXX to be initialized. + */ + if (spec->sourceHeader == NULL) + initSourceHeader(spec); /* Construct the file list and source entries */ appendLineStringBuf(sourceFiles, spec->specFile); diff --git a/po/rpm.pot b/po/rpm.pot index 2b3726734..cdafc5474 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-04-20 14:43-0400\n" +"POT-Creation-Date: 1999-04-21 11:26-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" @@ -1730,60 +1730,60 @@ msgstr "" msgid "line: %s" msgstr "" -#: ../build/files.c:1386 ../build/parsePrep.c:31 +#: ../build/files.c:1391 ../build/parsePrep.c:31 #, c-format msgid "Bad owner/group: %s" msgstr "" -#: ../build/files.c:1440 +#: ../build/files.c:1445 #, c-format msgid "Couldn't exec %s" msgstr "" -#: ../build/files.c:1444 +#: ../build/files.c:1449 #, c-format msgid "Couldn't fork %s" msgstr "" -#: ../build/files.c:1494 +#: ../build/files.c:1499 #, c-format msgid "%s failed" msgstr "" -#: ../build/files.c:1498 +#: ../build/files.c:1503 #, c-format msgid "failed to write all data to %s" msgstr "" -#: ../build/files.c:1532 +#: ../build/files.c:1537 msgid "Finding provides...\n" msgstr "" -#: ../build/files.c:1539 +#: ../build/files.c:1544 msgid "Failed to find provides" msgstr "" -#: ../build/files.c:1558 +#: ../build/files.c:1563 msgid "Finding requires...\n" msgstr "" -#: ../build/files.c:1565 +#: ../build/files.c:1570 msgid "Failed to find requires" msgstr "" -#: ../build/files.c:1599 +#: ../build/files.c:1604 msgid "Provides:" msgstr "" -#: ../build/files.c:1614 +#: ../build/files.c:1619 msgid "Prereqs:" msgstr "" -#: ../build/files.c:1626 +#: ../build/files.c:1631 msgid "Requires:" msgstr "" -#: ../build/files.c:1650 +#: ../build/files.c:1655 #, c-format msgid "Processing files: %s\n" msgstr "" @@ -2549,83 +2549,83 @@ msgstr "" msgid "cannot read header at %d for lookup" msgstr "" -#: ../lib/macro.c:123 +#: ../lib/macro.c:129 #, c-format msgid "======================== active %d empty %d\n" msgstr "" #. XXX just in case -#: ../lib/macro.c:212 +#: ../lib/macro.c:218 #, c-format msgid "%3d>%*s(empty)" msgstr "" -#: ../lib/macro.c:247 +#: ../lib/macro.c:253 #, c-format msgid "%3d<%*s(empty)\n" msgstr "" -#: ../lib/macro.c:420 +#: ../lib/macro.c:426 msgid "Macro %%%s has unterminated body" msgstr "" -#: ../lib/macro.c:446 +#: ../lib/macro.c:452 msgid "Macro %%%s has illegal name (%%define)" msgstr "" -#: ../lib/macro.c:452 +#: ../lib/macro.c:458 msgid "Macro %%%s has unterminated opts" msgstr "" -#: ../lib/macro.c:457 +#: ../lib/macro.c:463 msgid "Macro %%%s has empty body" msgstr "" -#: ../lib/macro.c:462 +#: ../lib/macro.c:468 msgid "Macro %%%s failed to expand" msgstr "" -#: ../lib/macro.c:487 +#: ../lib/macro.c:493 msgid "Macro %%%s has illegal name (%%undefine)" msgstr "" -#: ../lib/macro.c:560 +#: ../lib/macro.c:566 msgid "Macro %%%s (%s) was not used below level %d" msgstr "" -#: ../lib/macro.c:642 +#: ../lib/macro.c:650 #, c-format msgid "Unknown option %c in %s(%s)" msgstr "" -#: ../lib/macro.c:804 +#: ../lib/macro.c:825 #, c-format msgid "Recursion depth(%d) greater than max(%d)" msgstr "" -#: ../lib/macro.c:860 ../lib/macro.c:876 +#: ../lib/macro.c:881 ../lib/macro.c:897 #, c-format msgid "Unterminated %c: %s" msgstr "" -#: ../lib/macro.c:905 +#: ../lib/macro.c:930 msgid "A %% is followed by an unparseable macro" msgstr "" -#: ../lib/macro.c:1027 +#: ../lib/macro.c:1053 msgid "Macro %%%.*s not found, skipping" msgstr "" -#: ../lib/macro.c:1105 +#: ../lib/macro.c:1131 msgid "Target buffer overflow" msgstr "" -#: ../lib/macro.c:1248 ../lib/macro.c:1256 +#: ../lib/macro.c:1274 ../lib/macro.c:1282 #, c-format msgid "File %s: %s" msgstr "" -#: ../lib/macro.c:1259 +#: ../lib/macro.c:1285 #, c-format msgid "File %s is smaller than %d bytes" msgstr "" |