[rubygem-activerecord] Update to ActiveRecord 4.0.1

[Josef Stribny]

commit 2d9c15cd44806d1befa180797d48de5986bbb984
Author: Josef Stribny <jstribny at redhat.com>
Date:   Wed Nov 20 18:33:05 2013 +0100

    Update to ActiveRecord 4.0.1

 rubygem-activerecord.spec |   83 ++++++++++++++++++++++++++++-----------------
 1 files changed, 52 insertions(+), 31 deletions(-)
---
diff --git a/rubygem-activerecord.spec b/rubygem-activerecord.spec
index cafe4d9..406d258 100644
--- a/rubygem-activerecord.spec
+++ b/rubygem-activerecord.spec
@@ -1,42 +1,51 @@
+%{?scl:%scl_package rubygem-%{gem_name}}
+%{!?scl:%global pkg_name %{name}}
+
 # Generated from activerecord-1.15.5.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name activerecord
 
+%global bootstrap 1
+
 Summary: Implements the ActiveRecord pattern for ORM
-Name: rubygem-%{gem_name}
+Name: %{?scl_prefix}rubygem-%{gem_name}
 Epoch: 1
-Version: 4.0.0
-Release: 1%{?dist}
+Version: 4.0.1
+Release: 0%{?dist}
 Group: Development/Languages
 License: MIT
 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 v4.0.0
-# tar czvf activerecord-4.0.0-tests.tgz test/
+# git checkout v4.0.1
+# tar czvf activerecord-4.0.1-tests.tgz test/
 Source1: activerecord-%{version}-tests.tgz
-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
-Requires: rubygem(activerecord-deprecated_finders) >= 1.0.2
-Requires: rubygem(activerecord-deprecated_finders) < 1.2.0
-BuildRequires: rubygems-devel
-BuildRequires: rubygem(bcrypt-ruby)
-BuildRequires: rubygem(activesupport) = %{version}
-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
-BuildRequires: rubygem(activerecord-deprecated_finders) >= 1.0.2
-BuildRequires: rubygem(activerecord-deprecated_finders) < 1.2.0
-BuildRequires: rubygem(minitest)
+Requires: %{?scl_prefix}ruby(release)
+Requires: %{?scl_prefix}ruby(rubygems)
+Requires: %{?scl_prefix}rubygem(activesupport) = %{version}
+Requires: %{?scl_prefix}rubygem(activemodel)   = %{version}
+Requires: %{?scl_prefix}rubygem(arel) >= 4.0.0
+Requires: %{?scl_prefix}rubygem(arel) < 5.0.0
+%if 0%{bootstrap} < 1
+Requires: %{?scl_prefix}rubygem(activerecord-deprecated_finders) >= 1.0.2
+Requires: %{?scl_prefix}rubygem(activerecord-deprecated_finders) < 1.2.0
+%endif
+BuildRequires: %{?scl_prefix}rubygems-devel
+BuildRequires: %{?scl_prefix}rubygem(bcrypt-ruby)
+BuildRequires: %{?scl_prefix}rubygem(activesupport) = %{version}
+BuildRequires: %{?scl_prefix}rubygem(activemodel)   = %{version}
+BuildRequires: %{?scl_prefix}rubygem(sqlite3)
+BuildRequires: %{?scl_prefix}rubygem(erubis)
+BuildRequires: %{?scl_prefix}rubygem(mocha)
+BuildRequires: %{?scl_prefix}rubygem(arel) >= 4.0.0
+BuildRequires: %{?scl_prefix}rubygem(arel) < 5.0.0
+%if 0%{bootstrap} < 1
+BuildRequires: %{?scl_prefix}rubygem(activerecord-deprecated_finders) >= 1.0.2
+BuildRequires: %{?scl_prefix}rubygem(activerecord-deprecated_finders) < 1.2.0
+%endif
+BuildRequires: %{?scl_prefix}rubygem(minitest)
 BuildArch: noarch
-Provides: rubygem(%{gem_name}) = %{version}
+Provides: %{?scl_prefix}rubygem(%{gem_name}) = %{version}
 
 %description
 Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database
@@ -45,17 +54,19 @@ Subscription, that can find, save, and destroy themselves without resorting to
 manual SQL.
 
 %package doc
-Summary: Documentation for %{name}
+Summary: Documentation for %{pkg_name}
 Group: Documentation
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{?scl_prefix}%{pkg_name} = %{epoch}:%{version}-%{release}
 BuildArch: noarch
 
 %description doc
-Documentation for %{name}
+Documentation for %{pkg_name}
 
 %prep
-%setup -q -c -T
+%setup -n %{pkg_name}-%{version} -q -c -T
+%{?scl:scl enable %{scl} - << \EOF}
 %gem_install -n %{SOURCE0}
+%{?scl:EOF}
 
 %build
 
@@ -63,6 +74,7 @@ Documentation for %{name}
 mkdir -p %{buildroot}%{gem_dir}
 cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}
 
+%if 0%{bootstrap} < 1
 %check
 pushd .%{gem_instdir}
 
@@ -71,20 +83,24 @@ tar xzvf %{SOURCE1}
 # load_path is not available, remove its require.
 sed -i '1,2d' test/cases/helper.rb
 
+%{?scl:scl enable %{scl} - << \EOF}
 ruby -I.:test:lib << EOF
   test_files = Dir.glob( "test/cases/**/*_test.rb" )
   test_files.reject! { |x| x =~ %r|/adapters/| }
 
   # Only test sqlite3 backend
   test_files += Dir.glob("test/cases/adapters/sqlite3/*_test.rb")
+  test_files.delete('test/cases/invalid_connection_test.rb') # uses MySQL
 
   # To prevent a circular dependency w/ actionpack.
   test_files.delete('test/cases/session_store/session_test.rb')
 
   test_files.each { |f| require f }
 EOF
+%{?scl:EOF}
 
 popd
+%endif
 
 %files
 %dir %{gem_instdir}
@@ -99,8 +115,13 @@ popd
 %doc %{gem_instdir}/README.rdoc
 %doc %{gem_instdir}/examples
 
-
 %changelog
+* Mon Nov 11 2013 Josef Stribny <jstribny at redhat.com> - 1:4.0.1-1
+- Update to ActiveRecord 4.0.1
+
+* Fri Oct 04 2013 Josef Stribny <jstribny at redhat.com> - 1:4.0.0-2
+- Convert to scl
+
 * Thu Aug 01 2013 Josef Stribny <jstribny at redhat.com> - 1:4.0.0-1
 - Update to ActiveRecord 4.0.0.