SPECS (DEVEL): adapter.awk, adapter.spec - better, at least won't ...

[glen]

Author: glen                         Date: Mon May 29 21:54:32 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- better, at least won't add another one

---- Files affected:
SPECS:
   adapter.awk (1.310 -> 1.311) , adapter.spec (1.26.2.20 -> 1.26.2.21) 

---- Diffs:

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.310 SPECS/adapter.awk:1.311
--- SPECS/adapter.awk:1.310	Mon May 29 23:45:21 2006
+++ SPECS/adapter.awk	Mon May 29 23:54:27 2006
@@ -441,10 +441,11 @@
 	preamble = 0
 
 	# foreign rpms
-	$0 = fixedsub("%buildroot", "$RPM_BUILD_ROOT", $0)
-	$0 = fixedsub("%{buildroot}", "$RPM_BUILD_ROOT", $0)
+	sub("^%{__rm} -rf %{buildroot}", "rm -rf $RPM_BUILD_ROOT")
+    sub("%buildroot", "$RPM_BUILD_ROOT");
+    sub("%{buildroot}", "$RPM_BUILD_ROOT");
 
-	if (/^[ \t]*rm([ \t]+-[rf]+)*[ \t]+\${?RPM_BUILD_ROOT}?/ && did_rmroot==0) {
+	if (/^[ \t]*rm([ \t]+-[rf]+)*[ \t]+(\${?RPM_BUILD_ROOT}?|%{?buildroot}?)/ && did_rmroot==0) {
 		did_rmroot=1
 		print "rm -rf $RPM_BUILD_ROOT"
 		next

================================================================
Index: SPECS/adapter.spec
diff -u SPECS/adapter.spec:1.26.2.20 SPECS/adapter.spec:1.26.2.21
--- SPECS/adapter.spec:1.26.2.20	Mon May 29 23:47:45 2006
+++ SPECS/adapter.spec	Mon May 29 23:54:27 2006
@@ -85,7 +85,7 @@
 export UNSERMAKE=/usr/share/unsermake/unsermake
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 install -d \
 	$RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig,rc.d/init.d} \
 	$RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d} \
@@ -170,6 +170,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26.2.21  2006/05/29 21:54:27  glen
+- better, at least won't add another one
+
 Revision 1.26.2.20  2006/05/29 21:47:45  glen
 - save
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.310&r2=1.311&f=u
    http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.26.2.20&r2=1.26.2.21&f=u