diff --git a/.gitignore b/.gitignore
index 80256d4..de8158c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 /rspec-expectations-2.14.3.gem
 /rspec-expectations-2.14.4.gem
 /rspec-expectations-2.14.5.gem
+/rspec-expectations-3.1.2.gem
+/rubygem-rspec-expectations-3.1.2-full.tar.gz
diff --git a/rubygem-rspec-expectations.spec b/rubygem-rspec-expectations.spec
index 18efc1a..77c4cde 100644
--- a/rubygem-rspec-expectations.spec
+++ b/rubygem-rspec-expectations.spec
@@ -1,26 +1,13 @@
-%global	majorver	2.14.5
+%global	majorver	3.1.2
 #%%global	preminorver	.rc6
 %global	rpmminorver	.%(echo %preminorver | sed -e 's|^\\.\\.*||')
 %global	fullver	%{majorver}%{?preminorver}
 
-%global	fedorarel	4
+%global	fedorarel	1
 
 %global	gem_name	rspec-expectations
 
-# It is too dangerous to use minitest >= 5 on rspec-expections-2.14.x...
-# e5102884716f8bc1b4e8f0fe0b2b7c4dd1d04734 ... too big
-%if 0%{?fedora} >= 21
-%global	gem_minitest	rubygem(minitest4)
-%else
-%global	gem_minitest	rubygem(minitest)
-%endif	
-
-
-# %%check section needs rspec-core, however rspec-core depends on rspec-expectations
-# runtime part of rspec-expectaions 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 expectations (should and matchers) 
 Name:		rubygem-%{gem_name}
@@ -30,20 +17,18 @@ Release:	%{?preminorver:0.}%{fedorarel}%{?preminorver:%{rpmminorver}}%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://github.com/rspec/rspec-expectations
-Source0:	http://rubygems.org/gems/%{gem_name}-%{fullver}.gem
-# Backport temporarily be_truthy matchers and so on
-Patch0:	rubygem-rspec-expectations-2.14.5-be_truthy-alias.patch
+Source0:	https://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
+%if 0%{?need_bootstrap_set} < 1
 BuildRequires:	rubygem(rspec)
-BuildRequires:	%gem_minitest
+BuildRequires:	rubygem(minitest)
 %endif
-Requires:	ruby(release)
-Requires:	rubygem(diff-lcs)
-Provides:	rubygem(%{gem_name}) = %{version}-%{release}
-BuildArch:	noarch
+BuildArch:		noarch
 
 %description
 rspec-expectations adds `should` and `should_not` to every object and includes
@@ -59,65 +44,56 @@ This package contains documentation for %{name}.
 
 
 %prep
-%setup -q -c -T
-
-TOPDIR=$(pwd)
-mkdir tmpunpackdir
-pushd tmpunpackdir
-
 gem unpack %{SOURCE0}
-cd %{gem_name}-%{version}
 
-%patch0 -p2
-sed -i -e "s@\(require 'test/unit'\)@gem 'minitest', '~> 4' ;\1@" \
-	spec/spec_helper.rb
-
-gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec
-gem build %{gem_name}.gemspec
-mv %{gem_name}-%{version}.gem $TOPDIR
-
-popd
-rm -rf tmpunpackdir
+%setup -q -D -T -n  %{gem_name}-%{version} -a 1
+gem specification %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
 %build
+gem build %{gem_name}.gemspec
 %gem_install
 
-#chmod 0644 ./%{gem_cache}
-
 %install
 mkdir -p %{buildroot}%{gem_dir}
-cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/
+cp -a .%{gem_dir}/* \
+	%{buildroot}%{gem_dir}/
 
 # cleanups
-rm -f %{buildroot}%{gem_instdir}/{.document,.gitignore,.travis.yml,.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}
+
 ruby -rubygems -Ilib/ -S rspec spec/
 popd
 %endif
 
 %files
-%defattr(-,root,root,-)
 %dir	%{gem_instdir}
 
-%doc	%{gem_instdir}/License.txt
+%license	%{gem_instdir}/License.txt
 %doc	%{gem_instdir}/*.md
 %{gem_instdir}/lib/
 
 %exclude	%{gem_cache}
 %{gem_spec}
 
-
 %files	doc
-%defattr(-,root,root,-)
 %{gem_docdir}
-%{gem_instdir}/features/
-%exclude	%{gem_instdir}/spec/
 
 %changelog
+* Mon Nov 10 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.1.2-1
+- 3.1.2
+- Once disable tests
+
+* Fri Aug 15 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.4-1
+- 3.0.4
+
+* Thu Aug 14 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.0.3-1
+- 3.0.3
+
 * Thu Aug 14 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.14.5-4
 - Clearner way to specify minitest 4.x
 
@@ -172,10 +148,10 @@ popd
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.0-2.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Sun Jan 21 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.8.0-2
+* Sun Jan 22 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.8.0-2
 - Require (diff-lcs) again
 
-* Sun Jan 21 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.8.0-1
+* Sun Jan 22 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 2.8.0-1
 - 2.8.0
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6.0-1.1
diff --git a/sources b/sources
index 2da1778..953dd09 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-63e2297adfd5d8da9a57c54feb1c8f2c  rspec-expectations-2.14.5.gem
+de9293803cbd34edc560e1ba7603822c  rspec-expectations-3.1.2.gem
+d9f9cc3fb3fdd529db4478170f8da228  rubygem-rspec-expectations-3.1.2-full.tar.gz