This commit was manufactured by cvs2git to create branch 'rpm-4_5'.

[packages/rpm.git] / rpm-cleanbody.patch

diff --git a/rpm-cleanbody.patch b/rpm-cleanbody.patch
index 21aa5f5612f02c809d419fc8dd817d81ddf97026..f8b29efa47937feac44880f5691ff166ec1371af 100644 (file)
--- a/rpm-cleanbody.patch
+++ b/rpm-cleanbody.patch
@@ -1,11 +1,6 @@
 --- rpm-4.4.9/build/parseBuildInstallClean.c   2008-01-30 23:16:55.347346942 +0200
 +++ rpm-4.4.9/build/parseBuildInstallClean.c   2008-01-30 23:22:24.241459876 +0200
-@@ -47,11 +47,10 @@
-           appendStringBuf(*sbp, s);
-       s = _free(s);
-     } else if (parsePart == PART_CLEAN) {
--      const char * s = rpmExpand("%{?buildroot:rm -rf '%{buildroot}'\n}", NULL);
-+      const char * s = rpmExpand("%{?__spec_clean_body}%{!?__spec_clean_body:%{?buildroot:rm -rf '%{buildroot}'\n}}\n", NULL);
+@@ -51,7 +51,6 @@
        if (s && *s)
            appendStringBuf(*sbp, s);
        s = _free(s);