From 1927503103c8d9b1a678b2ca2dc90e6ef936b066 Mon Sep 17 00:00:00 2001 From: Pavel Valena Date: Wed, 8 Aug 2018 16:16:12 +0200 Subject: [PATCH] Update to Active Support 5.2.1. --- ...oreTest-test_filename_max_size-fails.patch | 22 ------------------- rubygem-activesupport.spec | 14 +++++------- sources | 4 ++-- 3 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch diff --git a/rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch b/rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch deleted file mode 100644 index 7b9bca6..0000000 --- a/rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 01f20c753e89f75e0031d0853866aaaa68ee1cc7 Mon Sep 17 00:00:00 2001 -From: utilum -Date: Fri, 30 Mar 2018 23:53:23 +0200 -Subject: [PATCH] Fix: FileStoreTest#test_filename_max_size fails in Ruby 2.5.1 - ---- - activesupport/test/cache/stores/file_store_test.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/activesupport/test/cache/stores/file_store_test.rb b/activesupport/test/cache/stores/file_store_test.rb -index c3c35a7bccfe..9aee8239799e 100644 ---- a/activesupport/test/cache/stores/file_store_test.rb -+++ b/activesupport/test/cache/stores/file_store_test.rb -@@ -69,7 +69,7 @@ def test_filename_max_size - key = "#{'A' * ActiveSupport::Cache::FileStore::FILENAME_MAX_SIZE}" - path = @cache.send(:normalize_key, key, {}) - Dir::Tmpname.create(path) do |tmpname, n, opts| -- assert File.basename(tmpname + ".lock").length <= 255, "Temp filename too long: #{File.basename(tmpname + '.lock').length}" -+ assert File.basename(key + tmpname.split(key).last + ".lock").length <= 255, "Temp filename too long: #{File.basename(tmpname + '.lock').length}" - end - end - diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 5c0e107..d3e51d3 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -2,8 +2,8 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 5.2.0 -Release: 2%{?dist} +Version: 5.2.1 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -13,11 +13,8 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # Rails rpms, you may check it out like so # git clone http://github.com/rails/rails.git # cd rails/activesupport/ -# git checkout v5.2.0 && tar czvf activesupport-5.2.0-tests.tgz test/ +# git checkout v5.2.1 && tar czvf activesupport-5.2.1-tests.tgz test/ Source1: %{gem_name}-%{version}-tests.tgz -# Fix: file separators removal from tmpname value -# https://github.com/rails/rails/pull/32386/ -Patch0: rubygem-activesupport-5.2.0-Fix-FileStoreTest-test_filename_max_size-fails.patch # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -74,8 +71,6 @@ pushd .%{gem_instdir} # Move the tests into place tar xzvf %{SOURCE1} -cat %{PATCH0} | patch -p2 - # These tests are really unstable, but they seems to be passing upstream :/ for f in \ test/evented_file_update_checker_test.rb \ @@ -108,6 +103,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Aug 08 2018 Pavel Valena - 1:5.2.1-1 +- Update to Active Support 5.2.1. + * Sat Jul 14 2018 Fedora Release Engineering - 1:5.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 3e147b3..84f6e27 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (activesupport-5.2.0-tests.tgz) = 72085a71720d6931f8acedc9d6e20f0ee7910cc7c85ed05bedafd49d730ff6b1f1c19fa7f2faa021c2df5907e4d63aa1af7a7e373a6c55300d53be34ecee437f -SHA512 (activesupport-5.2.0.gem) = 606ea2168abc2c0ac1310c560c22e8d708f586c9cfa1e132ed50069eb61db4e4a16138598d83ff020beb3171236f3ddae25b38c315add03b89a04af578900252 +SHA512 (activesupport-5.2.1.gem) = 5b5b23d671344bb1b3f3901fbd60740c073c70dc94f5c0b9ddc4bb4b8970ddafd668aed40c105fa48dc69be09c203394f83dd87240ce7d8fce988c0f3c72f66e +SHA512 (activesupport-5.2.1-tests.tgz) = a0b8174509992a45cddf05544b1f4dc700524cc82954a69ae995f1d5458b28d7c21a55fdf08aff682d34b4878f134972e87920be1b51315339547e9720e436e3