From: Elan Ruusamäe <glen@delfi.ee>
Date: Sat, 26 Oct 2013 16:30:29 +0000 (+0300)
Subject: adapter: recognize ruby_specdir macro
X-Git-Tag: auto/th/adapter-1.514-1~51
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fadapter.git;a=commitdiff_plain;h=6458b80bcaa7fafd07f7dc3e996f92b4c32829ef

adapter: recognize ruby_specdir macro
---

diff --git a/adapter.awk b/adapter.awk
index 57f1e63..cd6e688 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -1114,6 +1114,7 @@ function use_macros()
 	gsub(ruby_rubylibdir, "%{ruby_rubylibdir}") # deprecated
 	gsub(ruby_rdocdir, "%{ruby_rdocdir}")
 	gsub(ruby_ridir, "%{ruby_ridir}")
+	gsub(ruby_specdir, "%{ruby_specdir}")
 
 	gsub("%{_unitdir}", "%{systemdunitdir}")
 	gsub(systemdunitdir, "%{systemdunitdir}")
@@ -1840,7 +1841,7 @@ function import_rpm_macros(  v) {
 	}
 
 	# update this version dep each time some new macro export is added
-	v = 1.49
+	v = 1.51
 	if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < v) {
 		printf("adapter shell script is outdated: Need %s, got %s. Please update it.\n", v, ENVIRON["ADAPTER_REVISION"]) > "/dev/stderr"
 		do_not_touch_anything = 1
@@ -1895,6 +1896,7 @@ function import_rpm_macros(  v) {
 	ruby_rubylibdir = ENVIRON["ruby_rubylibdir"] # deprecated
 	ruby_rdocdir = ENVIRON["ruby_rdocdir"]
 	ruby_ridir = ENVIRON["ruby_ridir"]
+	ruby_specdir = ENVIRON["ruby_specdir"]
 
 	php_pear_dir = ENVIRON["php_pear_dir"]
 	php_data_dir = ENVIRON["php_data_dir"]
diff --git a/adapter.sh b/adapter.sh
index d5c7866..761eeb9 100755
--- a/adapter.sh
+++ b/adapter.sh
@@ -12,7 +12,7 @@
 #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-REVISION=1.50
+REVISION=1.51
 VERSION="v0.35/$REVISION"
 VERSIONSTRING="\
 Adapter adapts .spec files for PLD Linux.
@@ -224,6 +224,7 @@ import_rpm_macros() {
 	ruby_rubylibdir
 	ruby_rdocdir
 	ruby_ridir
+	ruby_specdir
 
 	php_pear_dir
 	php_data_dir