[packages/rpm] - don't remove "duplicate" descriptions (this is also needed for previous fix to work) - rel 33

[baggins]

commit 30b5898e1218c5fbee293ce4cb8eadcded2b9b2b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Oct 26 01:03:12 2012 +0200

    - don't remove "duplicate" descriptions (this is also needed for
      previous fix to work)
    - rel 33

 rpm-dont-copy-descriptive-tags.patch | 18 ++++++++++++++++++
 rpm.spec                             |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index c9763b1..1e40cbb 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -52,7 +52,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.10
-Release:	32
+Release:	33
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
diff --git a/rpm-dont-copy-descriptive-tags.patch b/rpm-dont-copy-descriptive-tags.patch
index 07f0987..da59246 100644
--- 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 @@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/30b5898e1218c5fbee293ce4cb8eadcded2b9b2b