[packages/adapter: 342/631] - leave /sbin/ldconfig intact - subst infodir

[glen]

commit a372a15977a050c85317944a3383ef1b050bfc87
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Sun Nov 5 13:46:31 2006 +0000

    - leave /sbin/ldconfig intact
    - subst infodir
    
    Changed files:
        adapter.awk -> 1.329

 adapter.awk | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index e071dd9..993c1e9 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -436,10 +436,7 @@ function b_makekey(a, b,	s) {
 /^%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 @@ function use_macros()
     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}")
@@ -1098,6 +1097,8 @@ function use_macros()
 			continue;
 		if ($c ~ sbindir "/webapp")
 			continue;
+		if ($c ~ sbindir "/ldconfig")
+			continue;
 		if ($c ~ sbindir "/chsh")
 			continue;
 		if ($c ~ sbindir "/usermod")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885