summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--rubygem-activerecord-fix-more-failing-tests.patch2
-rw-r--r--rubygem-activerecord-fix-set-order.patch2
-rw-r--r--rubygem-activerecord-remove-rdoc-task.patch4
-rw-r--r--rubygem-activerecord-sqlite-api.patch2
-rw-r--r--rubygem-activerecord-xml-serialization.patch2
-rw-r--r--rubygem-activerecord.spec9
-rw-r--r--sources4
8 files changed, 16 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index df68631..39ec3c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,5 +24,5 @@ activerecord-2.3.8.gem
/activerecord-3.2.10.gem
/activerecord-3.2.11-tests.tgz
/activerecord-3.2.11.gem
-/activerecord-2.3.16-tests.tgz
-/activerecord-2.3.16.gem
+/activerecord-2.3.17-tests.tgz
+/activerecord-2.3.17.gem
diff --git a/rubygem-activerecord-fix-more-failing-tests.patch b/rubygem-activerecord-fix-more-failing-tests.patch
index 6851ba7..8e95ca6 100644
--- a/rubygem-activerecord-fix-more-failing-tests.patch
+++ b/rubygem-activerecord-fix-more-failing-tests.patch
@@ -1,4 +1,4 @@
-From 774fac0e736c589ef32dc61a02864b2abdc5fee3 Mon Sep 17 00:00:00 2001
+From c1d8ceaf1c37924b7a037ba7f44fbe2dec0eb724 Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Thu, 22 Mar 2012 23:47:22 -0300
Subject: [PATCH] Fix more failing tests related to ruby 1.8.7 p358 version change
diff --git a/rubygem-activerecord-fix-set-order.patch b/rubygem-activerecord-fix-set-order.patch
index 411d9a7..efb9ab6 100644
--- a/rubygem-activerecord-fix-set-order.patch
+++ b/rubygem-activerecord-fix-set-order.patch
@@ -1,4 +1,4 @@
-From 515251513259787f4c679299a1c379dc19ad4921 Mon Sep 17 00:00:00 2001
+From 55c0b9ff55a4c803ebcab04cd24104783c6c530d Mon Sep 17 00:00:00 2001
From: Evan Phoenix <ephoenix@engineyard.com>
Date: Mon, 22 Mar 2010 09:51:44 -0700
Subject: [PATCH] Don't depend on order of elements in Set
diff --git a/rubygem-activerecord-remove-rdoc-task.patch b/rubygem-activerecord-remove-rdoc-task.patch
index 82cf19e..c4f1988 100644
--- a/rubygem-activerecord-remove-rdoc-task.patch
+++ b/rubygem-activerecord-remove-rdoc-task.patch
@@ -1,4 +1,4 @@
-From c2928e6acd9a214d3d04ba1d059932af73443230 Mon Sep 17 00:00:00 2001
+From 4adb3a07a2ae5aabae95fa80f39c8e8fa023f7af Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Thu, 7 Feb 2013 20:40:36 -0700
Subject: [PATCH] remove Rake rdoc task
@@ -10,7 +10,7 @@ the Rakefile.
1 files changed, 0 insertions(+), 30 deletions(-)
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
-index 47570bd..65d68e1 100644
+index 6ebc655..e28c820 100644
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -1,7 +1,6 @@
diff --git a/rubygem-activerecord-sqlite-api.patch b/rubygem-activerecord-sqlite-api.patch
index eb9583f..112b322 100644
--- a/rubygem-activerecord-sqlite-api.patch
+++ b/rubygem-activerecord-sqlite-api.patch
@@ -1,4 +1,4 @@
-From 6b3e7d3f9f84d53855e0af72720a923caaa58313 Mon Sep 17 00:00:00 2001
+From 508c41bda2a9ebf94467ae160bb546f16e342417 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Thu, 7 Feb 2013 21:55:51 -0700
Subject: [PATCH] Use RHEL'6 SQLite3 Version API
diff --git a/rubygem-activerecord-xml-serialization.patch b/rubygem-activerecord-xml-serialization.patch
index aa0b0dd..69a5d8e 100644
--- a/rubygem-activerecord-xml-serialization.patch
+++ b/rubygem-activerecord-xml-serialization.patch
@@ -1,4 +1,4 @@
-From e9abd0fc11dd965dc8ea4de3fa8dcb694d2b112d Mon Sep 17 00:00:00 2001
+From fdfabd7e53ccd324453f546bcffc745f208a2336 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Thu, 7 Feb 2013 22:13:30 -0700
Subject: [PATCH] skip xml in serialization_test
diff --git a/rubygem-activerecord.spec b/rubygem-activerecord.spec
index 8ac996a..ee53e24 100644
--- a/rubygem-activerecord.spec
+++ b/rubygem-activerecord.spec
@@ -9,7 +9,7 @@
Summary: Implements the ActiveRecord pattern for ORM
Name: rubygem-%{gem_name}
Epoch: 1
-Version: 2.3.16
+Version: 2.3.17
Release: 1%{?dist}
Group: Development/Languages
License: MIT
@@ -17,8 +17,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 v2.3.16
-# tar czvf activerecord-2.3.16-tests.tgz test/
+# git checkout v2.3.17
+# tar czvf activerecord-2.3.17-tests.tgz test/
Source1: activerecord-%{version}-tests.tgz
# RDoc on RHEL 6 is too old to work with Rake.
@@ -137,6 +137,9 @@ popd
%changelog
+* Tue Feb 12 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 1:2.3.17-1
+- Upgrade to ActiveRecord 2.3.17.
+
* Thu Feb 07 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 1:2.3.16-1
- Downgrade to ActiveRecord 2.3.16.
- RHEL 6 compatibility
diff --git a/sources b/sources
index f84209e..806474a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-29e82c71c7f9847634c15d749814efeb activerecord-2.3.16-tests.tgz
-cb2f369b6270c5bcff073460f1ce4345 activerecord-2.3.16.gem
+1af5c12ea2608bcd5362b1e7887b8b4d activerecord-2.3.17.gem
+5756cc74b3f0611f23fd10c519593a13 activerecord-2.3.17-tests.tgz