- teach rpm how to read /proc files

[packages/rpm.git] / rpm-clean-docdir.patch

diff --git a/rpm-clean-docdir.patch b/rpm-clean-docdir.patch
index 33af9d6717da2e52098dd78b4c9d0a3a8c6b6355..800e2c01f9958d9a812ec7c960f8dfce7972a625 100644 (file)
--- a/rpm-clean-docdir.patch
+++ b/rpm-clean-docdir.patch
@@ -1,10 +1,14 @@
 --- rpm-5.4.10/build/files.c~  2013-01-24 14:24:39.161982722 +0100
 +++ rpm-5.4.10/build/files.c   2013-01-24 14:27:50.620325354 +0100
-@@ -1048,6 +1048,7 @@
-               pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "DOCDIR=\"$RPM_BUILD_ROOT\"", 0);
-               pkg->specialDoc = rpmiobAppend(pkg->specialDoc, buf, 1);
-               pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "export DOCDIR", 1);
-+              pkg->specialDoc = rpmiobAppend(pkg->specialDoc, "test -d \"$DOCDIR\" && rmdir \"$DOCDIR\"", 1);
-               mkdir_p = rpmExpand("%{?__mkdir_p}%{!?__mkdir_p:mkdir -p}", NULL);
-               if (!mkdir_p)
-                   mkdir_p = xstrdup("mkdir -p");
+@@ -2363,6 +2363,11 @@
+     appendLineStringBuf(docScript, "export LC_ALL=C");
+     appendStringBuf(docScript, "export ");
+     appendLineStringBuf(docScript, sdenv);
++    appendStringBuf(docScript, "if test -d \"$");
++    appendStringBuf(docScript, sdenv);
++    appendStringBuf(docScript, "\" ; then rmdir \"$");
++    appendStringBuf(docScript, sdenv);
++    appendLineStringBuf(docScript, "\" ; fi");
+     appendLineStringBuf(docScript, mkdocdir);
+ 
+     for (ARGV_const_t fn = sd->files; fn && *fn; fn++) {