From 91ba31bd1ca893d6901bb602ff2bd976e3c3c766 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 15 Nov 2024 15:07:10 +0900 Subject: [PATCH] Fix for ruby34 string behavior to be chilled --- ...core-3.13.2-issue3123-ruby34-string-chilled.patch | 12 ++++++++++++ rubygem-rspec-core.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch diff --git a/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch b/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch new file mode 100644 index 0000000..2ab514d --- /dev/null +++ b/rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch @@ -0,0 +1,12 @@ +diff -urp -x examples.txt '--exclude=*~' rspec-core-3.13.2.orig/lib/rspec/core/drb.rb rspec-core-3.13.2/lib/rspec/core/drb.rb +--- rspec-core-3.13.2.orig/lib/rspec/core/drb.rb 2024-10-21 14:23:30.000000000 +0900 ++++ rspec-core-3.13.2/lib/rspec/core/drb.rb 2024-11-15 14:48:52.388539773 +0900 +@@ -91,7 +91,7 @@ module RSpec + def add_filter(argv, name, hash) + hash.each_pair do |k, v| + next if CONDITIONAL_FILTERS.include?(k) +- tag = name == :inclusion ? k.to_s : "~#{k}".dup ++ tag = name == :inclusion ? k.to_s.dup : "~#{k}".dup + tag << ":#{v}" if v.is_a?(String) + argv << "--tag" << tag + end unless hash.empty? diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index 8c33193..fd6b76f 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -3,7 +3,7 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global baserelease 2 +%global baserelease 3 %global gem_name rspec-core @@ -36,6 +36,9 @@ Source2: rspec-related-create-full-tarball.sh # Adjust backtrace filter for Fedora placement of StdLib. # https://github.com/rspec/rspec-core/pull/2881 Patch0: rubygem-rspec-core-3.10.1-Filter-content-of-usr-share-ruby.patch +# https://github.com/rspec/rspec-core/issues/3123 +# <- by https://github.com/ruby/ruby/pull/12065 +Patch1: rspec-core-3.13.2-issue3123-ruby34-string-chilled.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -90,6 +93,7 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 %patch -P0 -p1 +%patch -P1 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build @@ -209,6 +213,9 @@ done %{gem_docdir} %changelog +* Fri Nov 15 2024 Mamoru TASAKA - 3.13.2-3 +- Fix for ruby34 string behavior to be chilled + * Wed Nov 06 2024 Mamoru TASAKA - 3.13.2-2 - add BR: rubygem(drb) for ruby34