[packages/adapter: 573/631] add new ruby macros

[glen]

commit 6f6aaf495a0f752c580220cb9036884ba0cc6c58
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Apr 3 23:59:17 2013 +0300

    add new ruby macros

 adapter.awk | 19 +++++++++++++++----
 adapter.sh  | 13 +++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index ef7dee8..de99602 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -1098,11 +1098,17 @@ function use_macros()
 	gsub("%{python3_version}", "%{py3_ver}")
 
 	gsub(ruby_archdir, "%{ruby_archdir}")
-	gsub(ruby_ridir, "%{ruby_ridir}")
-	gsub(ruby_rubylibdir, "%{ruby_rubylibdir}")
+	gsub(ruby_libdir, "%{ruby_libdir}")
+
+	gsub(ruby_sitedir, "%{ruby_sitedir}")
 	gsub(ruby_sitearchdir, "%{ruby_sitearchdir}")
 	gsub(ruby_sitelibdir, "%{ruby_sitelibdir}")
+	gsub(ruby_vendordir, "%{ruby_vendordir}")
+	gsub(ruby_vendorarchdir, "%{ruby_vendorarchdir}")
+	gsub(ruby_vendorlibdir, "%{ruby_vendorlibdir}")
+	gsub(ruby_rubylibdir, "%{ruby_rubylibdir}") # deprecated
 	gsub(ruby_rdocdir, "%{ruby_rdocdir}")
+	gsub(ruby_ridir, "%{ruby_ridir}")
 
 	gsub("%{_unitdir}", "%{systemdunitdir}")
 	gsub(systemdunitdir, "%{systemdunitdir}")
@@ -1868,11 +1874,16 @@ function import_rpm_macros(  v) {
 	py3_ver = ENVIRON["py3_ver"]
 
 	ruby_archdir = ENVIRON["ruby_archdir"]
-	ruby_ridir = ENVIRON["ruby_ridir"]
-	ruby_rubylibdir = ENVIRON["ruby_rubylibdir"]
+	ruby_libdir = ENVIRON["ruby_libdir"]
+	ruby_sitedir = ENVIRON["ruby_sitedir"]
 	ruby_sitearchdir = ENVIRON["ruby_sitearchdir"]
 	ruby_sitelibdir = ENVIRON["ruby_sitelibdir"]
+	ruby_vendordir = ENVIRON["ruby_vendordir"]
+	ruby_vendorarchdir = ENVIRON["ruby_vendorarchdir"]
+	ruby_vendorlibdir = ENVIRON["ruby_vendorlibdir"]
+	ruby_rubylibdir = ENVIRON["ruby_rubylibdir"] # deprecated
 	ruby_rdocdir = ENVIRON["ruby_rdocdir"]
+	ruby_ridir = ENVIRON["ruby_ridir"]
 
 	php_pear_dir = ENVIRON["php_pear_dir"]
 	php_data_dir = ENVIRON["php_data_dir"]
diff --git a/adapter.sh b/adapter.sh
index 38881c6..d5c7866 100755
--- a/adapter.sh
+++ b/adapter.sh
@@ -12,11 +12,11 @@
 #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
-REVISION=1.49
+REVISION=1.50
 VERSION="v0.35/$REVISION"
 VERSIONSTRING="\
 Adapter adapts .spec files for PLD Linux.
-$VERSION (C) 1999-2012 Free Penguins".
+$VERSION (C) 1999-2013 Free Penguins".
 
 PROGRAM=${0##*/}
 dir=$(d=$0; [ -L "$d" ] && d=$(readlink -f "$d"); dirname "$d")
@@ -214,11 +214,16 @@ import_rpm_macros() {
 	py3_ver
 
 	ruby_archdir
-	ruby_ridir
-	ruby_rubylibdir
+	ruby_libdir 
+	ruby_sitedir  
 	ruby_sitearchdir
 	ruby_sitelibdir
+	ruby_vendordir 
+	ruby_vendorarchdir
+	ruby_vendorlibdir
+	ruby_rubylibdir
 	ruby_rdocdir
+	ruby_ridir
 
 	php_pear_dir
 	php_data_dir
================================================================

---- gitweb:

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