[rubygem-database_cleaner] Updated upstream version.

[Vít Ondruch]

commit 6ac6b27e7ab712af6c58d1b1332248d9972424ca
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Mar 22 09:11:16 2011 +0100

    Updated upstream version.

 Explicitly-require-ERB.patch  |   23 ++++++++++++++++++++++
 RSpec-2.x-compatibility.patch |   34 +++++++++++++++++++++++++++++++++
 rubygem-database_cleaner.spec |   42 +++++++++++++++++++++++++++++++++-------
 3 files changed, 91 insertions(+), 8 deletions(-)
---
diff --git a/Explicitly-require-ERB.patch b/Explicitly-require-ERB.patch
new file mode 100644
index 0000000..3325a25
--- /dev/null
+++ b/Explicitly-require-ERB.patch
@@ -0,0 +1,23 @@
+From 314a59213beabf150be6202e10d93055bb8176c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
+Date: Mon, 21 Mar 2011 16:40:05 +0100
+Subject: [PATCH] Explicitly require ERB.
+
+---
+ lib/database_cleaner/active_record/base.rb |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/lib/database_cleaner/active_record/base.rb b/lib/database_cleaner/active_record/base.rb
+index 87428f3..0137d05 100644
+--- a/lib/database_cleaner/active_record/base.rb
++++ b/lib/database_cleaner/active_record/base.rb
+@@ -1,5 +1,6 @@
+ require 'database_cleaner/generic/base'
+ require 'active_record'
++require 'erb'
+ 
+ module DatabaseCleaner
+   module ActiveRecord
+-- 
+1.7.4.1
+
diff --git a/RSpec-2.x-compatibility.patch b/RSpec-2.x-compatibility.patch
new file mode 100644
index 0000000..2904f9e
--- /dev/null
+++ b/RSpec-2.x-compatibility.patch
@@ -0,0 +1,34 @@
+From 0091bee57e19f66042c5c84958e34923c0bacd3e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
+Date: Mon, 21 Mar 2011 16:54:49 +0100
+Subject: [PATCH] RSpec 2.x compatibility.
+
+---
+ spec/spec_helper.rb |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index 36bbf85..482fa91 100644
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
+@@ -4,7 +4,7 @@ require "bundler"
+ Bundler.setup
+ 
+ 
+-require 'spec'
++require 'rspec'
+ #require 'active_record'
+ #require 'mongo_mapper'
+ $:.unshift(File.dirname(__FILE__) + '/../lib')
+@@ -12,7 +12,7 @@ require 'database_cleaner'
+ 
+ 
+ 
+-Spec::Runner.configure do |config|
++RSpec::configure do |config|
+ 
+ end
+ 
+-- 
+1.7.4.1
+
diff --git a/rubygem-database_cleaner.spec b/rubygem-database_cleaner.spec
index 0269b03..224a58f 100644
--- a/rubygem-database_cleaner.spec
+++ b/rubygem-database_cleaner.spec
@@ -4,18 +4,25 @@
 
 Summary: Strategies for cleaning databases
 Name: rubygem-%{gemname}
-Version: 0.5.2
-Release: 2%{?dist}
+Version: 0.6.6
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/bmabey/database_cleaner
 Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+
+# Prepare for future, use RSpec 2
+Patch0: RSpec-2.x-compatibility.patch
+# ERB should be required explicitely
+# https://github.com/bmabey/database_cleaner/issues/54 
+Patch1: Explicitly-require-ERB.patch
+
 Requires: rubygems
 Requires: ruby(abi) = 1.8
 BuildRequires: rubygems
-BuildRequires: rubygem(rspec)
+# Use rspec-core until rspec are not migrated to RSpec 2.x
+BuildRequires: rubygem(rspec-core)
 BuildRequires: rubygem(activerecord)
-BuildRequires: rubygem(cucumber)
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -33,19 +40,34 @@ Requires:	%{gemname} = %{version}-%{release}
 This package contains documentation for %{gemname}
 
 %prep
+%setup -q -c -T
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} \
+            --force --rdoc %{SOURCE0}
+
+pushd .%{geminstdir}
+%patch0 -p1
+%patch1 -p1
+popd
 
 %build
 
 %install
 mkdir -p %{buildroot}%{gemdir}
-gem install --local --install-dir %{buildroot}%{gemdir} \
-            --force --rdoc %{SOURCE0}
+cp -a .%{gemdir}/* \
+        %{buildroot}%{gemdir}/
 chmod -x %{buildroot}%{geminstdir}/lib/database_cleaner/active_record/truncation.rb
 
 %check
-pushd %{buildroot}%{geminstdir}
+pushd .%{geminstdir}
+
+# Bundler just complicates everything in our case, remove it.
+sed -i -e 's|require "bundler"||' spec/spec_helper.rb
+sed -i -e 's|Bundler.setup||' spec/spec_helper.rb
+rm spec/spec.opts
+
 # ActiveRecord is the only available ORM in F15.
-spec spec/database_cleaner/active_record
+rspec spec/database_cleaner/generic/ spec/database_cleaner/active_record
 popd
 
 %files
@@ -60,6 +82,7 @@ popd
 %files doc
 %defattr(-, root, root, -)
 %{gemdir}/doc/%{gemname}-%{version}
+%{geminstdir}/Gemfile.lock
 %{geminstdir}/TODO
 %{geminstdir}/examples
 %{geminstdir}/spec
@@ -69,6 +92,9 @@ popd
 %{geminstdir}/Rakefile
 
 %changelog
+* Mon Mar 21 2011 Vít Ondruch <vondruch at redhat.com> - 0.5.2-3
+- Updated upstream version.
+
 * Mon Mar 21 2011 Vít Ondruch <vondruch at redhat.com> - 0.5.2-2
 - Added tests.