Hello community, here is the log from the commit of package rubygem-rake-compiler for openSUSE:Factory checked in at 2016-06-29 15:10:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-rake-compiler (Old) and /work/SRC/openSUSE:Factory/.rubygem-rake-compiler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-rake-compiler" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-rake-compiler/rubygem-rake-compiler.changes 2016-05-29 03:13:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-rake-compiler.new/rubygem-rake-compiler.changes 2016-06-29 15:10:39.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Jun 21 04:37:05 UTC 2016 - coolo@suse.com + +- updated to version 1.0.1 + see installed History.txt + + === 1.0.1 / 2016-06-21 + + * Bugfixes: + * Add missing dependency. + + === 1.0.0 / 2016-06-21 + + * Enhancements: + * Really support extension in sub directory. + +------------------------------------------------------------------- Old: ---- rake-compiler-0.9.9.gem New: ---- rake-compiler-1.0.1.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-rake-compiler.spec ++++++ --- /var/tmp/diff_new_pack.eqo5Pw/_old 2016-06-29 15:10:40.000000000 +0200 +++ /var/tmp/diff_new_pack.eqo5Pw/_new 2016-06-29 15:10:40.000000000 +0200 @@ -24,7 +24,7 @@ # Name: rubygem-rake-compiler -Version: 0.9.9 +Version: 1.0.1 Release: 0 %define mod_name rake-compiler %define mod_full_name %{mod_name}-%{version} ++++++ rake-compiler-0.9.9.gem -> rake-compiler-1.0.1.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/History.txt new/History.txt --- old/History.txt 2016-05-10 04:37:07.000000000 +0200 +++ new/History.txt 2016-06-20 18:37:08.000000000 +0200 @@ -1,3 +1,13 @@ +=== 1.0.1 / 2016-06-21 + +* Bugfixes: + * Add missing dependency. + +=== 1.0.0 / 2016-06-21 + +* Enhancements: + * Really support extension in sub directory. + === 0.9.9 / 2016-05-10 * Bugfixes: Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rake/baseextensiontask.rb new/lib/rake/baseextensiontask.rb --- old/lib/rake/baseextensiontask.rb 2016-05-10 04:37:07.000000000 +0200 +++ new/lib/rake/baseextensiontask.rb 2016-06-20 18:37:08.000000000 +0200 @@ -68,7 +68,7 @@ else RbConfig::CONFIG['DLEXT'] end - "#{File.basename(@name)}.#{ext}" + "#{@name}.#{ext}" end def source_files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/rake/extensiontask.rb new/lib/rake/extensiontask.rb --- old/lib/rake/extensiontask.rb 2016-05-10 04:37:07.000000000 +0200 +++ new/lib/rake/extensiontask.rb 2016-06-20 18:37:08.000000000 +0200 @@ -110,16 +110,23 @@ # platform usage platf = for_platform || platform + binary_path = binary(platf) + # lib_path lib_path = lib_dir - if @name.include?('/') - lib_path += "/#{File.dirname(@name)}" - end + + lib_binary_path = "#{lib_path}/#{binary_path}" + lib_binary_dir_path = File.dirname(lib_binary_path) # tmp_path tmp_path = "#{@tmp_dir}/#{platf}/#{@name}/#{ruby_ver}" stage_path = "#{@tmp_dir}/#{platf}/stage" + tmp_binary_path = "#{tmp_path}/#{binary_path}" + tmp_binary_dir_path = File.dirname(tmp_binary_path) + stage_binary_path = "#{stage_path}/#{lib_path}/#{binary_path}" + stage_binary_dir_path = File.dirname(stage_binary_path) + # cleanup and clobbering CLEAN.include(tmp_path) CLEAN.include(stage_path) @@ -128,17 +135,18 @@ # directories we need directory tmp_path - directory "#{stage_path}/#{lib_path}" - directory lib_dir + directory tmp_binary_dir_path + directory lib_binary_dir_path + directory stage_binary_dir_path # copy binary from temporary location to final lib # tmp/extension_name/extension_name.{so,bundle} => lib/ - task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_path, "#{tmp_path}/#{binary(platf)}"] do - install "#{tmp_path}/#{binary(platf)}", "#{lib_path}/#{binary(platf)}" + task "copy:#{@name}:#{platf}:#{ruby_ver}" => [lib_binary_dir_path, tmp_binary_path] do + install tmp_binary_path, "#{lib_path}/#{binary_path}" end # copy binary from temporary location to staging directory - task "copy:#{@name}:#{platf}:#{ruby_ver}" => ["#{stage_path}/#{lib_path}", "#{tmp_path}/#{binary(platf)}"] do - cp "#{tmp_path}/#{binary(platf)}", "#{stage_path}/#{lib_path}/#{binary(platf)}" + task "copy:#{@name}:#{platf}:#{ruby_ver}" => [stage_binary_dir_path, tmp_binary_path] do + cp tmp_binary_path, stage_binary_path end # copy other gem files to staging directory @@ -146,7 +154,7 @@ # binary in temporary folder depends on makefile and source files # tmp/extension_name/extension_name.{so,bundle} - file "#{tmp_path}/#{binary(platf)}" => ["#{tmp_path}/Makefile"] + source_files do + file tmp_binary_path => [tmp_binary_dir_path, "#{tmp_path}/Makefile"] + source_files do jruby_compile_msg = <<-EOF Compiling a native C extension on JRuby. This is discouraged and a Java extension should be preferred. @@ -155,6 +163,9 @@ chdir tmp_path do sh make + if binary_path != File.basename(binary_path) + cp File.basename(binary_path), binary_path + end end end @@ -214,7 +225,7 @@ # platform matches the indicated one. if platf == RUBY_PLATFORM then # ensure file is always copied - file "#{lib_path}/#{binary(platf)}" => ["copy:#{name}:#{platf}:#{ruby_ver}"] + file "#{lib_path}/#{binary_path}" => ["copy:#{name}:#{platf}:#{ruby_ver}"] task "compile:#{@name}" => ["compile:#{@name}:#{platf}"] task "compile" => ["compile:#{platf}"] @@ -297,7 +308,7 @@ end # add binaries to the dependency chain - task "native:#{@gem_spec.name}:#{platf}" => ["#{stage_path}/#{lib_dir}/#{binary(platf)}"] + task "native:#{@gem_spec.name}:#{platf}" => ["#{stage_path}/#{lib_path}/#{binary(platf)}"] # ensure the extension get copied unless Rake::Task.task_defined?("#{lib_path}/#{binary(platf)}") then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2016-05-10 04:37:07.000000000 +0200 +++ new/metadata 2016-06-20 18:37:08.000000000 +0200 @@ -1,7 +1,7 @@ --- !ruby/object:Gem::Specification name: rake-compiler version: !ruby/object:Gem::Version - version: 0.9.9 + version: 1.0.1 platform: ruby authors: - Kouhei Sutou @@ -9,7 +9,7 @@ autorequire: bindir: bin cert_chain: [] -date: 2016-05-10 00:00:00.000000000 Z +date: 2016-06-20 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec/lib/rake/extensiontask_spec.rb new/spec/lib/rake/extensiontask_spec.rb --- old/spec/lib/rake/extensiontask_spec.rb 2016-05-10 04:37:07.000000000 +0200 +++ new/spec/lib/rake/extensiontask_spec.rb 2016-06-20 18:37:08.000000000 +0200 @@ -314,21 +314,21 @@ end end - context 'tmp/{platform}/prefix1/prefix2/extension_one/{ruby_ver}/extension_one.{so,bundle}' do + context 'tmp/{platform}/prefix1/prefix2/extension_one/{ruby_ver}/prefix1/prefix2/extension_one.{so,bundle}' do it 'should define as task' do - Rake::Task.task_defined?("tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/#{@ext_bin}").should be_true + Rake::Task.task_defined?("tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/prefix1/prefix2/#{@ext_bin}").should be_true end it "should depend on 'tmp/{platform}/prefix1/prefix2/extension_one/{ruby_ver}/Makefile'" do - Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/#{@ext_bin}"].prerequisites.should include("tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/Makefile") + Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/prefix1/prefix2/#{@ext_bin}"].prerequisites.should include("tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/Makefile") end it "should depend on 'ext/extension_one/source.c'" do - Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/#{@ext_bin}"].prerequisites.should include("ext/prefix1/prefix2/extension_one/source.c") + Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/prefix1/prefix2/#{@ext_bin}"].prerequisites.should include("ext/prefix1/prefix2/extension_one/source.c") end it "should not depend on 'ext/extension_one/source.h'" do - Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/#{@ext_bin}"].prerequisites.should_not include("ext/prefix1/prefix2/extension_one/source.h") + Rake::Task["tmp/#{@platform}/prefix1/prefix2/extension_one/#{@ruby_ver}/prefix1/prefix2/#{@ext_bin}"].prerequisites.should_not include("ext/prefix1/prefix2/extension_one/source.h") end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tasks/gem.rake new/tasks/gem.rake --- old/tasks/gem.rake 2016-05-10 04:37:07.000000000 +0200 +++ new/tasks/gem.rake 2016-06-20 18:37:08.000000000 +0200 @@ -3,7 +3,7 @@ GEM_SPEC = Gem::Specification.new do |s| # basic information s.name = "rake-compiler" - s.version = "0.9.9" + s.version = "1.0.1" s.platform = Gem::Platform::RUBY # description and details