SPECS: adapter.awk - move %buildroot->$RPM_BUILD_ROOT earlier, req...
glen
glen at pld-linux.org
Mon May 29 23:45:26 CEST 2006
Author: glen Date: Mon May 29 21:45:26 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- move %buildroot->$RPM_BUILD_ROOT earlier, req by zbyniu
---- Files affected:
SPECS:
adapter.awk (1.309 -> 1.310)
---- Diffs:
================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.309 SPECS/adapter.awk:1.310
--- SPECS/adapter.awk:1.309 Thu May 25 17:58:13 2006
+++ SPECS/adapter.awk Mon May 29 23:45:21 2006
@@ -440,6 +440,10 @@
preamble = 0
+ # foreign rpms
+ $0 = fixedsub("%buildroot", "$RPM_BUILD_ROOT", $0)
+ $0 = fixedsub("%{buildroot}", "$RPM_BUILD_ROOT", $0)
+
if (/^[ \t]*rm([ \t]+-[rf]+)*[ \t]+\${?RPM_BUILD_ROOT}?/ && did_rmroot==0) {
did_rmroot=1
print "rm -rf $RPM_BUILD_ROOT"
@@ -480,10 +484,6 @@
# No lines contain 'chmod' if it sets the modes to '644'
if ($1 ~ /chmod/ && $2 ~ /644/)
next
-
- # foreign rpms
- $0 = fixedsub("%buildroot", "$RPM_BUILD_ROOT", $0)
- $0 = fixedsub("%{buildroot}", "$RPM_BUILD_ROOT", $0)
# atrpms
$0 = fixedsub("%perl_makeinstall", "%{__make} pure_install \\\n\tDESTDIR=$RPM_BUILD_ROOT", $0);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.309&r2=1.310&f=u
More information about the pld-cvs-commit
mailing list