[packages/rpm] fix encoding in changelogs of subpackages

[draenog]

commit 497556c459b37ae76ab1207f321610b682a43630
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Mon May 6 18:28:49 2013 +0100

    fix encoding in changelogs of subpackages

 rpm-changelog-encoding.patch | 22 ++++++++++++++++++++++
 rpm.spec                     |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 7633cbb..5fd3b97 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:	50
+Release:	51
 License:	LGPL v2.1
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -162,6 +162,7 @@ Patch67:	%{name}-repackage-dont-force-max-compression.patch
 Patch68:	rubyprov-archdirs.patch
 Patch69:	rubyprov-abi-versioned.patch
 Patch70:	python-%{name}sense-missingok.patch
+Patch71:	%{name}-changelog-encoding.patch
 
 # Patches imported from Mandriva
 
@@ -888,6 +889,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch66 -p1
 %patch67 -p1
 %patch70 -p1
+%patch71 -p1
 
 %patch1000 -p1
 %patch1001 -p1
diff --git a/rpm-changelog-encoding.patch b/rpm-changelog-encoding.patch
new file mode 100644
index 0000000..d48b50f
--- /dev/null
+++ b/rpm-changelog-encoding.patch
@@ -0,0 +1,22 @@
+commit 1f9882b38b046c7752ec3e1200b17b7edfc995cd
+Author: Kacper Kornet <draenog at pld-linux.org>
+Date:   Sat May 4 20:27:19 2013 +0100
+
+    Don't use tagFunction during copying headers
+    
+    It fixes error when the changelog in subpackage was converted
+    to encoding determined by environment.
+
+diff --git a/rpmdb/header.c b/rpmdb/header.c
+index 01056c3..1cec5cc 100644
+--- a/rpmdb/header.c
++++ b/rpmdb/header.c
+@@ -2213,7 +2213,7 @@ void headerCopyTags(Header headerFrom, Header headerTo, rpmTag * tagstocopy)
+ 	if (headerIsEntry(headerTo, *tagno))
+ 	    continue;
+ 	he->tag = *tagno;
+-	if (!headerGet(headerFrom, he, 0))
++	if (!headerGet(headerFrom, he, HEADERGET_NOEXTENSION))
+ 	    continue;
+ 	xx = headerPut(headerTo, he, 0);
+ 	he->p.ptr = _free(he->p.ptr);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/497556c459b37ae76ab1207f321610b682a43630