[rubygem-activerecord] Update to ActiveRecord 4.1.0

Josef Stribny jstribny at fedoraproject.org
Fri Apr 18 07:33:21 UTC 2014


commit 9b22592b98681ac04a6ea41fc1f5a2ab758f60e8
Author: Josef Stribny <jstribny at redhat.com>
Date:   Thu Apr 17 15:32:04 2014 +0200

    Update to ActiveRecord 4.1.0

 .gitignore                                  |    2 +
 rubygem-activerecord-sqlite-3.8.2-fix.patch |   14 ----------
 rubygem-activerecord.spec                   |   36 +++++++++-----------------
 sources                                     |    4 +-
 4 files changed, 17 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9cfb5cc..d9685f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,5 @@ activerecord-2.3.8.gem
 /activerecord-4.0.2.gem
 /activerecord-4.0.3-tests.tgz
 /activerecord-4.0.3.gem
+/activerecord-4.1.0-tests.tgz
+/activerecord-4.1.0.gem
diff --git a/rubygem-activerecord.spec b/rubygem-activerecord.spec
index 540c941..544c513 100644
--- a/rubygem-activerecord.spec
+++ b/rubygem-activerecord.spec
@@ -1,13 +1,11 @@
 # Generated from activerecord-1.15.5.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name activerecord
 
-%global bootstrap 0
-
 Summary: Implements the ActiveRecord pattern for ORM
 Name: rubygem-%{gem_name}
 Epoch: 1
-Version: 4.0.3
-Release: 2%{?dist}
+Version: 4.1.0
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -17,19 +15,12 @@ Source0: http://rubygems.org/downloads/activerecord-%{version}.gem
 # git checkout v%{version}
 # tar czvf activerecord-%{version}-tests.tgz test/
 Source1: activerecord-%{version}-tests.tgz
-# SQLite 3.8.2 changed the error message for unique constraint
-# https://github.com/rails/rails/pull/13291
-Patch0: rubygem-activerecord-sqlite-3.8.2-fix.patch
 Requires: ruby(release)
 Requires: ruby(rubygems)
 Requires: rubygem(activesupport) = %{version}
 Requires: rubygem(activemodel)   = %{version}
-Requires: rubygem(arel) >= 4.0.0
-Requires: rubygem(arel) < 5.0.0
-%if 0%{bootstrap} < 1
-Requires: rubygem(activerecord-deprecated_finders) >= 1.0.2
-Requires: rubygem(activerecord-deprecated_finders) < 1.1.0
-%endif
+Requires: rubygem(arel) >= 5.0.0
+Requires: rubygem(arel) < 6.0.0
 BuildRequires: rubygems-devel
 BuildRequires: rubygem(bcrypt-ruby)
 BuildRequires: rubygem(activesupport) = %{version}
@@ -37,12 +28,8 @@ BuildRequires: rubygem(activemodel)   = %{version}
 BuildRequires: rubygem(sqlite3)
 BuildRequires: rubygem(erubis)
 BuildRequires: rubygem(mocha)
-BuildRequires: rubygem(arel) >= 4.0.0
-BuildRequires: rubygem(arel) < 5.0.0
-%if 0%{bootstrap} < 1
-BuildRequires: rubygem(activerecord-deprecated_finders) >= 1.0.2
-BuildRequires: rubygem(activerecord-deprecated_finders) < 1.1.0
-%endif
+BuildRequires: rubygem(arel) >= 5.0.0
+BuildRequires: rubygem(arel) < 6.0.0
 BuildRequires: rubygem(minitest)
 BuildArch: noarch
 Provides: rubygem(%{gem_name}) = %{version}
@@ -68,8 +55,6 @@ gem unpack %{SOURCE0}
 
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
 
-%patch0 -p1
-
 %build
 gem build %{gem_name}.gemspec
 %gem_install
@@ -79,7 +64,6 @@ gem build %{gem_name}.gemspec
 mkdir -p %{buildroot}%{gem_dir}
 cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}
 
-%if 0%{bootstrap} < 1
 %check
 pushd .%{gem_instdir}
 
@@ -99,11 +83,14 @@ ruby -I.:test:lib << EOF
   # To prevent a circular dependency w/ actionpack.
   test_files.delete('test/cases/session_store/session_test.rb')
 
+  # Running separatelly works
+  test_files.delete('test/cases/calculations_test.rb')
+  require 'test/cases/calculations_test.rb'
+
   test_files.each { |f| require f }
 EOF
 
 popd
-%endif
 
 %files
 %dir %{gem_instdir}
@@ -119,6 +106,9 @@ popd
 %doc %{gem_instdir}/examples
 
 %changelog
+* Fri Apr 11 2014 Josef Stribny <jstribny at redhat.com> - 1:4.1.0-1
+- Update to ActiveRecord 4.1.0
+
 * Wed Feb 26 2014 Josef Stribny <jstribny at redhat.com> - 1:4.0.3-1
 - Update to ActiveRecord 4.0.3
 
diff --git a/sources b/sources
index ec9762b..1780cf3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8dc4585dd4fb8d63166e620487a66248  activerecord-4.0.3-tests.tgz
-2cc3daa5020b3b1945cc5cdec1e5f609  activerecord-4.0.3.gem
+f80788c63a3963194e5ce32bdb093eec  activerecord-4.1.0-tests.tgz
+bf818507600c5e9dd5bf0fdcf2858241  activerecord-4.1.0.gem


More information about the scm-commits mailing list