diff --git a/rubygem-rspec-core-2.8.0-skip-some-tests.patch b/rubygem-rspec-core-2.11.1-skip-some-tests.patch similarity index 78% rename from rubygem-rspec-core-2.8.0-skip-some-tests.patch rename to rubygem-rspec-core-2.11.1-skip-some-tests.patch index 3bab4f5..eb235a6 100644 --- a/rubygem-rspec-core-2.8.0-skip-some-tests.patch +++ b/rubygem-rspec-core-2.11.1-skip-some-tests.patch @@ -1,5 +1,5 @@ ---- rspec-core-2.8.0/spec/spec_helper.rb.debug 2012-01-22 07:08:34.000000000 +0900 -+++ rspec-core-2.8.0/spec/spec_helper.rb 2012-01-22 07:45:55.000000000 +0900 +--- rspec-core-2.11.1/spec/spec_helper.rb.orig 2012-10-11 17:43:44.550615644 +0900 ++++ rspec-core-2.11.1/spec/spec_helper.rb 2012-10-11 17:45:57.631226844 +0900 @@ -17,10 +17,10 @@ Spork.prefork do require 'rspec/autorun' @@ -14,10 +14,10 @@ class NullObject private -@@ -70,16 +70,16 @@ - # structural - c.alias_it_should_behave_like_to 'it_has_behavior' +@@ -71,15 +71,15 @@ + c.alias_it_behaves_like_to 'it_has_behavior' c.around {|example| sandboxed { example.run }} + c.include(RSpecHelpers) - c.include Aruba::Api, :example_group => { - :file_path => /spec\/command_line/ - } @@ -29,7 +29,6 @@ c.treat_symbols_as_metadata_keys_with_true_values = true c.color = !in_editor? c.filter_run :focus - c.filter_run :foo - c.include FakeFS::SpecHelpers, :fakefs + #c.include FakeFS::SpecHelpers, :fakefs c.run_all_when_everything_filtered = true diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index c6f064b..50778ef 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,5 +1,5 @@ %global gemdir %{gem_dir} -%global majorver 2.8.0 +%global majorver 2.11.1 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -14,24 +14,21 @@ # %%check section needs rspec-core, however rspec-core depends on rspec-mocks # runtime part of rspec-mocks does not depend on rspec-core -%global need_bootstrap_set 1 -%if 0%{?fedora} >= 15 %global need_bootstrap_set 0 -%endif %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} Summary: Rspec-2 runner and formatters Name: rubygem-%{gemname} Version: %{majorver} -Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 +Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} Group: Development/Languages License: MIT URL: http://github.com/rspec/rspec-mocks Source0: http://rubygems.org/gems/%{gemname}-%{fullver}.gem # Skip some tests -Patch0: rubygem-rspec-core-2.8.0-skip-some-tests.patch +Patch0: rubygem-rspec-core-2.11.1-skip-some-tests.patch BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: rubygems-devel @@ -42,8 +39,10 @@ BuildRequires: rubygem(rspec-expectations) BuildRequires: rubygem(rspec-mocks) %endif Requires: ruby(abi) = %{rubyabi} -Requires: rubygem(rspec-expectations) -Requires: rubygem(rspec-mocks) +# When killing the below dependency, a notification to mailing list +# is needed +#Requires: rubygem(rspec-expectations) +#Requires: rubygem(rspec-mocks) # Make the following installed by default # lib/rspec/core/rake_task Requires: rubygem(rake) @@ -89,11 +88,14 @@ grep -rl '^#![ \t]*/usr/bin' ./lib| \ xargs sed -i -e '\@^#![ \t]*/usr/bin@d' # Until rspec is updated, lets install rspec.rb +# Kill below +%if 0 cat > lib/rspec.rb < - 2.11.1-1 +- 2.11.1 +- Drop dependency for mocks and expectations + * Sat Jul 21 2012 Fedora Release Engineering - 2.8.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild