SPECS: adapter.awk - more fixes for external specs

[glen]

Author: glen                         Date: Sun Jul 24 22:15:35 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more fixes for external specs

---- Files affected:
SPECS:
   adapter.awk (1.164 -> 1.165) 

---- Diffs:

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.164 SPECS/adapter.awk:1.165
--- SPECS/adapter.awk:1.164	Sat Jul 16 18:03:41 2005
+++ SPECS/adapter.awk	Mon Jul 25 00:15:30 2005
@@ -164,6 +164,8 @@
 /^%prep/, (/^%[a-z]+$/ && !/^%prep/ && !/^%((end)?if|else)/) {
 	preamble = 0
 
+	use_macros()
+
 	# Add '-q' to %setup
 	if (/^%setup/ && !/-q/) {
 		sub(/^%setup/, "%setup -q")
@@ -172,6 +174,9 @@
 	if (/^%setup/ && /-n %{name}-%{version}( |$)/) {
 		sub(/ -n %{name}-%{version}/, "")
 	}
+
+	# invalid in %prep
+	sub("^rm -rf \$RPM_BUILD_ROOT.*", "");
 }
 
 ##########
@@ -726,6 +731,10 @@
 
 	gsub("^%{__make} install DESTDIR=\$RPM_BUILD_ROOT", "%{__make} install \\\n\tDESTDIR=$RPM_BUILD_ROOT")
 	gsub("^fix-info-dir$", "[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>\&1")
+	gsub("%buildroot", "$RPM_BUILD_ROOT")
+	gsub("%_bindir", "%{_bindir}")
+	gsub("%_datadir", "%{_datadir}")
+	gsub("%_iconsdir", "%{_iconsdir}")
 
 	gsub("/usr/src/linux", "%{_kernelsrcdir}")
 	gsub("%{_prefix}/src/linux", "%{_kernelsrcdir}")
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.164&r2=1.165&f=u