[packages/rpm] - fix compressing documentation - rel 42

[baggins]

commit 80e5119e45d52e99c07dd50372bc87b89b150041
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Feb 25 12:10:57 2013 +0100

    - fix compressing documentation
    - rel 42

 rpm-fix-compress-doc.patch | 38 ++++++++++++++++++++++++++++++++++++++
 rpm.spec                   |  4 +++-
 2 files changed, 41 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index beb1f88..ec2f8b6 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:	41
+Release:	42
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -154,6 +154,7 @@ Patch60:	%{name}-python-sitescriptdir.patch
 Patch61:	%{name}-clean-docdir.patch
 Patch62:	%{name}-DB_CONFIG.patch
 Patch63:	%{name}-pythoneggs.patch
+Patch64:	%{name}-fix-compress-doc.patch
 
 # Patches imported from Mandriva
 
@@ -858,6 +859,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch61 -p1
 %patch62 -p1
 %patch63 -p1
+%patch64 -p1
 
 %patch1000 -p1
 %patch1001 -p1
diff --git a/rpm-fix-compress-doc.patch b/rpm-fix-compress-doc.patch
new file mode 100644
index 0000000..a9256d3
--- /dev/null
+++ b/rpm-fix-compress-doc.patch
@@ -0,0 +1,38 @@
+--- rpm-5.4.10/build/files.c~	2013-01-25 13:14:36.692060288 +0100
++++ rpm-5.4.10/build/files.c	2013-02-25 12:03:26.110910465 +0100
+@@ -1041,7 +1041,6 @@
+ 	/* XXX FIXME: this is easy to do as macro expansion */
+ 
+ 	    if (! fl->passedSpecialDoc) {
+-	    	char *compress_doc;
+ 	    	char *mkdir_p;
+ 
+ 		pkg->specialDoc = rpmiobNew(0);
+@@ -1056,11 +1055,6 @@
+ 		mkdir_p = _free(mkdir_p);
+ 		pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " \"$DOCDIR\"", 1);
+ 
+-		compress_doc = rpmExpand("%{__compress_doc}", NULL);
+-		if (compress_doc && *compress_doc != '%')
+-	    	    pkg->specialDoc = rpmiobAppend(pkg->specialDoc, compress_doc, 1);
+-		compress_doc = _free(compress_doc);
+-
+ 		/*@-temptrans@*/
+ 		*fileName = buf;
+ 		/*@=temptrans@*/
+@@ -1071,6 +1065,15 @@
+ 	    pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "cp -pr ", 0);
+ 	    pkg->specialDoc = rpmiobAppend(pkg->specialDoc, specialDocBuf, 0);
+ 	    pkg->specialDoc = rpmiobAppend(pkg->specialDoc, " \"$DOCDIR\"", 1);
++
++	    {
++	    	char *compress_doc;
++
++		compress_doc = rpmExpand("%{__compress_doc}", NULL);
++		if (compress_doc && *compress_doc != '%')
++	    	    pkg->specialDoc = rpmiobAppend(pkg->specialDoc, compress_doc, 1);
++		compress_doc = _free(compress_doc);
++	    }
+ 	}
+     }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/80e5119e45d52e99c07dd50372bc87b89b150041