This commit is contained in:
Mamoru Tasaka 2013-01-02 14:56:27 +09:00
parent 86bf8438bc
commit beb16383f3
5 changed files with 70 additions and 79 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@
/rspec-core-2.6.4.gem /rspec-core-2.6.4.gem
/rspec-core-2.8.0.gem /rspec-core-2.8.0.gem
/rspec-core-2.11.1.gem /rspec-core-2.11.1.gem
/rspec-core-2.12.2.gem

View File

@ -1,36 +0,0 @@
--- 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'
require 'autotest/rspec2'
- require 'aruba/api'
- require 'fakefs/spec_helpers'
+ #require 'aruba/api'
+ #require 'fakefs/spec_helpers'
- Dir['./spec/support/**/*.rb'].map {|f| require f}
+ Dir['./spec/support/**/*.rb'].map {|f| require f unless f.include?("config_options_helper")}
class NullObject
private
@@ -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/
- }
+ #c.include Aruba::Api, :example_group => {
+ #:file_path => /spec\/command_line/
+ #}
# runtime options
c.treat_symbols_as_metadata_keys_with_true_values = true
c.color = !in_editor?
c.filter_run :focus
- c.include FakeFS::SpecHelpers, :fakefs
+ #c.include FakeFS::SpecHelpers, :fakefs
c.run_all_when_everything_filtered = true
c.filter_run_excluding :ruby => lambda {|version|
case version.to_s

View File

@ -0,0 +1,23 @@
--- 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

View File

@ -1,14 +1,11 @@
%global gemdir %{gem_dir} %global majorver 2.12.2
%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}
%global fedorarel 1 %global fedorarel 1
%global gemname rspec-core %global gem_name rspec-core
%global gem_name %{gemname}
%global geminstdir %{gem_instdir}
%global rubyabi 1.9.1 %global rubyabi 1.9.1
@ -19,16 +16,16 @@
%{!?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-%{gem_name}
Version: %{majorver} Version: %{majorver}
Release: %{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist} 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/%{gem_name}-%{fullver}.gem
# Skip some tests # Make spec test executable without Aruba
Patch0: rubygem-rspec-core-2.11.1-skip-some-tests.patch 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
@ -52,7 +49,7 @@ Requires: rubygem(rake)
#Requires: rubygem(ruby-debug) #Requires: rubygem(ruby-debug)
# Not found in Fedora yet (and optional) # Not found in Fedora yet (and optional)
#Requires: rubygem(rr) #Requires: rubygem(rr)
Provides: rubygem(%{gemname}) = %{version}-%{release} Provides: rubygem(%{gem_name}) = %{version}-%{release}
BuildArch: noarch BuildArch: noarch
%description %description
@ -70,20 +67,14 @@ This package contains documentation for %{name}.
%prep %prep
%setup -q -c -T %setup -q -c -T
mkdir -p .%{gemdir} TOPDIR=$(pwd)
gem install \ mkdir tmpunpackdir
-V \ pushd tmpunpackdir
--local \
--install-dir .%{gemdir} \
--bindir .%{_bindir} \
--force \
--rdoc \
%{SOURCE0}
chmod 0644 .%{gemdir}/cache/%{gemname}-%{fullver}.gem gem unpack %{SOURCE0}
cd %{gem_name}-%{version}
# rpmlint # rpmlint
pushd .%{geminstdir}
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'
@ -99,9 +90,25 @@ EOF
%patch0 -p1 %patch0 -p1
gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec
gem build %{gem_name}.gemspec
mv %{gem_name}-%{version}.gem $TOPDIR
popd popd
rm -rf tmpunpackdir
%build %build
mkdir -p .%{gem_dir}
gem install \
-V \
--local \
--install-dir .%{gem_dir} \
--bindir .%{_bindir} \
--force \
--rdoc \
%{gem_name}-%{version}.gem
#chmod 0644 ./%{gem_cache}
%install %install
mkdir -p %{buildroot}%{_prefix} mkdir -p %{buildroot}%{_prefix}
@ -112,44 +119,40 @@ 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,.yardopts} rm -f %{buildroot}%{gem_instdir}/{.document,.gitignore,.treasure_map.rb,.rspec,.travis.yml,spec.txt,.yardopts}
%if 0%{?need_bootstrap} < 1 %if 0%{?need_bootstrap} < 1
%check %check
pushd .%{geminstdir} pushd .%{gem_instdir}
# spec/autotest/failed_results_re_spec.rb (and others) fail, skipping this for now # Test failure needs investigation...
# (need investigating) ruby -rubygems -Ilib/ -S exe/rspec || :
# and now also some other tests fail
ruby -rubygems -Ilib/ -S exe/rspec \
$(ls -1 spec/rspec/*_spec.rb spec/rspec/*/*_spec.rb | \
grep -v configuration_options_spec | \
grep -v drb_options_spec ) \
|| :
%endif %endif
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{geminstdir} %dir %{gem_instdir}
%doc %{geminstdir}/License.txt %doc %{gem_instdir}/License.txt
%doc %{geminstdir}/*.md %doc %{gem_instdir}/*.md
%{_bindir}/autospec2 %{_bindir}/autospec2
%{_bindir}/rspec %{_bindir}/rspec
%{geminstdir}/exe/ %{gem_instdir}/exe/
%{geminstdir}/lib/ %{gem_instdir}/lib/
%{gemdir}/cache/%{gemname}-%{fullver}.gem
%{gemdir}/specifications/%{gemname}-%{fullver}.gemspec
%exclude %{gem_cache}
%{gem_spec}
%files doc %files doc
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{gemdir}/doc/%{gemname}-%{fullver} %{gem_docdir}
%{geminstdir}/features/ %{gem_instdir}/features/
%{geminstdir}/spec/ %exclude %{gem_instdir}/spec/
%changelog %changelog
* Wed Jan 2 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.12.2-1
- 2.12.2
* Thu Oct 11 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.11.1-1 * Thu Oct 11 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.11.1-1
- 2.11.1 - 2.11.1
- Drop dependency for mocks and expectations - Drop dependency for mocks and expectations

View File

@ -1 +1 @@
b7c76f97b14192a91ee096122a7c99ed rspec-core-2.11.1.gem 2ba47d5e7c3464f8e4b95a765eab4935 rspec-core-2.12.2.gem