From 1928f1a2f8e367e8cdbff6127ba4be7093e44c12 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 5 May 2015 17:27:34 +0200 Subject: [PATCH] fix ruby calls --- cmake/modules/FindRuby.cmake | 2 +- package/libsolv.changes | 5 +++++ package/libsolv.spec.in | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindRuby.cmake b/cmake/modules/FindRuby.cmake index 17ad7ef2..827a7a65 100644 --- a/cmake/modules/FindRuby.cmake +++ b/cmake/modules/FindRuby.cmake @@ -112,7 +112,7 @@ IF(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR) _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) # vendor_ruby available ? - EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print 'true' unless Config::CONFIG['vendorarchdir'].nil?" + EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print 'true' unless RbConfig::CONFIG['vendorarchdir'].nil?" OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) IF(RUBY_HAS_VENDOR_RUBY) diff --git a/package/libsolv.changes b/package/libsolv.changes index ad435b9f..8a28e439 100644 --- a/package/libsolv.changes +++ b/package/libsolv.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 2 11:44:08 UTC 2015 - mrueckert@suse.de + +- you really want to use rbconfig there + ------------------------------------------------------------------- Wed Mar 18 11:04:34 CET 2015 - mls@suse.de diff --git a/package/libsolv.spec.in b/package/libsolv.spec.in index 934ae2e8..f5581b61 100644 --- a/package/libsolv.spec.in +++ b/package/libsolv.spec.in @@ -64,7 +64,7 @@ BuildRequires: perl-devel BuildRequires: swig %endif %if %{with ruby_binding} -%global ruby_vendorarch %(ruby -r rbconfig -e "puts Config::CONFIG['vendorarchdir'].nil? ? Config::CONFIG['sitearchdir'] : Config::CONFIG['vendorarchdir']") +%global ruby_vendorarch %(ruby -r rbconfig -e "puts RbConfig::CONFIG['vendorarchdir'].nil? ? RbConfig::CONFIG['sitearchdir'] : RbConfig::CONFIG['vendorarchdir']") BuildRequires: ruby BuildRequires: ruby-devel BuildRequires: swig -- 2.47.2