diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-03-29 06:17:30 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-03-29 06:21:10 +0300 |
| commit | d160f45ab3ef5e78836ffb668c8c7887ae1081c1 (patch) | |
| tree | d9ff907ddcd48efb3d5cfd8ccc3aa1d69e84204c /build/parsePreamble.c | |
| parent | 75cccc91f3e1e71bde95edf0047ca8c5e984a2fd (diff) | |
| download | rpm-d160f45ab3ef5e78836ffb668c8c7887ae1081c1.tar.gz rpm-d160f45ab3ef5e78836ffb668c8c7887ae1081c1.tar.bz2 rpm-d160f45ab3ef5e78836ffb668c8c7887ae1081c1.zip | |
Drop "support" for per-scriptlet build-requires
- Rpm has never done anything useful with "BuildRequires(prep): foo"
style dependencies other than recorded them in src.rpms, nor is there much
point in properly supporting this in the future either
- Frees up four more bits from rpmsenseFlags for better uses
Diffstat (limited to 'build/parsePreamble.c')
| -rw-r--r-- | build/parsePreamble.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/build/parsePreamble.c b/build/parsePreamble.c index e31af742f..f97d9b171 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -131,16 +131,6 @@ static struct tokenBits_s const installScriptBits[] = { /** */ -static const struct tokenBits_s const buildScriptBits[] = { - { "prep", RPMSENSE_SCRIPT_PREP }, - { "build", RPMSENSE_SCRIPT_BUILD }, - { "install", RPMSENSE_SCRIPT_INSTALL }, - { "clean", RPMSENSE_SCRIPT_CLEAN }, - { NULL, 0 } -}; - -/** - */ static int parseBits(const char * s, const tokenBits tokbits, rpmsenseFlags * bp) { @@ -621,17 +611,6 @@ static int handlePreambleTag(rpmSpec spec, Package pkg, rpmTag tag, if ((rc = parseNoSource(spec, field, tag))) return rc; break; - case RPMTAG_BUILDPREREQ: - case RPMTAG_BUILDREQUIRES: - if ((rc = parseBits(lang, buildScriptBits, &tagflags))) { - rpmlog(RPMLOG_ERR, - _("line %d: Bad %s: qualifiers: %s\n"), - spec->lineNum, rpmTagGetName(tag), spec->line); - return rc; - } - if ((rc = parseRCPOT(spec, pkg, field, tag, 0, tagflags))) - return rc; - break; case RPMTAG_REQUIREFLAGS: case RPMTAG_PREREQ: if ((rc = parseBits(lang, installScriptBits, &tagflags))) { @@ -643,6 +622,8 @@ static int handlePreambleTag(rpmSpec spec, Package pkg, rpmTag tag, if ((rc = parseRCPOT(spec, pkg, field, tag, 0, tagflags))) return rc; break; + case RPMTAG_BUILDPREREQ: + case RPMTAG_BUILDREQUIRES: case RPMTAG_BUILDCONFLICTS: case RPMTAG_CONFLICTFLAGS: case RPMTAG_OBSOLETEFLAGS: |