X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-compress-doc.patch;h=2a87e6cf91bb9e14bceba975a9e3b0fb01c443f0;hb=c296fee067c4c8f98618d7b9fc7110af4a8b3a6b;hp=674a184a53214d45e52ae9bcf7be1100c74155e5;hpb=21b02dbb42ec541cf2bdf755cfcf33ef0d3329ec;p=packages%2Frpm.git

diff --git a/rpm-compress-doc.patch b/rpm-compress-doc.patch
index 674a184..2a87e6c 100644
--- a/rpm-compress-doc.patch
+++ b/rpm-compress-doc.patch
@@ -1,34 +1,14 @@
-diff -ur rpm-4.0.2/build/files.c rpm-4.0.2-/build/files.c
---- rpm-4.0.2/build/files.c	Fri May 17 14:28:01 2002
-+++ rpm-4.0.2-/build/files.c	Fri May 17 14:26:29 2002
-@@ -813,6 +813,16 @@
- 	    appendStringBuf(pkg->specialDoc, "cp -pr ");
- 	    appendStringBuf(pkg->specialDoc, specialDocBuf);
- 	    appendLineStringBuf(pkg->specialDoc, " $DOCDIR");
-+
-+	    {
-+	        char *compress_doc;
-+
-+		compress_doc = rpmExpand("%{__compress_doc}", NULL);
-+		if (compress_doc && *compress_doc != '%')
-+	    	    appendLineStringBuf(pkg->specialDoc, compress_doc);
-+		if (compress_doc)
-+		  free(compress_doc);
-+	    }
- 	}
-     }
- 
-diff -ur rpm-4.0.2/platform.in rpm-4.0.2-/platform.in
---- rpm-4.0.2/platform.in	Wed Jan 17 17:14:16 2001
-+++ rpm-4.0.2-/platform.in	Fri May 17 14:27:34 2002
-@@ -51,6 +51,10 @@
-      %{__os_install_post}\
- %{nil}
+diff -ur rpm-4.0.4/macros/macros.in rpm-4.0.4-/macros/macros.in
+--- rpm-4.0.4/macros/macros.in	Fri May 17 11:18:12 2002
++++ rpm-4.0.4-/macros/macros.in	Fri May 17 11:17:44 2002
+@@ -1208,6 +1208,9 @@
+ #%__spec_triggerin_pre		%{nil}
+ #%__spec_triggerin_post		%{nil}
  
 +# Executed at after copying %doc to DOCDIR, with $DOCDIR set
-+%__compress_doc		@prefix@/lib/rpm/compress-doc
-+
++%__compress_doc                @prefix@/lib/rpm/compress-doc%{?_noautocompressdoc: --noautocompressdoc='%{_noautocompressdoc}'}
 +
- #------------------------------------------------------------------------
- #	Expanded at end of %prep
- #
+ #==============================================================================
+ # ---- configure macros.
+ #	Macro(s) slavishly copied from autoconf's config.status.
+