[rubygem-activerecord] Update to ActiveRecord 3.0.9
Vít Ondruch
vondruch at fedoraproject.org
Mon Jul 4 13:05:56 UTC 2011
commit 54819ad064512cdff4a74c9b10bed86daefeb775
Author: Vít Ondruch <vondruch at redhat.com>
Date: Mon Jul 4 15:05:16 2011 +0200
Update to ActiveRecord 3.0.9
.gitignore | 2 +
activerecord-3.0.3-postgres-fix.patch | 12 -------
activerecord-disabled-failing-timestamp-test.patch | 33 --------------------
activerecord-tests-fix.patch | 4 +-
rubygem-activerecord.spec | 29 ++++++++---------
sources | 4 +-
6 files changed, 19 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 490e5a5..ba0c61c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ activerecord-2.3.8.gem
/activerecord-3.0.3.gem
/activerecord-tests.tgz
/activerecord-3.0.5.gem
+/activerecord-3.0.9-tests.tgz
+/activerecord-3.0.9.gem
diff --git a/activerecord-tests-fix.patch b/activerecord-tests-fix.patch
index 38cb39d..45546c1 100644
--- a/activerecord-tests-fix.patch
+++ b/activerecord-tests-fix.patch
@@ -4,5 +4,5 @@
-require File.expand_path('../../../../load_paths', __FILE__)
+require 'rubygems'
- lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
- $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
+ require 'config'
+
diff --git a/rubygem-activerecord.spec b/rubygem-activerecord.spec
index ac12655..42261c3 100644
--- a/rubygem-activerecord.spec
+++ b/rubygem-activerecord.spec
@@ -1,14 +1,15 @@
# Generated from activerecord-1.15.5.gem by gem2rpm -*- rpm-spec -*-
-%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%define gemname activerecord
-%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global gemname activerecord
-%define rubyabi 1.8
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+
+%global rubyabi 1.8
Summary: Implements the ActiveRecord pattern for ORM
Name: rubygem-%{gemname}
Epoch: 1
-Version: 3.0.5
+Version: 3.0.9
Release: 1%{?dist}
Group: Development/Languages
License: MIT
@@ -22,9 +23,9 @@ Source1: http://github.com/rails/rails/raw/v%{version}/%{gemname}/Rakefile
# You may check it out like so
# git clone http://github.com/rails/rails.git
# cd rails/activerecord/
-# git checkout v3.0.5
-# tar czvf activerecord-tests.tgz test/
-Source2: activerecord-tests.tgz
+# git checkout v3.0.9
+# tar czvf activerecord-3.0.9-tests.tgz test/
+Source2: activerecord-3.0.9-tests.tgz
# Remove a task which breaks the Rakefile due to the gemspec
# not being present in the gem
@@ -34,12 +35,6 @@ Patch0: activerecord-rakefile-fix.patch
# dependency on a file in the greater rails proj
Patch1: activerecord-tests-fix.patch
-# patch1 https://rails.lighthouseapp.com/projects/8994/tickets/3210-rails-postgres-issue
-Patch3: activerecord-3.0.3-postgres-fix.patch
-
-# https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/6636-activerecord-305testcasestimestamp_testrb-fails
-Patch4: activerecord-disabled-failing-timestamp-test.patch
-
Requires: ruby(abi) = %{rubyabi}
Requires: rubygems
Requires: rubygem(activesupport) = %{version}
@@ -52,6 +47,7 @@ BuildRequires: rubygem(rake)
BuildRequires: rubygem(activesupport) = %{version}
BuildRequires: rubygem(activemodel) = %{version}
BuildRequires: rubygem(sqlite3)
+BuildRequires: rubygem(erubis)
BuildRequires: rubygem(mocha)
BuildRequires: rubygem(i18n)
BuildRequires: rubygem(arel)
@@ -84,8 +80,6 @@ tar xzvf %{SOURCE2} -C .%{geminstdir}
pushd ./%{geminstdir}
%patch0 -p0
%patch1 -p0
-%patch3 -p0
-%patch4 -p2
popd
# Remove backup files
@@ -144,6 +138,9 @@ rake test_sqlite3 --trace
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%changelog
+* Mon Jul 04 2011 Vít Ondruch <vondruch at redhat.com> - 1:3.0.9-1
+- Update to ActiveRecord 3.0.9
+
* Fri Mar 25 2011 Vít Ondruch <vondruch at redhat.com> - 1:3.0.5-1
- Updated to ActiveRecord 3.0.5
diff --git a/sources b/sources
index e003f4c..11bdcd5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c54d3895d262b6c84df1f0aaaf80c6bd activerecord-3.0.5.gem
-791096d1452dd2bfe120bc3bec2501b2 activerecord-tests.tgz
+41455801046146b5d2e34b6839004377 activerecord-3.0.9-tests.tgz
+106b50d22d413e4b4d844e38a3bf9349 activerecord-3.0.9.gem
More information about the scm-commits
mailing list