1.696 add %ruby_abi macro

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 9493c78183f7d15fc6ae99c92b99b39b3485bdc5..7a83f840579620f6d69d23dd73a5e622dd19a211 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.695
+%define                rpm_macros_rev  1.696
 %define                find_lang_rev   1.36
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index 452ca977ba85f7265c7e6b79d69ccc1c800f832b..27d12620d8a84306a91d3440d9d3cec78d216b29 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -929,6 +929,10 @@ fi; \
 # Ruby
 %__ruby                                /usr/bin/ruby
 
+# Ruby ABI version
+# NOTE: %ruby_version may be empty, depending how Ruby was built
+%ruby_abi                      %{expand:%%global ruby_abi %(%{__ruby} -r rbconfig -e 'print [RbConfig::CONFIG["MAJOR"], RbConfig::CONFIG["MINOR"]].join(".")' 2>/dev/null || echo ERROR)}%ruby_abi
+
 # get rbconfig parameter
 %__ruby_rbconfig()     %(%{__ruby} -r rbconfig -e 'print RbConfig::CONFIG["%1"]' 2>/dev/null || echo ERROR)
 %__ruby_rbconfig_path()        %(%{__ruby} -r rbconfig -r pathname -e 'print Pathname(RbConfig::CONFIG["%1"]).cleanpath' 2>/dev/null || echo ERROR)