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

Fix default_dir and default_bindir

Browse Source 
Now returns correct paths for dependent scls
This commit is contained in:
Pavel Valena 2016-02-19 21:22:02 +01:00
parent 3e7fbf24fc
commit 42117fcd3d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
operating_system.rb
View File

@ -116,8 +116,11 @@ module Gem
# RubyGems default overrides.
def default_dir
scl_prefix = ENV['X_SCLS'].split(' ').detect {|c| c != '@SCL@'}
scl_prefix = scl_prefix ? scl_prefix + '_': nil
if opt_build_root?
Gem.default_dirs[:system][:gem_dir]
Gem.default_dirs[:"#{scl_prefix}system"][:gem_dir]
elsif Process.uid == 0
Gem.default_dirs[:local][:gem_dir]
else
@ -131,8 +134,11 @@ module Gem
end
def default_bindir
scl_prefix = ENV['X_SCLS'].split(' ').detect {|c| c != '@SCL@'}
scl_prefix = scl_prefix ? scl_prefix + '_': nil
if opt_build_root?
Gem.default_dirs[:system][:bin_dir]
Gem.default_dirs[:"#{scl_prefix}system"][:bin_dir]
elsif Process.uid == 0
Gem.default_dirs[:local][:bin_dir]
else

5
ruby.spec
View File

@ -23,7 +23,7 @@
%global ruby_archive %{ruby_archive}-%{?milestone}%{?!milestone:%{?revision:r%{revision}}}
%endif
%global release 57
%global release 58
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
# The RubyGems library has to stay out of Ruby directory three, since the
@ -960,6 +960,9 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
* Fri Feb 19 2016 Pavel Valena <pvalena@redhat.com> - 2.3.0-58
- Fix default_dir and default_bindir
* Fri Feb 19 2016 Pavel Valena <pvalena@redhat.com> - 2.3.0-57
- Fix dependent scls's paths