mirror of
https://abf.rosa.ru/djam/rpm.git
synced 2025-02-24 02:43:06 +00:00
19 lines
672 B
Diff
19 lines
672 B
Diff
--- rpm-5.4.4/build/parseDescription.c.mdvbz62979~ 2011-04-07 01:34:01.000000000 +0200
|
|
+++ rpm-5.4.4/build/parseDescription.c 2011-11-12 18:11:36.736325952 +0100
|
|
@@ -90,6 +90,8 @@ int parseDescription(Spec spec)
|
|
}
|
|
|
|
/* Lose the inheirited %description (if present). */
|
|
+
|
|
+#if !defined(RPM_VENDOR_MANDRIVA) /* mdvbz#62979 */
|
|
if (spec->packages->header != pkg->header) {
|
|
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
|
|
int xx;
|
|
@@ -99,6 +101,7 @@ int parseDescription(Spec spec)
|
|
if (xx && he->t == RPM_STRING_TYPE)
|
|
xx = headerDel(pkg->header, he, 0);
|
|
}
|
|
+#endif
|
|
|
|
t = stashSt(spec, pkg->header, RPMTAG_DESCRIPTION, lang);
|
|
|