diff --git a/rspec-expectations-3.7.0-aggregator-ruby25.patch b/rspec-expectations-3.7.0-aggregator-ruby25.patch deleted file mode 100644 index feeddb0..0000000 --- a/rspec-expectations-3.7.0-aggregator-ruby25.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5999ad46df4782a3136c4bad0c2353daede2cbbd Mon Sep 17 00:00:00 2001 -From: Myron Marston -Date: Sat, 30 Dec 2017 17:36:55 -0800 -Subject: [PATCH] Disable Ruby 2.5 feature to avoid test failures on 2.5. - ---- - spec/rspec/expectations/failure_aggregator_spec.rb | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/spec/rspec/expectations/failure_aggregator_spec.rb b/spec/rspec/expectations/failure_aggregator_spec.rb -index 6628aa75..40a1ae35 100644 ---- a/spec/rspec/expectations/failure_aggregator_spec.rb -+++ b/spec/rspec/expectations/failure_aggregator_spec.rb -@@ -216,6 +216,19 @@ def expect_error_included_in_aggregated_failure(error) - end - - context "when an expectation failure happens in another thread" do -+ # On Ruby 2.5+, the new `report_on_exception` causes the errors in the threads -+ # to print warnings, which our rspec-support test harness converts into a test -+ # failure since we want to enforce warnings-free code. To prevent the warning, -+ # we need to disable the setting here. -+ if Thread.respond_to?(:report_on_exception) -+ around do |example| -+ orig = Thread.report_on_exception -+ Thread.report_on_exception = false -+ example.run -+ Thread.report_on_exception = orig -+ end -+ end -+ - it "includes the failure in the failures array if there are other failures" do - expect { - aggregate_failures do diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index f98a9b9..6c71300 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -1,9 +1,9 @@ -%global majorver 3.7.0 +%global majorver 3.8.2 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 3 +%global fedorarel 0.1 %global gem_name rspec-expectations @@ -14,7 +14,7 @@ Summary: RSpec expectations (should and matchers) Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.2 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} Group: Development/Languages License: MIT @@ -23,9 +23,6 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{fullver}.gem # %%{SOURCE2} %%{name} %%{version} Source1: rubygem-%{gem_name}-%{version}-full.tar.gz Source2: rspec-related-create-full-tarball.sh -# https://github.com/rspec/rspec-expectations/pull/1037 -# https://github.com/rspec/rspec-expectations/commit/5999ad46df4782a3136c4bad0c2353daede2cbbd.patch -Patch1: rspec-expectations-3.7.0-aggregator-ruby25.patch #BuildRequires: ruby(release) BuildRequires: rubygems-devel @@ -51,7 +48,6 @@ This package contains documentation for %{name}. %prep %setup -q -T -n %{gem_name}-%{version} -b 1 -%patch1 -p1 gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec @@ -89,6 +85,10 @@ ruby -rrubygems -Ilib/ -S rspec spec/ %{gem_docdir} %changelog +* Wed Dec 12 2018 Mamoru TASAKA - 3.8.2-0.1 +- 3.8.2 +- Once disable test for bootstrap + * Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 3.7.0-3.2 - Use C.UTF-8 locale See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot