From: Jan Rękorajski <baggins@pld-linux.org>
Date: Mon, 25 Mar 2013 12:51:05 +0000 (+0100)
Subject: - attempt to fix assertions at repackage time cause by xz memory needs
X-Git-Tag: auto/th/rpm-5.4.10-45~2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=2f067477bed80d731ccdc26692628e81c0421298;p=packages%2Frpm.git

- attempt to fix assertions at repackage time cause by xz memory needs
---

diff --git a/rpm-repackage-dont-force-max-compression.patch b/rpm-repackage-dont-force-max-compression.patch
new file mode 100644
index 0000000..7ffc1c8
--- /dev/null
+++ b/rpm-repackage-dont-force-max-compression.patch
@@ -0,0 +1,11 @@
+--- rpm/BUILD/rpm-5.4.10/lib/psm.c~	2013-03-17 13:34:31.534601434 +0100
++++ rpm/BUILD/rpm-5.4.10/lib/psm.c	2013-03-25 13:46:18.326658890 +0100
+@@ -3017,7 +3017,7 @@
+ 
+ 	psm->rpmio_flags = t = (char *) xmalloc(sizeof("w9.gzdio"));
+ 	*t = '\0';
+-	t = stpcpy(t, ((psm->goal == PSM_PKGSAVE) ? "w9" : "r"));
++	t = stpcpy(t, ((psm->goal == PSM_PKGSAVE) ? "w6" : "r"));
+ 	if (!strcmp(payload_compressor, "gzip"))
+ 	    t = stpcpy(t, ".gzdio");
+ 	if (!strcmp(payload_compressor, "bzip2"))
diff --git a/rpm.spec b/rpm.spec
index 8fb8948..2e9a93c 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:	44
+Release:	44.1
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -157,6 +157,7 @@ Patch63:	%{name}-pythoneggs.patch
 Patch64:	%{name}-fix-compress-doc.patch
 Patch65:	%{name}-parseSpec-skip-empty-tags.patch
 Patch66:	%{name}-payload-use-hashed-inode.patch
+Patch67:	rpm-repackage-dont-force-max-compression.patch
 
 # Patches imported from Mandriva
 
@@ -880,6 +881,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch64 -p1
 %patch65 -p1
 %patch66 -p1
+%patch67 -p1
 
 %patch1000 -p1
 %patch1001 -p1