Sophie

Sophie

distrib > Mandriva > 2008.0 > x86_64 > by-pkgid > a35732d620cfac4812adc8d6b2992f07 > files > 36

rpm-4.4.8-22.1mdv2008.0.src.rpm

--- build/parseBuildInstallClean.c.old	2007-06-09 12:25:00.000000000 +0200
+++ build/parseBuildInstallClean.c	2007-06-09 12:26:35.000000000 +0200
@@ -41,12 +41,13 @@
     *sbp = newStringBuf();
 
     /* Make sure the buildroot is removed where needed. */
-    if (parsePart == PART_INSTALL) {
+    /* This break connectiva --without, for now disabling */
+    /* if (parsePart == PART_INSTALL) {
 	const char * s = rpmExpand("%{?buildroot:rm -rf '%{buildroot}'\n}", NULL);
 	if (s && *s)
 	    appendStringBuf(*sbp, s);
 	s = _free(s);
-    } else if (parsePart == PART_CLEAN) {
+    } else */ if (parsePart == PART_CLEAN) {
 	const char * s = rpmExpand("%{?buildroot:rm -rf '%{buildroot}'\n}", NULL);
 	if (s && *s)
 	    appendStringBuf(*sbp, s);