diff --git a/ruby-common.changes b/ruby-common.changes index 44fa335..1df1bcf 100644 --- a/ruby-common.changes +++ b/ruby-common.changes @@ -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 diff --git a/rubygemsdeps.rb b/rubygemsdeps.rb index 8bdea22..4320106 100644 --- a/rubygemsdeps.rb +++ b/rubygemsdeps.rb @@ -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|