commit 14c93955bf45eaa9ea1f59e7e469ec914cf95e0c
Author: Elan Ruusamäe <[email protected]>
Date: Thu Oct 26 22:22:32 2017 +0300
1.729: omit ruby version from %ruby_ridir
it's been missing for some time, so keep the dir ruby abi independant,
what it i think it is
rpm-build-macros.spec | 2 +-
rpm.macros | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index e8d71a1..4e17fe3 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define rpm_macros_rev 1.728
+%define rpm_macros_rev 1.729
%define find_lang_rev 1.40
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 3438489..50a4d5e 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -988,7 +988,7 @@ fi; \
%ruby_archdir %{expand:%%global ruby_archdir %{__ruby_rbconfig_path
archdir}}%ruby_archdir
%ruby_libdir %{expand:%%global ruby_libdir %{__ruby_rbconfig
rubylibdir}}%ruby_libdir
-%ruby_ridir %{expand:%%global ruby_ridir %(%{__ruby} -r
rbconfig -e 'print File.join(RbConfig::CONFIG["datadir"], "ri",
RbConfig::CONFIG["ruby_version"], "system")' 2>/dev/null || echo
ERROR)}%ruby_ridir
+%ruby_ridir %{expand:%%global ruby_ridir %(%{__ruby} -r
rbconfig -e 'print File.join(RbConfig::CONFIG["datadir"], "ri", "system")'
2>/dev/null || echo ERROR)}%ruby_ridir
%ruby_rubylibdir %{expand:%%global ruby_rubylibdir
%{__ruby_rbconfig_path rubylibdir}}%ruby_rubylibdir
%ruby_vendorarchdir %{expand:%%global ruby_vendorarchdir %{__ruby_rbconfig
vendorarchdir}}%ruby_vendorarchdir
%ruby_vendorlibdir %{expand:%%global ruby_vendorlibdir
%{__ruby_rbconfig_path vendorlibdir}}%ruby_vendorlibdir
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/14c93955bf45eaa9ea1f59e7e469ec914cf95e0c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
