From 7a3d8e78c6b0721c10cdc04559a972588aa02c4d Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Jul 04 2013 12:47:55 +0000 Subject: Fix RubyGems search paths when building gems with native extension (rhbz#979133). --- diff --git a/operating_system.rb b/operating_system.rb index 4055ed5..c3b19d6 100644 --- a/operating_system.rb +++ b/operating_system.rb @@ -28,7 +28,13 @@ module Gem # platform independent (:gem_dir) and dependent (:ext_dir) files. def default_dirs - @libdir ||= ConfigMap[:sitelibdir] == ConfigMap[:sitearchdir] ? ConfigMap[:datadir] : ConfigMap[:libdir] + @libdir ||= case RUBY_PLATFORM + when 'java' + ConfigMap[:datadir] + else + ConfigMap[:libdir] + end + @default_dirs ||= Hash[default_locations.collect do |destination, path| [destination, { :bin_dir => File.join(path, ConfigMap[:bindir].split(File::SEPARATOR).last), diff --git a/ruby.spec b/ruby.spec index 951038f..cd3c735 100644 --- a/ruby.spec +++ b/ruby.spec @@ -26,7 +26,7 @@ %endif -%global release 11 +%global release 12 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} %global rubygems_version 2.0.3 @@ -882,6 +882,10 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog +* Thu Jul 04 2013 Vít Ondruch - 2.0.0.247-12 +- Fix RubyGems search paths when building gems with native extension + (rhbz#979133). + * Tue Jul 02 2013 Vít Ondruch - 2.0.0.247-11 - Fix RubyGems version.