From 4246ab562a67880466e3b8a71ba4ffc5bdb3690c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 26 Jun 2014 12:17:27 +0900 Subject: [PATCH] Force to use minitest 4.x, 5.x is too dangerous now --- rubygem-rspec-expectations.spec | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec index ac980d7..1bf4198 100644 --- a/rubygem-rspec-expectations.spec +++ b/rubygem-rspec-expectations.spec @@ -3,10 +3,18 @@ %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} -%global fedorarel 1 +%global fedorarel 2 %global gem_name rspec-expectations +# It is too dangerous to use minitest >= 5 on rspec-expections-2.14.x... +# e5102884716f8bc1b4e8f0fe0b2b7c4dd1d04734 ... too big +%if 0%{?fedora} >= 21 +%global gem_minitest rubygem(minitest4) +%else +%global gem_minitest rubygem(minitest) +%endif + # %%check section needs rspec-core, however rspec-core depends on rspec-expectations # runtime part of rspec-expectaions does not depend on rspec-core @@ -17,7 +25,7 @@ Summary: Rspec-2 expectations (should and matchers) Name: rubygem-%{gem_name} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} Group: Development/Languages License: MIT @@ -28,7 +36,7 @@ BuildRequires: ruby(release) BuildRequires: rubygems-devel %if 0%{?need_bootstrap} < 1 BuildRequires: rubygem(rspec) -BuildRequires: rubygem(minitest) +BuildRequires: %gem_minitest %endif Requires: ruby(release) Requires: rubygem(diff-lcs) @@ -80,6 +88,7 @@ rm -f %{buildroot}%{gem_instdir}/{.document,.gitignore,.travis.yml,.yardopts} %check LANG=en_US.UTF-8 pushd .%{gem_instdir} +export RUBYLIB=$(gem which minitest/parallel_each -a | grep minitest-4 | sed -e 's|/minitest/parallel.*$||') ruby -rubygems -Ilib/ -S rspec spec/ popd %endif @@ -103,6 +112,9 @@ popd %exclude %{gem_instdir}/spec/ %changelog +* Thu Jun 26 2014 Mamoru TASAKA - 2.14.5-2 +- Force to use minitest 4.x, 5.x is too dangerous now + * Sun Jun 08 2014 Fedora Release Engineering - 2.14.5-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild