From: Elan Ruusamäe <glen@pld-linux.org>
Date: Tue, 24 Aug 2010 09:28:44 +0000 (+0000)
Subject: - pear demacros
X-Git-Tag: auto/th/rpm-build-tools-4_5-1~74
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=bff32a154b36d2e425c38129d6ccd09257e5d63b;p=packages%2Frpm-build-tools.git

- pear demacros

Changed files:
    adapter.awk -> 1.467
---

diff --git a/adapter.awk b/adapter.awk
index 06a25f1..ae2337b 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -236,6 +236,8 @@ function b_makekey(a, b,	s) {
 
 	if ($2 ~ /^mod_name$/)
 		mod_name = $3
+	if ($2 ~ /^_?pearname$/)
+		pearname = $3
 
 	sub(/[ \t]+$/, "");
 	# do nothing further, otherwise adapter thinks we're at preamble
@@ -1667,6 +1669,12 @@ function demacroize(str)
 	if (mod_name) {
 		sub("%{mod_name}", mod_name, str);
 	}
+	if (pearname) {
+		sub("%{_pearname}", pearname, str);
+	}
+	if (pearname) {
+		sub("%{pearname}", pearname, str);
+	}
 	if (name) {
 		sub("%{name}", name, str);
 	}