From 7c15b12f02c0fb71f5058bdcc585a766fbf5945f Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 1 Sep 2009 13:31:20 +0300 Subject: Group tag inheritance doesn't need special treatment, just copy with others --- build/parsePreamble.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'build') diff --git a/build/parsePreamble.c b/build/parsePreamble.c index 96b2fc067..a43e85dab 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -33,6 +33,7 @@ static const rpmTag copyTagsDuringParse[] = { RPMTAG_PREFIXES, RPMTAG_DISTTAG, RPMTAG_BUGURL, + RPMTAG_GROUP, 0 }; @@ -930,14 +931,6 @@ int parsePreamble(rpmSpec spec, int initialPackage) if (pkg != spec->packages) { headerCopyTags(spec->packages->header, pkg->header, (rpmTag *)copyTagsDuringParse); - /* inherit group tag from the main package if unspecified */ - if (!headerIsEntry(pkg->header, RPMTAG_GROUP)) { - struct rpmtd_s td; - - headerGet(spec->packages->header, RPMTAG_GROUP, &td, HEADERGET_DEFAULT); - headerPut(pkg->header, &td, HEADERPUT_DEFAULT); - rpmtdFreeData(&td); - } } if (checkForRequired(pkg->header, NVR)) { -- cgit v1.2.3