diff --git a/rubygem-activerecord-5.1.1-Fix-MigratorTest-test_migrator_verbosity.patch b/rubygem-activerecord-5.1.1-Fix-MigratorTest-test_migrator_verbosity.patch deleted file mode 100644 index b6e26f2..0000000 --- a/rubygem-activerecord-5.1.1-Fix-MigratorTest-test_migrator_verbosity.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 09c5236e5b620766c0be14fa4b76a3186215a7b1 Mon Sep 17 00:00:00 2001 -From: bogdanvlviv -Date: Wed, 26 Apr 2017 01:01:53 +0300 -Subject: [PATCH] Fix MigratorTest#test_migrator_verbosity - -Add `ActiveRecord::Migration.verbose = true` -to be sure that verbose is turned on in the test. - -Related to #28865 ---- - activerecord/test/cases/migrator_test.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/activerecord/test/cases/migrator_test.rb b/activerecord/test/cases/migrator_test.rb -index aadbc375af45..2e4b454a86ed 100644 ---- a/activerecord/test/cases/migrator_test.rb -+++ b/activerecord/test/cases/migrator_test.rb -@@ -299,6 +299,7 @@ def test_migrator_double_down - def test_migrator_verbosity - _, migrations = sensors(3) - -+ ActiveRecord::Migration.verbose = true - ActiveRecord::Migrator.new(:up, migrations, 1).migrate - assert_not_equal 0, ActiveRecord::Migration.message_count - -@@ -311,7 +312,6 @@ def test_migrator_verbosity - def test_migrator_verbosity_off - _, migrations = sensors(3) - -- ActiveRecord::Migration.message_count = 0 - ActiveRecord::Migration.verbose = false - ActiveRecord::Migrator.new(:up, migrations, 1).migrate - assert_equal 0, ActiveRecord::Migration.message_count diff --git a/rubygem-activerecord.spec b/rubygem-activerecord.spec index 162f8c6..bbd3511 100644 --- a/rubygem-activerecord.spec +++ b/rubygem-activerecord.spec @@ -3,22 +3,17 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 5.1.5 +Version: 5.2.0 Release: 1%{?dist} Summary: Object-relational mapper framework (part of Rails) -Group: Development/Languages License: MIT URL: http://rubyonrails.org Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # git clone http://github.com/rails/rails.git # cd rails/activerecord/ -# git checkout v5.1.5 && tar czvf activerecord-5.1.5-tests.tgz test/ +# git checkout v5.2.0 && tar czvf activerecord-5.2.0-tests.tgz test/ Source1: activerecord-%{version}-tests.tgz -# Fix MigratorTest#test_migrator_verbosity -# https://github.com/rails/rails/commit/09c5236e5b620766c0be14fa4b76a3186215a7b1 -Patch0: rubygem-activerecord-5.1.1-Fix-MigratorTest-test_migrator_verbosity.patch - # Database dump/load reuires the executable. Suggests: %{_bindir}/sqlite3 BuildRequires: rubygems-devel @@ -29,8 +24,7 @@ BuildRequires: rubygem(builder) BuildRequires: rubygem(sqlite3) BuildRequires: rubygem(erubis) BuildRequires: rubygem(mocha) -BuildRequires: rubygem(arel) >= 8.0.0 -BuildRequires: rubygem(arel) < 9.0.0 +BuildRequires: rubygem(arel) BuildRequires: rubygem(rack) BuildRequires: %{_bindir}/sqlite3 BuildArch: noarch @@ -43,7 +37,6 @@ manual SQL. %package doc Summary: Documentation for %{name} -Group: Documentation Requires: %{name} = %{epoch}:%{version}-%{release} BuildArch: noarch @@ -71,8 +64,6 @@ pushd .%{gem_instdir} tar xzvf %{SOURCE1} -cat %{PATCH0} | patch -p2 -F 0 - # Disable unstable tests. # https://github.com/rails/rails/issues/25774 sed -i '/^ def test_preconfigured_includes_with_has_many_and_habtm$/,/^ end$/ s/^/#/' \ @@ -122,6 +113,9 @@ popd %{gem_instdir}/examples %changelog +* Mon Apr 23 2018 Pavel Valena - 1:5.2.0-1 +- Update to Active Record 5.2.0. + * Fri Feb 16 2018 Pavel Valena - 1:5.1.5-1 - Update to Active Record 5.1.5. diff --git a/sources b/sources index 222975d..b8b803b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (activerecord-5.1.5.gem) = 2b29a4f6bd419d49978bac6a01cd772633e40f89aeb9a32bbf2673ebd147b29fe7f602dd5470168b8e45cb588707addfef8b584cf598b8c965105fc8f7c974f4 -SHA512 (activerecord-5.1.5-tests.tgz) = bf44318029fdab216e90ef97f28cd869f7be8e6ff7321a6a48d713c7b82fe0e7a683c5d99ba4975f542588be0e2167a9fd104e1a4ea2831901c740dfedb79d14 +SHA512 (activerecord-5.2.0-tests.tgz) = 4a21e88abe7b3b4e3dbe04099fa43a7ee5734aa78e9af2a6c4546df16f9ed102589bc1ddeb3a40196525d18b83fac6f6a284946ff793d1baff96626c8e89b268 +SHA512 (activerecord-5.2.0.gem) = 4ead58dbf123becf56c4e2f3b7cfc2656bd0c8e150e1d229eac061781f83f4026b5dc262bc8aa9a420c99584ff8d84a84237d779f264349e0f1f21ed70ef8fbf