From: Stephan Kulow <coolo@suse.de>
Date: Tue, 5 May 2015 15:27:34 +0000 (+0200)
Subject: fix ruby calls
X-Git-Tag: 0.6.11~32^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F82%2Fhead;p=thirdparty%2Flibsolv.git

fix ruby calls
---

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