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:
Stephan Kulow 2014-09-16 17:50:15 +00:00 committed by Git OBS Bridge
parent 1ccffc1cd9
commit d141f8716a
2 changed files with 14 additions and 2 deletions

View File

@ -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

View File

@ -80,7 +80,7 @@ end
def rubyabi_from_path(path)
m = path.match(%r{.*/([^/]*)/gems/([^/]*)/.*})
# 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
gemspecs = Array.new
@ -103,6 +103,7 @@ end
gemspecs.each do |rubyabi_hash, spec|
rubyabi = rubyabi_hash[:abi]
rubyabi_requires = rubyabi_hash[:requires]
if provides
versions = spec.version.to_s.split('.')
# old forms
@ -122,7 +123,7 @@ gemspecs.each do |rubyabi_hash, spec|
end
if requires
puts "ruby(abi) = #{rubyabi}" if rubyabi
puts rubyabi_requires if rubyabi_requires
puts "rubygems" if rubyabi_hash[:version].to_f < 1.9
spec.runtime_dependencies.each do |dep|
dep.requirement.requirements.each do |r|