[packages/adapter: 239/631] - fix for %post ldconfig

[glen]

commit e6f1551d85282a6f33a10947889e0a97c3156802
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Mon Dec 12 15:19:10 2005 +0000

    - fix for %post ldconfig
    
    Changed files:
        adapter.awk -> 1.230

 adapter.awk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index 390d754..8b03e7c 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -344,7 +344,7 @@ preamble == 1 {
 		sub("CC=%{__cc}", "CC=\"%{__cc}\"")
 	}
 	
-	# use macros
+	# use PLD Linux macros
 	$0 = fixedsub("glib-gettextize --copy --force","%{__glib_gettextize}", $0);
 	$0 = fixedsub("intltoolize --copy --force", "%{__intltoolize}", $0);
 	$0 = fixedsub("automake --add-missing --copy", "%{__automake}", $0);
@@ -364,7 +364,11 @@ preamble == 1 {
 ##########
 /^%clean/, (/^%[a-z]+$/ && !/^%clean/ && !/^%((end)?if|else)/) {
 	did_clean = 1
-	use_macros()
+
+	# prevent next section header like "%post -p /sbin/ldconfig" being adapterized
+	if (!/^%/) {
+		use_macros()
+	}
 }
 
 ############
@@ -427,7 +431,6 @@ preamble == 1 {
 	if ($0 ~ /^%files/)
 		defattr = 1
 
-	use_macros()
 	use_files_macros()
 }
 
@@ -991,6 +994,8 @@ function isort(A,n,		i,j,hold) {
 
 function use_files_macros(	i, n, t, a)
 {
+	use_macros()
+
 	gsub("^%{_sbindir}", "%attr(755,root,root) %{_sbindir}")
 	gsub("^%{_bindir}", "%attr(755,root,root) %{_bindir}")
 
================================================================

---- gitweb:

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