[rubygem-bson_ext/f18: 1/2] Update to bson_ext 1.6.4.

[Vít Ondruch]

commit 2ac205f6b5c98d8689ac7ca12d11104f4e2fb779
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Thu Aug 9 09:23:21 2012 +0200

    Update to bson_ext 1.6.4.

 .gitignore            |    2 ++
 rubygem-bson_ext.spec |   35 ++++++++++++++++++++---------------
 sources               |    4 ++--
 3 files changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ca0a4a..0e395f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /bson_ext-1.4.0-tests-upstream.tgz
 /bson_ext-1.4.0.gem
+/bson_ext-1.6.4-tests.tgz
+/bson_ext-1.6.4.gem
diff --git a/rubygem-bson_ext.spec b/rubygem-bson_ext.spec
index d80aa8d..dfe7ead 100644
--- a/rubygem-bson_ext.spec
+++ b/rubygem-bson_ext.spec
@@ -5,17 +5,17 @@
 
 Summary: C extensions for Ruby BSON
 Name: rubygem-%{gem_name}
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.6.4
+Release: 1%{?dist}
 Group: Development/Languages
 License: ASL 2.0
 URL: http://www.mongodb.org/display/DOCS/BSON
 
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 #git clone http://github.com/mongodb/mongo-ruby-driver.git && cd mongo-ruby-driver/
-#git checkout 1.4.0
-#tar czvf bson_ext-1.4.0-tests-upstream.tgz test/bson/ test/support/
-Source1: %{gem_name}-%{version}-tests-upstream.tgz
+#git checkout 1.6.4
+#tar czvf bson_ext-1.6.4-tests.tgz test/bson/ test/support/
+Source1: %{gem_name}-%{version}-tests.tgz
 
 Requires: rubygem(bson) >= 1.4.0
 Requires: ruby(abi) = %{rubyabi}
@@ -27,11 +27,8 @@ BuildRequires: rubygems-devel
 BuildRequires: ruby
 # for tests:
 BuildRequires: rubygem(bson) >= 1.4.0
-BuildRequires: rubygem(shoulda)
-BuildRequires: rubygem(mocha)
 BuildRequires: rubygem(json)
 BuildRequires: rubygem(minitest)
-BuildRequires: rubygem(bigdecimal)
 
 Provides: rubygem(%{gem_name}) = %{version}
 
@@ -75,21 +72,26 @@ rm -rf %{buildroot}%{gem_instdir}/ext
 
 
 %check
-pushd %{_tmppath}
+pushd .%{gem_instdir}
 tar xzvf %{SOURCE1}
-#remove the inclusion of bson (absolute path that doesn't exist) and rather require it while running ruby
-sed -i '1d' ./test/bson/test_helper.rb
-# TODO: update to latest version to fix the failure
-ruby -I%{buildroot}%{ruby_vendorarchdir}/ -e "require 'bson';Dir.glob('./test/bson/*_test.rb').each {|t| require t}" || :
+# Run the test suite with minitest.
+# https://jira.mongodb.org/browse/RUBY-465
+sed -i "/gem 'test-unit'/ d" test/bson/test_helper.rb
+
+# Remove the inclusion of bson (absolute path that doesn't exist) and rather require it while running ruby
+sed -i "/require File.join(File.dirname(__FILE__), '..', '..', 'lib', 'bson')/d" test/bson/test_helper.rb
+
+# Test suite fails on i386 :/
+# https://jira.mongodb.org/browse/RUBY-466
+ruby -Iext -e "require 'bson'; Dir.glob('./test/bson/*_test.rb').each {|t| require t}" || :
 popd
-rm -rf %{_tmppath}/test
 
 
 %files
 %dir %{gem_instdir}
 %exclude %{gem_cache}
 %{gem_spec}
-%{gem_extdir}/
+%{gem_extdir}
 
 %files doc
 %doc %{gem_docdir}
@@ -97,6 +99,9 @@ rm -rf %{_tmppath}/test
 %{gem_instdir}/bson_ext.gemspec
 
 %changelog
+* Wed Aug 08 2012 Vít Ondruch <vondruch at redhat.com> - 1.6.4-1
+- Update to bson_ext 1.6.4.
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 563d94b..233ffb3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-461c9da5091eafbd121de8d4a0760256  bson_ext-1.4.0-tests-upstream.tgz
-f98a879019a831f862ca1951f73a7693  bson_ext-1.4.0.gem
+3b1bcb587d7e31f2d58e84ea8a02afbf  bson_ext-1.6.4-tests.tgz
+5360798f3d7d94d65be6c19aeacfc91f  bson_ext-1.6.4.gem