Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ruby3.0 for openSUSE:Factory checked in at 2021-01-30 13:55:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ruby3.0 (Old) and /work/SRC/openSUSE:Factory/.ruby3.0.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ruby3.0" Sat Jan 30 13:55:57 2021 rev:2 rq:866946 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ruby3.0/ruby3.0.changes 2020-12-28 10:29:54.414806073 +0100 +++ /work/SRC/openSUSE:Factory/.ruby3.0.new.28504/ruby3.0.changes 2021-01-30 13:55:58.437985894 +0100 @@ -1,0 +2,6 @@ +Mon Jan 25 18:09:45 UTC 2021 - Marcus Rueckert <[email protected]> + +- add https://github.com/rubygems/rubygems/pull/4317.patch + make sure the gem plugins path does not contain the buildroot + +------------------------------------------------------------------- New: ---- 4317.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby3.0.spec ++++++ --- /var/tmp/diff_new_pack.eatGWd/_old 2021-01-30 13:55:59.233987468 +0100 +++ /var/tmp/diff_new_pack.eatGWd/_new 2021-01-30 13:55:59.233987468 +0100 @@ -1,7 +1,7 @@ # # spec file for package ruby3.0 # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -85,6 +85,7 @@ Source98: series Source99: %{name}-rpmlintrc Patch: use-pie.patch +Patch1: https://github.com/rubygems/rubygems/pull/4317.patch # BuildRequires: ruby-bundled-gems-rpmhelper %if %{with clang} ++++++ 4317.patch ++++++ >From db4157e9aa7b7f720ee06fb866b53ad11879c016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <[email protected]> Date: Mon, 25 Jan 2021 15:40:26 +0100 Subject: [PATCH] Generate plugin wrappers with relative requires It shouldn't change behaviour and it fixes broken wrappers generated with `--build-root` flag is used. --- lib/rubygems/installer_uninstaller_utils.rb | 7 ++++++- test/rubygems/test_gem_installer.rb | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/rubygems/installer_uninstaller_utils.rb b/lib/rubygems/installer_uninstaller_utils.rb index e81ed4cba38..2c8b7c635e1 100644 --- a/lib/rubygems/installer_uninstaller_utils.rb +++ b/lib/rubygems/installer_uninstaller_utils.rb @@ -6,11 +6,16 @@ module Gem::InstallerUninstallerUtils def regenerate_plugins_for(spec, plugins_dir) + plugins = spec.plugins + return if plugins.empty? + + require 'pathname' + spec.plugins.each do |plugin| plugin_script_path = File.join plugins_dir, "#{spec.name}_plugin#{File.extname(plugin)}" File.open plugin_script_path, 'wb' do |file| - file.puts "require '#{plugin}'" + file.puts "require_relative '#{Pathname.new(plugin).relative_path_from(Pathname.new(plugins_dir))}'" end verbose plugin_script_path diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 4ce7e92442a..5652d863316 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -821,6 +821,8 @@ def test_generate_plugins_with_build_root assert !File.exist?(system_path), 'plugin written incorrect written to system plugins_dir' assert File.exist?(build_root_path), 'plugin not written to build_root' + + refute_includes File.read(build_root_path), build_root end def test_keeps_plugins_up_to_date ++++++ series ++++++ --- /var/tmp/diff_new_pack.eatGWd/_old 2021-01-30 13:55:59.305987610 +0100 +++ /var/tmp/diff_new_pack.eatGWd/_new 2021-01-30 13:55:59.305987610 +0100 @@ -1 +1,2 @@ use-pie.patch +4317.patch
