Fix default_dir and default_bindir
Now returns correct paths for dependent scls
This commit is contained in:
parent
3e7fbf24fc
commit
42117fcd3d
|
@ -116,8 +116,11 @@ module Gem
|
||||||
# RubyGems default overrides.
|
# RubyGems default overrides.
|
||||||
|
|
||||||
def default_dir
|
def default_dir
|
||||||
|
scl_prefix = ENV['X_SCLS'].split(' ').detect {|c| c != '@SCL@'}
|
||||||
|
scl_prefix = scl_prefix ? scl_prefix + '_': nil
|
||||||
|
|
||||||
if opt_build_root?
|
if opt_build_root?
|
||||||
Gem.default_dirs[:system][:gem_dir]
|
Gem.default_dirs[:"#{scl_prefix}system"][:gem_dir]
|
||||||
elsif Process.uid == 0
|
elsif Process.uid == 0
|
||||||
Gem.default_dirs[:local][:gem_dir]
|
Gem.default_dirs[:local][:gem_dir]
|
||||||
else
|
else
|
||||||
|
@ -131,8 +134,11 @@ module Gem
|
||||||
end
|
end
|
||||||
|
|
||||||
def default_bindir
|
def default_bindir
|
||||||
|
scl_prefix = ENV['X_SCLS'].split(' ').detect {|c| c != '@SCL@'}
|
||||||
|
scl_prefix = scl_prefix ? scl_prefix + '_': nil
|
||||||
|
|
||||||
if opt_build_root?
|
if opt_build_root?
|
||||||
Gem.default_dirs[:system][:bin_dir]
|
Gem.default_dirs[:"#{scl_prefix}system"][:bin_dir]
|
||||||
elsif Process.uid == 0
|
elsif Process.uid == 0
|
||||||
Gem.default_dirs[:local][:bin_dir]
|
Gem.default_dirs[:local][:bin_dir]
|
||||||
else
|
else
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
%global ruby_archive %{ruby_archive}-%{?milestone}%{?!milestone:%{?revision:r%{revision}}}
|
%global ruby_archive %{ruby_archive}-%{?milestone}%{?!milestone:%{?revision:r%{revision}}}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global release 57
|
%global release 58
|
||||||
%{!?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}}
|
||||||
|
|
||||||
# The RubyGems library has to stay out of Ruby directory three, since the
|
# 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
|
%{ruby_libdir}/tkextlib
|
||||||
|
|
||||||
%changelog
|
%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
|
* Fri Feb 19 2016 Pavel Valena <pvalena@redhat.com> - 2.3.0-57
|
||||||
- Fix dependent scls's paths
|
- Fix dependent scls's paths
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue