From a517c92640855610a63aeb9371105129e698e649 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 3 Apr 2013 23:59:17 +0300 Subject: [PATCH] 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 -- 2.44.0