- rel 51; fix -Werror=trampolines option

[packages/rpm.git] / rpm-dont-copy-descriptive-tags.patch

diff --git a/rpm-dont-copy-descriptive-tags.patch b/rpm-dont-copy-descriptive-tags.patch
index 07f098767629c87b5accc0510b91be87c4b0d2f5..da59246e3daca2a643fc73cc9e7666d5113b46c8 100644 (file)
--- a/rpm-dont-copy-descriptive-tags.patch
+++ b/rpm-dont-copy-descriptive-tags.patch
@@ -1,3 +1,21 @@
+--- rpm-5.4.9/build/parseDescription.c.mdvbz62979~     2012-05-03 20:39:51.000000000 +0200
++++ rpm-5.4.9/build/parseDescription.c 2012-05-15 01:55:31.332318888 +0200
+@@ -92,6 +92,7 @@ int parseDescription(Spec spec)
+     }
+ 
+     /* Lose the inheirited %description (if present). */
++#if !defined(RPM_VENDOR_MANDRIVA) && !defined(RPM_VENDOR_PLD) /* mdvbz#62979 */
+     if (spec->packages->header != pkg->header) {
+       he->tag = RPMTAG_DESCRIPTION;
+       xx = headerGet(pkg->header, he, 0);
+@@ -99,6 +100,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);
+     
 --- rpm-5.4.10/build/parsePreamble.c.orig      2012-05-03 20:39:51.000000000 +0200
 +++ rpm-5.4.10/build/parsePreamble.c   2012-10-26 00:41:10.281500646 +0200
 @@ -30,8 +30,10 @@