Use aruba, which is already in Fedora, drop no-longer-needed
patch
This commit is contained in:
parent
beb16383f3
commit
4cb9ff6b49
@ -1,23 +0,0 @@
|
|||||||
--- rspec-core-2.12.2/spec/spec_helper.rb.fedora 2013-01-02 14:26:16.000000000 +0900
|
|
||||||
+++ rspec-core-2.12.2/spec/spec_helper.rb 2013-01-02 14:31:47.000000000 +0900
|
|
||||||
@@ -17,7 +17,7 @@
|
|
||||||
Spork.prefork do
|
|
||||||
require 'rspec/autorun'
|
|
||||||
require 'autotest/rspec2'
|
|
||||||
- require 'aruba/api'
|
|
||||||
+ #require 'aruba/api'
|
|
||||||
|
|
||||||
if RUBY_PLATFORM == 'java'
|
|
||||||
# Works around https://jira.codehaus.org/browse/JRUBY-5678
|
|
||||||
@@ -101,9 +101,11 @@
|
|
||||||
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/
|
|
||||||
}
|
|
||||||
+'''
|
|
||||||
|
|
||||||
# runtime options
|
|
||||||
c.treat_symbols_as_metadata_keys_with_true_values = true
|
|
@ -3,7 +3,7 @@
|
|||||||
%global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||')
|
%global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||')
|
||||||
%global fullver %{majorver}%{?preminorver}
|
%global fullver %{majorver}%{?preminorver}
|
||||||
|
|
||||||
%global fedorarel 1
|
%global fedorarel 2
|
||||||
|
|
||||||
%global gem_name rspec-core
|
%global gem_name rspec-core
|
||||||
|
|
||||||
@ -24,8 +24,6 @@ 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/%{gem_name}-%{fullver}.gem
|
Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem
|
||||||
# Make spec test executable without Aruba
|
|
||||||
Patch0: rubygem-rspec-core-2.12.2-spec-test-without-aruba.patch
|
|
||||||
|
|
||||||
BuildRequires: ruby(abi) = %{rubyabi}
|
BuildRequires: ruby(abi) = %{rubyabi}
|
||||||
BuildRequires: rubygems-devel
|
BuildRequires: rubygems-devel
|
||||||
@ -34,6 +32,7 @@ BuildRequires: rubygem(ZenTest)
|
|||||||
BuildRequires: rubygem(rake)
|
BuildRequires: rubygem(rake)
|
||||||
BuildRequires: rubygem(rspec-expectations)
|
BuildRequires: rubygem(rspec-expectations)
|
||||||
BuildRequires: rubygem(rspec-mocks)
|
BuildRequires: rubygem(rspec-mocks)
|
||||||
|
BuildRequires: rubygem(aruba)
|
||||||
%endif
|
%endif
|
||||||
Requires: ruby(abi) = %{rubyabi}
|
Requires: ruby(abi) = %{rubyabi}
|
||||||
# When killing the below dependency, a notification to mailing list
|
# When killing the below dependency, a notification to mailing list
|
||||||
@ -78,18 +77,6 @@ cd %{gem_name}-%{version}
|
|||||||
grep -rl '^#![ \t]*/usr/bin' ./lib| \
|
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
|
|
||||||
# Kill below
|
|
||||||
%if 0
|
|
||||||
cat > lib/rspec.rb <<EOF
|
|
||||||
require 'rspec/core'
|
|
||||||
require 'rspec/expectations'
|
|
||||||
require 'rspec/mocks'
|
|
||||||
EOF
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec
|
gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec
|
||||||
gem build %{gem_name}.gemspec
|
gem build %{gem_name}.gemspec
|
||||||
mv %{gem_name}-%{version}.gem $TOPDIR
|
mv %{gem_name}-%{version}.gem $TOPDIR
|
||||||
@ -150,6 +137,10 @@ ruby -rubygems -Ilib/ -S exe/rspec || :
|
|||||||
%exclude %{gem_instdir}/spec/
|
%exclude %{gem_instdir}/spec/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 2 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.12.2-2
|
||||||
|
- Use aruba, which is already in Fedora, drop no-longer-needed
|
||||||
|
patch
|
||||||
|
|
||||||
* Wed Jan 2 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.12.2-1
|
* Wed Jan 2 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.12.2-1
|
||||||
- 2.12.2
|
- 2.12.2
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user