summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVít Ondruch <vondruch@redhat.com>2013-01-04 11:51:45 +0100
committerVít Ondruch <vondruch@redhat.com>2013-01-04 11:52:02 +0100
commitbbb9e2847fcc5c3e30b8b6122253df1c728ec19c (patch)
treeec2ca93bb2d6a2a5cf78d9c98135bed70ce83b44
parentaa5f23e0a7a6d90117135a7ac69c157da7f0d9ea (diff)
downloadrubygem-activerecord-bbb9e2847fcc5c3e30b8b6122253df1c728ec19c.tar.gz
rubygem-activerecord-bbb9e2847fcc5c3e30b8b6122253df1c728ec19c.tar.xz
rubygem-activerecord-bbb9e2847fcc5c3e30b8b6122253df1c728ec19c.zip
Update to ActiveRecord 3.2.10.
-rw-r--r--.gitignore2
-rw-r--r--rubygem-activerecord.spec14
-rw-r--r--sources4
3 files changed, 14 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 2cd2d85..b55b6f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@ activerecord-2.3.8.gem
/activerecord-3.2.7.gem
/activerecord-3.2.8-tests.tgz
/activerecord-3.2.8.gem
+/activerecord-3.2.10-tests.tgz
+/activerecord-3.2.10.gem
diff --git a/rubygem-activerecord.spec b/rubygem-activerecord.spec
index f879581..ff9710c 100644
--- a/rubygem-activerecord.spec
+++ b/rubygem-activerecord.spec
@@ -5,7 +5,7 @@
Summary: Implements the ActiveRecord pattern for ORM
Name: rubygem-%{gem_name}
Epoch: 1
-Version: 3.2.8
+Version: 3.2.10
Release: 1%{?dist}
Group: Development/Languages
License: MIT
@@ -13,8 +13,8 @@ URL: http://www.rubyonrails.org
Source0: http://rubygems.org/downloads/activerecord-%{version}.gem
# git clone http://github.com/rails/rails.git
# cd rails/activerecord/
-# git checkout v3.2.8
-# tar czvf activerecord-3.2.8-tests.tgz test/
+# git checkout v3.2.10
+# tar czvf activerecord-3.2.10-tests.tgz test/
Source1: activerecord-%{version}-tests.tgz
Requires: ruby(abi) = %{rubyabi}
Requires: ruby(rubygems)
@@ -70,7 +70,10 @@ tar xzvf %{SOURCE1}
# load_path is not available, remove its require.
sed -i '1,2d' test/cases/helper.rb
-ruby -I.:test:lib << EOF
+# The test suite fails running against sqlite 3.7.15.
+# https://github.com/rails/rails/issues/8724
+# https://bugzilla.redhat.com/show_bug.cgi?id=891865
+ruby -I.:test:lib << EOF | grep "3327 tests, 10457 assertions, 2 failures, 0 errors, 7 skips"
test_files = Dir.glob( "test/cases/**/*_test.rb" )
test_files.reject! { |x| x =~ %r|/adapters/| }
@@ -100,6 +103,9 @@ popd
%changelog
+* Thu Jan 03 2013 Vít Ondruch <vondruch@redhat.com> - 1:3.2.10-1
+- Update to ActiveRecord 3.2.10.
+
* Mon Aug 13 2012 Vít Ondruch <vondruch@redhat.com> - 1:3.2.8-1
- Update to ActiveRecord 3.2.8.
diff --git a/sources b/sources
index a01973a..5f7e8dc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1527cc721742f03b5107b6c3cb9cca47 activerecord-3.2.8-tests.tgz
-2c28e8a6547f49e5964b31528bf1f48e activerecord-3.2.8.gem
+3bddb4f5b974a13c7727cdcb1dcc87b7 activerecord-3.2.10-tests.tgz
+1cce909a68d671b1f20ab4c1f13ef586 activerecord-3.2.10.gem