SOURCES (rpm-4_5): rpm-cleanbody.patch - update to rpm 4.5

glen glen at pld-linux.org
Fri Aug 29 23:12:50 CEST 2008


Author: glen                         Date: Fri Aug 29 21:12:50 2008 GMT
Module: SOURCES                       Tag: rpm-4_5
---- Log message:
- update to rpm 4.5

---- Files affected:
SOURCES:
   rpm-cleanbody.patch (1.1.2.2 -> 1.1.2.2.2.1) 

---- Diffs:

================================================================
Index: SOURCES/rpm-cleanbody.patch
diff -u SOURCES/rpm-cleanbody.patch:1.1.2.2 SOURCES/rpm-cleanbody.patch:1.1.2.2.2.1
--- SOURCES/rpm-cleanbody.patch:1.1.2.2	Wed Jan 30 22:25:51 2008
+++ SOURCES/rpm-cleanbody.patch	Fri Aug 29 23:12:44 2008
@@ -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);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-cleanbody.patch?r1=1.1.2.2&r2=1.1.2.2.2.1&f=u



More information about the pld-cvs-commit mailing list