[packages/rpm] - proper fix to mdvbz62979 is not copying description and summary to subpackages

[baggins]

commit 064050803f04dc77d770bad2789c08cc9689051f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Oct 26 00:43:36 2012 +0200

    - proper fix to mdvbz62979 is not copying description and summary to subpackages
    
    Copying description to subpackages on they creation time caused
    description parser to remove all but the last description translation,
    even removed LANG=C default descriptions from subpackages.

 rpm-5.4.9-fix-mdvbz62979.patch       | 18 ------------------
 rpm-dont-copy-descriptive-tags.patch | 13 +++++++++++++
 rpm.spec                             |  8 +++-----
 3 files changed, 16 insertions(+), 23 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index c44484a..c9763b1 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:	31
+Release:	32
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -102,6 +102,7 @@ Patch9:		%{name}-lua.patch
 Patch10:	%{name}-php-deps.patch
 Patch11:	%{name}-notsc.patch
 Patch12:	%{name}-hack-norpmlibdep.patch
+Patch13:	%{name}-dont-copy-descriptive-tags.patch
 Patch14:	%{name}-perl_req-INC_dirs.patch
 Patch15:	%{name}-debuginfo.patch
 Patch16:	vendor-pld.patch
@@ -255,9 +256,6 @@ Patch1040:	rpm-5.4.9-support-signatures-and-digest-disablers.patch
 Patch1041:	rpm-5.4.9-disable-l10ndir.patch
 # status: ready for merge
 Patch1042:	rpm-5.4.9-fix-rpm_qa-pattern.patch
-# status: i18n strings is getting dropped, so this one might be of less relevance,
-# but feel free to discuss it on rpm-devel
-Patch1043:	rpm-5.4.9-fix-mdvbz62979.patch
 
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.60
@@ -797,6 +795,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch11 -p1
 %endif
 %patch12 -p1
+%patch13 -p1
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
@@ -885,7 +884,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch1040 -p1
 %patch1041 -p1
 %patch1042 -p1
-#patch1043 -p1
 
 install %{SOURCE2} macros/pld.in
 install %{SOURCE8} scripts/php.prov.in
diff --git a/rpm-5.4.9-fix-mdvbz62979.patch b/rpm-5.4.9-fix-mdvbz62979.patch
deleted file mode 100644
index 2b8fa6f..0000000
--- a/rpm-5.4.9-fix-mdvbz62979.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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);
-     
diff --git a/rpm-dont-copy-descriptive-tags.patch b/rpm-dont-copy-descriptive-tags.patch
new file mode 100644
index 0000000..07f0987
--- /dev/null
+++ b/rpm-dont-copy-descriptive-tags.patch
@@ -0,0 +1,13 @@
+--- 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 @@
+     RPMTAG_DISTEPOCH,
+     RPMTAG_LICENSE,
+     RPMTAG_GROUP,		/* XXX permissive. */
++#if !defined(RPM_VENDOR_PLD)
+     RPMTAG_SUMMARY,		/* XXX permissive. */
+     RPMTAG_DESCRIPTION,		/* XXX permissive. */
++#endif
+     RPMTAG_PACKAGER,
+     RPMTAG_DISTRIBUTION,
+     RPMTAG_DISTURL,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/064050803f04dc77d770bad2789c08cc9689051f