diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2009-09-01 13:31:20 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2009-09-01 13:31:20 +0300 |
| commit | 7c15b12f02c0fb71f5058bdcc585a766fbf5945f (patch) | |
| tree | b76da600f17fd3bbfddfa9b2d7516f6daa05683e /build | |
| parent | a070010b7c27275dfec0e178c79a34b0ef109fa4 (diff) | |
| download | rpm-7c15b12f02c0fb71f5058bdcc585a766fbf5945f.tar.gz rpm-7c15b12f02c0fb71f5058bdcc585a766fbf5945f.tar.bz2 rpm-7c15b12f02c0fb71f5058bdcc585a766fbf5945f.zip | |
Group tag inheritance doesn't need special treatment, just copy with others
Diffstat (limited to 'build')
| -rw-r--r-- | build/parsePreamble.c | 9 |
1 files changed, 1 insertions, 8 deletions
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)) { |