Update to ActiveRecord 3.0.13.

5 files changed, 30 insertions, 29 deletions

diff --git a/.gitignore b/.gitignore
index 23b9ef6..99ec5ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ activerecord-2.3.8.gem
 /activerecord-3.0.10.gem
 /activerecord-3.0.11-tests.tgz
 /activerecord-3.0.11.gem
+/activerecord-3.0.13-tests.tgz
+/activerecord-3.0.13.gem
diff --git a/activerecord-downgrade-dependencies.patch b/activerecord-downgrade-dependencies.patch
index b22619b..8294550 100644
--- a/activerecord-downgrade-dependencies.patch
+++ b/activerecord-downgrade-dependencies.patch
@@ -1,22 +1,22 @@
---- specifications/activerecord-3.0.11.gemspec.orig
-+++ specifications/activerecord-3.0.11.gemspec
+--- specifications/activerecord-3.0.13.gemspec.orig
++++ specifications/activerecord-3.0.13.gemspec
 @@ -25,18 +25,18 @@
      if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-       s.add_runtime_dependency(%q<activesupport>, ["= 3.0.11"])
-       s.add_runtime_dependency(%q<activemodel>, ["= 3.0.11"])
+       s.add_runtime_dependency(%q<activesupport>, ["= 3.0.13"])
+       s.add_runtime_dependency(%q<activemodel>, ["= 3.0.13"])
 -      s.add_runtime_dependency(%q<arel>, ["~> 2.0.10"])
 +      s.add_runtime_dependency(%q<arel>, ["~> 2.0.9"])
        s.add_runtime_dependency(%q<tzinfo>, ["~> 0.3.23"])
      else
-       s.add_dependency(%q<activesupport>, ["= 3.0.11"])
-       s.add_dependency(%q<activemodel>, ["= 3.0.11"])
+       s.add_dependency(%q<activesupport>, ["= 3.0.13"])
+       s.add_dependency(%q<activemodel>, ["= 3.0.13"])
 -      s.add_dependency(%q<arel>, ["~> 2.0.10"])
 +      s.add_dependency(%q<arel>, ["~> 2.0.9"])
        s.add_dependency(%q<tzinfo>, ["~> 0.3.23"])
      end
    else
-     s.add_dependency(%q<activesupport>, ["= 3.0.11"])
-     s.add_dependency(%q<activemodel>, ["= 3.0.11"])
+     s.add_dependency(%q<activesupport>, ["= 3.0.13"])
+     s.add_dependency(%q<activemodel>, ["= 3.0.13"])
 -    s.add_dependency(%q<arel>, ["~> 2.0.10"])
 +    s.add_dependency(%q<arel>, ["~> 2.0.9"])
      s.add_dependency(%q<tzinfo>, ["~> 0.3.23"])
diff --git a/activerecord-tests-fix.patch b/activerecord-tests-fix.patch
deleted file mode 100644
index 45546c1..0000000
--- a/activerecord-tests-fix.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- test/cases/helper.rb.orig	2011-01-10 21:00:27.597458002 -0500
-+++ test/cases/helper.rb	2011-01-10 21:00:34.439458125 -0500
-@@ -1,4 +1,4 @@
--require File.expand_path('../../../../load_paths', __FILE__)
-+require 'rubygems'
- 
- require 'config'
- 
diff --git a/rubygem-activerecord.spec b/rubygem-activerecord.spec
index 96fbc08..22564d5 100644
--- a/rubygem-activerecord.spec
+++ b/rubygem-activerecord.spec
@@ -6,7 +6,7 @@
 Summary: Implements the ActiveRecord pattern for ORM
 Name: rubygem-%{gem_name}
 Epoch: 1
-Version: 3.0.11
+Version: 3.0.13
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
@@ -20,18 +20,14 @@ Source1: http://github.com/rails/rails/raw/v%{version}/%{gem_name}/Rakefile
 # You may check it out like so
 # git clone http://github.com/rails/rails.git
 # cd rails/activerecord/
-# git checkout v3.0.11
-# tar czvf activerecord-3.0.11-tests.tgz test/
+# git checkout v3.0.13
+# tar czvf activerecord-3.0.13-tests.tgz test/
 Source2: activerecord-%{version}-tests.tgz
 
 # Remove a task which breaks the Rakefile due to the gemspec
 # not being present in the gem
 Patch0: activerecord-rakefile-fix.patch
 
-# Removes code which breaks the test suite due to a
-# dependency on a file in the greater rails proj
-Patch1: activerecord-tests-fix.patch
-
 Patch2: activerecord-downgrade-dependencies.patch
 
 Requires: ruby(abi) = %{rubyabi}
@@ -79,7 +75,6 @@ tar xzvf %{SOURCE2} -C .%{gem_instdir}
 
 pushd ./%{gem_instdir}
 %patch0 -p0
-%patch1 -p0
 popd
 
 pushd .%{gem_dir}
@@ -120,6 +115,16 @@ rm -rf %{buildroot}
 %check
 pushd .%{gem_instdir}
 
+# load_path is not available, remove its require.
+sed -i '1,2d' test/cases/helper.rb
+
+# Test fails with newer mocha. Keep with older one is not solution.
+# https://github.com/rails/rails/pull/6046
+# https://github.com/rails/rails/commit/2aa7c6d065802cd230a812b8331ee293e4aae0e8
+sed -i '592,597 s|^|#|' test/cases/autosave_association_test.rb
+sed -i '637,642 s|^|#|' test/cases/autosave_association_test.rb
+sed -i '702,710 s|^|#|' test/cases/autosave_association_test.rb
+
 # to prevent a circular dependency w/ actionpack
 mv test/cases/session_store/session_test.rb \
      test/cases/session_store/session_test.rb.norun
@@ -129,7 +134,6 @@ rake test_sqlite3 --trace
 popd
 
 %files
-%defattr(-, root, root, -)
 %dir %{gem_instdir}
 %doc %{gem_instdir}/CHANGELOG
 %doc %{gem_instdir}/examples
@@ -139,13 +143,16 @@ popd
 %{gem_instdir}/test
 
 %doc %{gem_docdir}
-%{gem_cache}
+%exclude %{gem_cache}
 %{gem_spec}
 
 %changelog
+* Fri Jun 01 2012 Vít Ondruch <vondruch@redhat.com> - 1:3.0.13-1
+- Update to ActiveRecord 3.0.13.
+
 * Tue Jan 31 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1:3.0.11-1
 - Rebuilt for Ruby 1.9.3.
-- Update to ActionPack 3.0.11
+- Update to ActionRecord 3.0.11
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 04aa6d9..28a45f6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2bdf929c7209c010bbc6b382d41251fc  activerecord-3.0.11-tests.tgz
-8ecb8d9c39b6ac88bdb8068dcd6311f7  activerecord-3.0.11.gem
+72cfe16a8110f7d7109ce7f01512846d  activerecord-3.0.13-tests.tgz
+08ef742b263858522e7bad76dfc042ed  activerecord-3.0.13.gem