commit 305a03e9db23b07f4207298e66e062f4d55ed6d1
Author: Jan Rękorajski <[email protected]>
Date: Fri Jan 25 14:05:53 2013 +0100
- work around mksh handling && pipes when -e is in effect
rpm-clean-docdir.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm-clean-docdir.patch b/rpm-clean-docdir.patch
index 33af9d6..5b8c858 100644
--- a/rpm-clean-docdir.patch
+++ b/rpm-clean-docdir.patch
@@ -1,10 +1,10 @@
--- 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 @@
+@@ -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, "test -d
\"$DOCDIR\" && rmdir \"$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");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/be9f7430c1240bab4169323f715d2c194a1f39e7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
