1 --- rpm-5.4.9/build/parseDescription.c.mdvbz62979~ 2012-05-03 20:39:51.000000000 +0200
2 +++ rpm-5.4.9/build/parseDescription.c 2012-05-15 01:55:31.332318888 +0200
3 @@ -92,6 +92,7 @@ int parseDescription(Spec spec)
6 /* Lose the inheirited %description (if present). */
7 +#if !defined(RPM_VENDOR_MANDRIVA) && !defined(RPM_VENDOR_PLD) /* mdvbz#62979 */
8 if (spec->packages->header != pkg->header) {
9 he->tag = RPMTAG_DESCRIPTION;
10 xx = headerGet(pkg->header, he, 0);
11 @@ -99,6 +100,7 @@ int parseDescription(Spec spec)
12 if (xx && he->t == RPM_STRING_TYPE)
13 xx = headerDel(pkg->header, he, 0);
17 t = stashSt(spec, pkg->header, RPMTAG_DESCRIPTION, lang);
19 --- rpm-5.4.10/build/parsePreamble.c.orig 2012-05-03 20:39:51.000000000 +0200
20 +++ rpm-5.4.10/build/parsePreamble.c 2012-10-26 00:41:10.281500646 +0200
24 RPMTAG_GROUP, /* XXX permissive. */
25 +#if !defined(RPM_VENDOR_PLD)
26 RPMTAG_SUMMARY, /* XXX permissive. */
27 RPMTAG_DESCRIPTION, /* XXX permissive. */