- Drop dependency for mocks and expectations
This commit is contained in:
TASAKA Mamoru 2012-10-11 18:15:42 +09:00
parent 9409c43d4e
commit a1bc85794e
2 changed files with 20 additions and 15 deletions

View File

@ -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.11.1/spec/spec_helper.rb.orig 2012-10-11 17:43:44.550615644 +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 2012-10-11 17:45:57.631226844 +0900
@@ -17,10 +17,10 @@ @@ -17,10 +17,10 @@
Spork.prefork do Spork.prefork do
require 'rspec/autorun' require 'rspec/autorun'
@ -14,10 +14,10 @@
class NullObject class NullObject
private private
@@ -70,16 +70,16 @@ @@ -71,15 +71,15 @@
# structural c.alias_it_behaves_like_to 'it_has_behavior'
c.alias_it_should_behave_like_to 'it_has_behavior'
c.around {|example| sandboxed { example.run }} c.around {|example| sandboxed { example.run }}
c.include(RSpecHelpers)
- c.include Aruba::Api, :example_group => { - c.include Aruba::Api, :example_group => {
- :file_path => /spec\/command_line/ - :file_path => /spec\/command_line/
- } - }
@ -29,7 +29,6 @@
c.treat_symbols_as_metadata_keys_with_true_values = true c.treat_symbols_as_metadata_keys_with_true_values = true
c.color = !in_editor? c.color = !in_editor?
c.filter_run :focus c.filter_run :focus
c.filter_run :foo
- c.include FakeFS::SpecHelpers, :fakefs - c.include FakeFS::SpecHelpers, :fakefs
+ #c.include FakeFS::SpecHelpers, :fakefs + #c.include FakeFS::SpecHelpers, :fakefs
c.run_all_when_everything_filtered = true c.run_all_when_everything_filtered = true

View File

@ -1,5 +1,5 @@
%global gemdir %{gem_dir} %global gemdir %{gem_dir}
%global majorver 2.8.0 %global majorver 2.11.1
#%%global preminorver .rc6 #%%global preminorver .rc6
%global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||')
%global fullver %{majorver}%{?preminorver} %global fullver %{majorver}%{?preminorver}
@ -14,24 +14,21 @@
# %%check section needs rspec-core, however rspec-core depends on rspec-mocks # %%check section needs rspec-core, however rspec-core depends on rspec-mocks
# runtime part of rspec-mocks does not depend on rspec-core # 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 %global need_bootstrap_set 0
%endif
%{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} %{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}}
Summary: Rspec-2 runner and formatters Summary: Rspec-2 runner and formatters
Name: rubygem-%{gemname} Name: rubygem-%{gemname}
Version: %{majorver} Version: %{majorver}
Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}.1 Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}
Group: Development/Languages Group: Development/Languages
License: MIT License: MIT
URL: http://github.com/rspec/rspec-mocks URL: http://github.com/rspec/rspec-mocks
Source0: http://rubygems.org/gems/%{gemname}-%{fullver}.gem Source0: http://rubygems.org/gems/%{gemname}-%{fullver}.gem
# Skip some tests # 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: ruby(abi) = %{rubyabi}
BuildRequires: rubygems-devel BuildRequires: rubygems-devel
@ -42,8 +39,10 @@ BuildRequires: rubygem(rspec-expectations)
BuildRequires: rubygem(rspec-mocks) BuildRequires: rubygem(rspec-mocks)
%endif %endif
Requires: ruby(abi) = %{rubyabi} Requires: ruby(abi) = %{rubyabi}
Requires: rubygem(rspec-expectations) # When killing the below dependency, a notification to mailing list
Requires: rubygem(rspec-mocks) # is needed
#Requires: rubygem(rspec-expectations)
#Requires: rubygem(rspec-mocks)
# Make the following installed by default # Make the following installed by default
# lib/rspec/core/rake_task # lib/rspec/core/rake_task
Requires: rubygem(rake) Requires: rubygem(rake)
@ -89,11 +88,14 @@ grep -rl '^#![ \t]*/usr/bin' ./lib| \
xargs sed -i -e '\@^#![ \t]*/usr/bin@d' xargs sed -i -e '\@^#![ \t]*/usr/bin@d'
# Until rspec is updated, lets install rspec.rb # Until rspec is updated, lets install rspec.rb
# Kill below
%if 0
cat > lib/rspec.rb <<EOF cat > lib/rspec.rb <<EOF
require 'rspec/core' require 'rspec/core'
require 'rspec/expectations' require 'rspec/expectations'
require 'rspec/mocks' require 'rspec/mocks'
EOF EOF
%endif
%patch0 -p1 %patch0 -p1
@ -110,7 +112,7 @@ cp -a .%{_prefix}/* %{buildroot}%{_prefix}/
mv %{buildroot}%{_bindir}/autospec{,2} mv %{buildroot}%{_bindir}/autospec{,2}
# cleanups # cleanups
rm -f %{buildroot}%{geminstdir}/{.document,.gitignore,.treasure_map.rb,.rspec,.travis.yml,spec.txt} rm -f %{buildroot}%{geminstdir}/{.document,.gitignore,.treasure_map.rb,.rspec,.travis.yml,spec.txt,.yardopts}
%if 0%{?need_bootstrap} < 1 %if 0%{?need_bootstrap} < 1
%check %check
@ -148,6 +150,10 @@ ruby -rubygems -Ilib/ -S exe/rspec \
%{geminstdir}/spec/ %{geminstdir}/spec/
%changelog %changelog
* Thu Oct 11 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.11.1-1
- 2.11.1
- Drop dependency for mocks and expectations
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.0-1.1 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.0-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild