X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-clean-docdir.patch;h=800e2c01f9958d9a812ec7c960f8dfce7972a625;hb=4d1423ddc8030f2011fbe3a357697efc0e2bf7fb;hp=5b8c8584d34932305ff0c74297f5421940c4112e;hpb=305a03e9db23b07f4207298e66e062f4d55ed6d1;p=packages%2Frpm.git

diff --git a/rpm-clean-docdir.patch b/rpm-clean-docdir.patch
index 5b8c858..800e2c0 100644
--- 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
-@@ -1045,6 +1045,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, "if test -d \"$DOCDIR\" ; then rmdir \"$DOCDIR\" ; fi", 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++) {