rpms/ruby
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix RubyGems search paths when building gems with native extension (rhbz#979133).

Browse Source
This commit is contained in:
Vít Ondruch 2013-07-04 14:47:51 +02:00
parent 06a69a4fd9
commit 7a3d8e78c6
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
operating_system.rb
View File

@ -28,7 +28,13 @@ module Gem
# platform independent (:gem_dir) and dependent (:ext_dir) files. # platform independent (:gem_dir) and dependent (:ext_dir) files.
def default_dirs 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| @default_dirs ||= Hash[default_locations.collect do |destination, path|
[destination, { [destination, {
:bin_dir => File.join(path, ConfigMap[:bindir].split(File::SEPARATOR).last), :bin_dir => File.join(path, ConfigMap[:bindir].split(File::SEPARATOR).last),

6
ruby.spec
View File

@ -26,7 +26,7 @@
%endif %endif
%global release 11 %global release 12
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
%global rubygems_version 2.0.3 %global rubygems_version 2.0.3
@ -882,6 +882,10 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib %{ruby_libdir}/tkextlib
%changelog %changelog
* Thu Jul 04 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.247-12
- Fix RubyGems search paths when building gems with native extension
(rhbz#979133).
* Tue Jul 02 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.247-11 * Tue Jul 02 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.247-11
- Fix RubyGems version. - Fix RubyGems version.