diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 5928b4f..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-rake-compiler-0.7.0.gem
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..522ac3d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+rake-compiler-0.7.0.gem
+rake-compiler-0.7.1.gem
+/rake-compiler-0.7.5.gem
+/rake-compiler-0.7.6.gem
+/rake-compiler-0.7.7.gem
+/rake-compiler-0.7.8.gem
diff --git a/Makefile b/Makefile
deleted file mode 100644
index cee77f3..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: rubygem-rake-compiler
-# $Id$
-NAME := rubygem-rake-compiler
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/rubygem-rake-compiler.spec b/rubygem-rake-compiler.spec
index 205be3a..3f512b1 100644
--- a/rubygem-rake-compiler.spec
+++ b/rubygem-rake-compiler.spec
@@ -6,16 +6,20 @@
 
 Summary:	Rake-based Ruby C Extension task generator
 Name:		rubygem-%{gemname}
-Version:	0.7.0
+Version:	0.7.8
 Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://rake-compiler.rubyforge.org/
 Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	ruby(rubygems) >= 1.3.5
+BuildRequires:	rubygem(cucumber)
+BuildRequires:	rubygem(isolate)
+BuildRequires:	rubygem(rake)
+BuildRequires:	rubygem(rcov)
+BuildRequires:	rubygem(rspec)
 Requires:	ruby(abi) = %{rubyabi}
 Requires:	ruby(rubygems) >= 1.3.5
 Requires:	rubygem(rake) >= 0.8.3
@@ -74,28 +78,72 @@ mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
 
 rmdir %{buildroot}%{gemdir}/bin
 
+%check
+pushd .%{geminstdir}
+
+# Modify Isolate file
+cp -p Isolate{,.orig}
+sed -i -e 's|gem |# gem|' Isolate
+
+# cucumber 0.10.0 needs fixing for newer rake (0.9.0 beta5)
+# rake aborted!
+# undefined method `desc' for #<Cucumber::Rake::Task:0xb742ebb0>
+# rake spec
+ruby -Ilib %{_bindir}/spec spec/
+
+# back to the original
+mv -f Isolate{.orig,}
+
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/rake-compiler
+
 %dir %{geminstdir}
 %doc %{geminstdir}/README.rdoc
 %doc %{geminstdir}/LICENSE.txt
 %doc %{geminstdir}/History.txt
-%{geminstdir}/Rakefile
 %{geminstdir}/cucumber.yml
-%{geminstdir}/[a-z]*/
+
+%{geminstdir}/bin/
+%{geminstdir}/features/
+%{geminstdir}/lib/
+%{geminstdir}/tasks/
+
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %files doc
 %defattr(-,root,root,-)
 %{gemdir}/doc/%{gemname}-%{version}
+%{geminstdir}/Isolate
+%{geminstdir}/Rakefile
+%{geminstdir}/spec/
 
 
 %changelog
+* Sat Apr 30 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.7.8-1
+- 0.7.8
+
+* Mon Apr  4 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 0.7.7-1
+- 0.7.7
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Feb  7 2011 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.7.6-1
+- 0.7.6
+
+* Tue Nov 30 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.7.5-2
+- 0.7.5
+- Move more files to -doc
+- Now needs rubygem(isolate) and some other rubygem(foo) for BR
+
+* Wed Aug 11 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.7.1-1
+- 0.7.1
+
 * Thu Dec 10 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.7.0-1
 - 0.7.0
 
diff --git a/sources b/sources
index 9df4993..ff6d6c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc8dbdadac79b6a30cf3aa702a3a1ead  rake-compiler-0.7.0.gem
+26d6fb9fb857af9324e4850dbf99cfab  rake-compiler-0.7.8.gem