fix ruby calls

diff --git a/cmake/modules/FindRuby.cmake b/cmake/modules/FindRuby.cmake
index 17ad7ef22abf3a103524b3e6c53675ec1546cd22..827a7a6530be1e3d4be74030eab4b0f4aff8af82 100644 (file)
--- 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 ad435b9f5c16afb0c80539bb8dfe0d282c2c50f5..8a28e43981b326a27cb8de34014145288c5caa10 100644 (file)
--- 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 934ae2e835cf479c1239fd6d11a4be14b08b95d8..f5581b61a51d747d78ad8209aa62c61e8150aec7 100644 (file)
--- 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