SPECS: adapter.awk - leave /sbin/ldconfig intact - subst infodir

[glen]

Author: glen                         Date: Sun Nov  5 13:46:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- leave /sbin/ldconfig intact
- subst infodir

---- Files affected:
SPECS:
   adapter.awk (1.328 -> 1.329) 

---- Diffs:

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.328 SPECS/adapter.awk:1.329
--- SPECS/adapter.awk:1.328	Sat Sep 16 13:27:37 2006
+++ SPECS/adapter.awk	Sun Nov  5 14:46:31 2006
@@ -436,10 +436,7 @@
 /^%clean/, (!/^%clean/ && $0 ~ SECTIONS) {
 	did_clean = 1
 
-	# prevent next section header like "%post -p /sbin/ldconfig" being adapterized
-	if (!/^%post/) {
-		use_macros()
-	}
+    use_macros()
 }
 
 ############
@@ -1066,6 +1063,8 @@
     sub("%{_bindir}/perl", "%{__perl}");
     sub("%{_bindir}/python", "%{__python}");
 
+	gsub(infodir, "%{_infodir}")
+
 	gsub(perl_sitearch, "%{perl_sitearch}")
 	gsub(perl_archlib, "%{perl_archlib}")
 	gsub(perl_privlib, "%{perl_privlib}")
@@ -1097,6 +1096,8 @@
 		if ($c ~ sbindir "/fix-info-dir")
 			continue;
 		if ($c ~ sbindir "/webapp")
+			continue;
+		if ($c ~ sbindir "/ldconfig")
 			continue;
 		if ($c ~ sbindir "/chsh")
 			continue;
================================================================

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