diff --git a/.gitignore b/.gitignore index a0e7697..07651b2 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ /rspec-core-2.14.6.gem /rspec-core-2.14.7.gem /rspec-core-2.14.8.gem +/rspec-core-3.1.7.gem +/rubygem-rspec-core-3.1.7-full.tar.gz diff --git a/rubygem-rspec-core.spec b/rubygem-rspec-core.spec index eb757b0..1cb653c 100644 --- a/rubygem-rspec-core.spec +++ b/rubygem-rspec-core.spec @@ -1,4 +1,4 @@ -%global majorver 2.14.8 +%global majorver 3.1.7 #%%global preminorver .rc6 %global rpmminorver .%(echo %preminorver | sed -e 's|^\\.\\.*||') %global fullver %{majorver}%{?preminorver} @@ -7,48 +7,44 @@ %global gem_name rspec-core - # %%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 0 - -%{!?need_bootstrap: %global need_bootstrap %{need_bootstrap_set}} +%global need_bootstrap_set 1 Summary: Rspec-2 runner and formatters 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 URL: http://github.com/rspec/rspec-mocks Source0: http://rubygems.org/gems/%{gem_name}-%{fullver}.gem +# %%{SOURCE2} %%{name} %%{version} +Source1: rubygem-%{gem_name}-%{version}-full.tar.gz +Source2: rspec-related-create-full-tarball.sh BuildRequires: ruby(release) BuildRequires: rubygems-devel -%if 0%{?need_bootstrap} < 1 -BuildRequires: rubygem(ZenTest) +%if 0%{?need_bootstrap_set} < 1 +BuildRequires: rubygem(minitest) BuildRequires: rubygem(nokogiri) BuildRequires: rubygem(rake) -BuildRequires: rubygem(rspec-expectations) -BuildRequires: rubygem(rspec-mocks) +BuildRequires: rubygem(rspec) BuildRequires: rubygem(aruba) +# Newly +BuildRequires: rubygem(flexmock) +BuildRequires: rubygem(mocha) +BuildRequires: rubygem(rr) %endif -Requires: ruby(release) -# 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) # Optional #Requires: rubygem(ZenTest) +#Requires: rubygem(flexmock) #Requires: rubygem(mocha) -#Requires: rubygem(ruby-debug) -# Not found in Fedora yet (and optional) #Requires: rubygem(rr) -Provides: rubygem(%{gem_name}) = %{version}-%{release} BuildArch: noarch %description @@ -64,60 +60,58 @@ This package contains documentation for %{name}. %prep -%setup -q -c -T - -TOPDIR=$(pwd) -mkdir tmpunpackdir -pushd tmpunpackdir - gem unpack %{SOURCE0} -cd %{gem_name}-%{version} -# rpmlint -grep -rl '^#![ \t]*/usr/bin' ./lib| \ - xargs sed -i -e '\@^#![ \t]*/usr/bin@d' +%setup -q -D -T -n %{gem_name}-%{version} -a 1 -gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec -gem build %{gem_name}.gemspec -mv %{gem_name}-%{version}.gem $TOPDIR - -popd -rm -rf tmpunpackdir +gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec %build +gem build %{gem_name}.gemspec %gem_install -#chmod 0644 ./%{gem_cache} - %install mkdir -p %{buildroot}%{_prefix} cp -a .%{_prefix}/* %{buildroot}%{_prefix}/ -# Rename autospec to avoid conflict with rspec 1.3 -# (anyway this script doesn't seem to be useful) -mv %{buildroot}%{_bindir}/autospec{,2} - # cleanups -rm -f %{buildroot}%{gem_instdir}/{.document,.gitignore,.treasure_map.rb,.rspec,.travis.yml,spec.txt,.yardopts} +rm -f %{buildroot}%{gem_instdir}/{.document,.yardopts} -%if 0%{?need_bootstrap} < 1 +%if 0%{?need_bootstrap_set} < 1 %check LANG=en_US.UTF-8 -pushd .%{gem_instdir} +pushd %{gem_name}-%{version} # Test failure needs investigation... -# There are is some missing template for Ruby 2.0.0: -# https://github.com/rspec/rspec-core/commits/master/spec/rspec/core/formatters/html_formatted-2.0.0.html -ruby -rubygems -Ilib/ -S exe/rspec || : +# perhaps due to some incompatibility between libxml2 2.9.x +# and rubygem-nokogiri + +FAILFILE=() +FAILTEST=() +FAILFILE+=("spec/rspec/core/formatters/html_formatter_spec.rb") +FAILTEST+=("is identical to the one we designed manually") +FAILFILE+=("spec/rspec/core/formatters/progress_formatter_spec.rb") +FAILTEST+=("produces the expected full output") +FAILFILE+=("spec/rspec/core/formatters/documentation_formatter_spec.rb") +FAILTEST+=("produces the expected full output") + +for ((i = 0; i < ${#FAILFILE[@]}; i++)) { + sed -i \ + -e "\@${FAILTEST[$i]}@s|do|, :broken => true do|" \ + ${FAILFILE[$i]} +} + +ruby -rubygems -Ilib/ -S exe/rspec || \ + ruby -rubygems -Ilib/ -S exe/rspec --tag ~broken + +popd %endif %files -%defattr(-,root,root,-) %dir %{gem_instdir} -%doc %{gem_instdir}/License.txt +%license %{gem_instdir}/License.txt %doc %{gem_instdir}/*.md -%{_bindir}/autospec2 %{_bindir}/rspec %{gem_instdir}/exe/ %{gem_instdir}/lib/ @@ -126,12 +120,19 @@ ruby -rubygems -Ilib/ -S exe/rspec || : %{gem_spec} %files doc -%defattr(-,root,root,-) %{gem_docdir} -%{gem_instdir}/features/ -%exclude %{gem_instdir}/spec/ %changelog +* Mon Nov 10 2014 Mamoru TASAKA - 3.1.7-1 +- 3.1.7 +- Once disable tests + +* Fri Aug 15 2014 Mamoru TASAKA - 3.0.4-1 +- 3.0.4 + +* Fri Aug 15 2014 Mamoru TASAKA - 3.0.3-1 +- 3.0.3 + * Sun Jun 08 2014 Fedora Release Engineering - 2.14.8-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild @@ -185,7 +186,7 @@ ruby -rubygems -Ilib/ -S exe/rspec || : * Sat Jul 21 2012 Fedora Release Engineering - 2.8.0-1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Sun Jan 21 2012 Mamoru Tasaka - 2.8.0-1 +* Sun Jan 22 2012 Mamoru Tasaka - 2.8.0-1 - 2.8.0 * Sat Jan 14 2012 Fedora Release Engineering - 2.6.4-1.1 diff --git a/sources b/sources index ce02c43..1ed4dff 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -70fbddcf0ab469b332a028ccc6565a33 rspec-core-2.14.8.gem +17f466dcfbd5a8cebedd1d450555ebb8 rspec-core-3.1.7.gem +452a6620df46e75ca2beb7d103942173 rubygem-rspec-core-3.1.7-full.tar.gz