Accepting request 249617 from home:darix:ruby
- the ruby(abi) = $interpreter:$abiversion was not a good idea. rpm treats the $interpreter part as epoch. instead we use now: $interpreter(abi) = $abiversion For MRI it means we are basically back to ruby(abi). Examples for alternative ruby interpreters are rubinius(abi) and jruby(abi) (bnc#896658) OBS-URL: https://build.opensuse.org/request/show/249617 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/ruby-common?expand=0&rev=71
This commit is contained in:
parent
1ccffc1cd9
commit
d141f8716a
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Sep 15 14:31:22 UTC 2014 - mrueckert@suse.de
|
||||||
|
|
||||||
|
- the ruby(abi) = $interpreter:$abiversion was not a good idea. rpm
|
||||||
|
treats the $interpreter part as epoch. instead we use now:
|
||||||
|
$interpreter(abi) = $abiversion
|
||||||
|
|
||||||
|
For MRI it means we are basically back to ruby(abi).
|
||||||
|
Examples for alternative ruby interpreters are rubinius(abi) and
|
||||||
|
jruby(abi) (bnc#896658)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Sep 8 13:03:41 UTC 2014 - mrueckert@suse.de
|
Mon Sep 8 13:03:41 UTC 2014 - mrueckert@suse.de
|
||||||
|
|
||||||
|
@ -80,7 +80,7 @@ end
|
|||||||
def rubyabi_from_path(path)
|
def rubyabi_from_path(path)
|
||||||
m = path.match(%r{.*/([^/]*)/gems/([^/]*)/.*})
|
m = path.match(%r{.*/([^/]*)/gems/([^/]*)/.*})
|
||||||
# return m ? m[1] : RbConfig::CONFIG["ruby_version"]
|
# return m ? m[1] : RbConfig::CONFIG["ruby_version"]
|
||||||
return { :interpreter => m[1], :version => m[2], :abi => "#{m[1]}:#{m[2]}" }
|
return { :interpreter => m[1], :version => m[2], :abi => "#{m[1]}:#{m[2]}", :requires => "#{m[1]}(abi) = #{m[2]}" }
|
||||||
end
|
end
|
||||||
|
|
||||||
gemspecs = Array.new
|
gemspecs = Array.new
|
||||||
@ -103,6 +103,7 @@ end
|
|||||||
|
|
||||||
gemspecs.each do |rubyabi_hash, spec|
|
gemspecs.each do |rubyabi_hash, spec|
|
||||||
rubyabi = rubyabi_hash[:abi]
|
rubyabi = rubyabi_hash[:abi]
|
||||||
|
rubyabi_requires = rubyabi_hash[:requires]
|
||||||
if provides
|
if provides
|
||||||
versions = spec.version.to_s.split('.')
|
versions = spec.version.to_s.split('.')
|
||||||
# old forms
|
# old forms
|
||||||
@ -122,7 +123,7 @@ gemspecs.each do |rubyabi_hash, spec|
|
|||||||
end
|
end
|
||||||
|
|
||||||
if requires
|
if requires
|
||||||
puts "ruby(abi) = #{rubyabi}" if rubyabi
|
puts rubyabi_requires if rubyabi_requires
|
||||||
puts "rubygems" if rubyabi_hash[:version].to_f < 1.9
|
puts "rubygems" if rubyabi_hash[:version].to_f < 1.9
|
||||||
spec.runtime_dependencies.each do |dep|
|
spec.runtime_dependencies.each do |dep|
|
||||||
dep.requirement.requirements.each do |r|
|
dep.requirement.requirements.each do |r|
|
||||||
|
Loading…
Reference in New Issue
Block a user