diff --git a/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch b/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch deleted file mode 100644 index 6c6d529..0000000 --- a/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5b21d3029e2b2f985adab467a11c00b5e54f2ab5 Mon Sep 17 00:00:00 2001 -From: Matthew Draper -Date: Sat, 5 Feb 2022 17:09:29 +1030 -Subject: [PATCH 1/2] Defer loading XmlMini until it's needed - -It's used for {Array,Hash}#to_xml, but that doesn't seem worth loading -by default. ---- - activesupport/lib/active_support/core_ext/array/conversions.rb | 1 - - activesupport/lib/active_support/core_ext/hash/conversions.rb | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb -index 82cc221a3c981..2195731442153 100644 ---- a/activesupport/lib/active_support/core_ext/array/conversions.rb -+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb -@@ -1,6 +1,5 @@ - # frozen_string_literal: true - --require "active_support/xml_mini" - require "active_support/core_ext/hash/keys" - require "active_support/core_ext/string/inflections" - require "active_support/core_ext/object/to_param" -diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb -index 2b5e484d215ee..9a1db92d6d255 100644 ---- a/activesupport/lib/active_support/core_ext/hash/conversions.rb -+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb -@@ -1,6 +1,5 @@ - # frozen_string_literal: true - --require "active_support/xml_mini" - require "active_support/core_ext/object/blank" - require "active_support/core_ext/object/to_param" - require "active_support/core_ext/object/to_query" - diff --git a/rubygem-activesupport.spec b/rubygem-activesupport.spec index 914039e..81aeca6 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,8 +4,8 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.2.3 -Release: 3%{?dist} +Version: 7.0.4 +Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT URL: http://rubyonrails.org @@ -13,16 +13,13 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem # The activesupport gem doesn't ship with the test suite. # You may check it out like so # git clone http://github.com/rails/rails.git -# cd rails/activesupport && git archive -v -o activesupport-7.0.2.3-tests.txz v7.0.2.3 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.4-tests.txz v7.0.4 test/ Source1: %{gem_name}-%{version}%{?prerelease}-tests.txz # The tools are needed for the test suite, are however unpackaged in gem file. # You may get them like so # git clone http://github.com/rails/rails.git --no-checkout -# cd rails && git archive -v -o rails-7.0.2.3-tools.txz v7.0.2.3 tools/ +# cd rails && git archive -v -o rails-7.0.4-tools.txz v7.0.4 tools/ Source2: rails-%{version}%{?prerelease}-tools.txz -# Defer loading XmlMini until it's needed -# https://github.com/rails/rails/pull/44340 -Patch0: rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch # Fixes for Minitest 5.16+ # https://github.com/rails/rails/pull/45380 Patch1: rubygem-activesupport-7.0.2.3-Remove-the-multi-call-form-of-assert_called_with.patch @@ -71,7 +68,6 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2 -%patch0 -p2 %patch1 -p2 %patch3 -p2 @@ -136,6 +132,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Thu Sep 15 2022 Pavel Valena - 1:7.0.4-1 +- Update to activesupport 7.0.4. + * Tue Aug 02 2022 Vít Ondruch - 1:7.0.2.3-3 - Fix Minitest 5.16+ compatibility. diff --git a/sources b/sources index 438d992..3aee15e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-7.0.2.3.gem) = 60adee8a89d3c4dea7d8f4dba8447d34b6dcadafe61524a2dee175f71d0671e0b003100367b025fb699cdfa31bb0a902415b84ed922b71fcb92f00f8688b097b -SHA512 (activesupport-7.0.2.3-tests.txz) = ecb0d3e3d6c8c2fea86233346c756ffd38df6009b8e7b7b92c84765c965637bc0153e6efb0634b3ebfe9716c261096249c2e0f74453f56421993d60c0d53b5f4 -SHA512 (rails-7.0.2.3-tools.txz) = 09a73c12d4cce5dcf8e13f641a6799fc4f943872dfd312530f4239ab18ab2ff05e9a1971a8a84b4dc650f4bf12572fdaec91f8da18424a7a6e587cba0089ae00 +SHA512 (activesupport-7.0.4.gem) = 54859a1cccda0940a91be3be8a68087a4cb8ae6f5850dc3ae92bb79a722b04f34a5d9a61456146c2d7c994e95cd5f1b40c16766e0ef54828acc91edb5aba1d2b +SHA512 (activesupport-7.0.4-tests.txz) = 3f4919e88d21aee8dd3c21b7b7a913abdcd213e4b3f434102980cb470e014201bd8ebdd9d785895018b9aed1736e686aa76fe098be438b90f114b1f423d2deab +SHA512 (rails-7.0.4-tools.txz) = 8cab3982844ffe8eadfa67ec7b3e788aafd766035eb60be03f32544482f704da9c817fd3562ff248a71ed50e724de7be96d90376a61141dc1d51efd775875547