- added _npkgconfigdir (noarch version of _pkgconfigdir)

[packages/rpm.git] / rpm-compress-doc.patch

diff --git a/rpm-compress-doc.patch b/rpm-compress-doc.patch
index c044405a89810c4b6fe595df7242fac005f77ce0..dacf20daedc68e5f86b0e449356bd59490c6470b 100644 (file)
--- a/rpm-compress-doc.patch
+++ b/rpm-compress-doc.patch
@@ -1,10 +1,9 @@
-diff -ur rpm-4.0.4/build/files.c rpm-4.0.4-/build/files.c
---- rpm-4.0.4/build/files.c    Thu Feb 14 18:28:48 2002
-+++ rpm-4.0.4-/build/files.c   Fri May 17 11:16:53 2002
-@@ -1002,6 +1002,16 @@
+--- rpm-4.4.8/build/files.c.orig       2007-02-01 23:21:51.000000000 +0100
++++ rpm-4.4.8/build/files.c    2007-04-08 16:10:27.849202243 +0200
+@@ -1044,6 +1044,16 @@
            appendStringBuf(pkg->specialDoc, "cp -pr ");
            appendStringBuf(pkg->specialDoc, specialDocBuf);
-           appendLineStringBuf(pkg->specialDoc, " $DOCDIR");
+           appendLineStringBuf(pkg->specialDoc, " \"$DOCDIR\"");
 +
 +          {
 +              char *compress_doc;
@@ -18,16 +17,17 @@ diff -ur rpm-4.0.4/build/files.c rpm-4.0.4-/build/files.c
        }
      }
  
-diff -ur rpm-4.0.4/platform.in rpm-4.0.4-/platform.in
---- rpm-4.0.4/platform.in      Fri May 17 11:18:12 2002
-+++ rpm-4.0.4-/platform.in     Fri May 17 11:17:44 2002
-@@ -102,6 +102,9 @@
-     %{__os_install_post}\
- %{nil}
+diff -ur rpm-4.0.4/macros.in rpm-4.0.4-/macros.in
+--- rpm-4.0.4/macros.in        Fri May 17 11:18:12 2002
++++ rpm-4.0.4-/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}'}
 +
- @redhat@#---------------------------------------------------------------------
- @redhat@#     Expanded at end of %prep
- @redhat@#
+ #==============================================================================
+ # ---- configure macros.
+ #     Macro(s) slavishly copied from autoconf's config.status.
+