diff --git a/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch b/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch new file mode 100644 index 0000000..6c6d529 --- /dev/null +++ b/rubygem-activesupport-7.0.2-Defer-loading-XmlMini.patch @@ -0,0 +1,35 @@ +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 3d07fe3..b818e7d 100644 --- a/rubygem-activesupport.spec +++ b/rubygem-activesupport.spec @@ -4,7 +4,7 @@ Name: rubygem-%{gem_name} Epoch: 1 -Version: 7.0.1 +Version: 7.0.2 Release: 1%{?dist} Summary: A support libraries and Ruby core extensions extracted from the Rails framework License: MIT @@ -13,13 +13,16 @@ 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.1-tests.txz v7.0.1 test/ +# cd rails/activesupport && git archive -v -o activesupport-7.0.2-tests.txz v7.0.2 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.1-tools.txz v7.0.1 tools/ +# cd rails && git archive -v -o rails-7.0.2-tools.txz v7.0.2 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 # ruby package has just soft dependency on rubygem({bigdecimal,json}), while # ActiveSupport always requires them. @@ -62,6 +65,8 @@ Documentation for %{name}. %prep %setup -q -n %{gem_name}-%{version}%{?prerelease} -b1 -b2 +%patch0 -p2 + %build gem build ../%{gem_name}-%{version}%{?prerelease}.gemspec %gem_install @@ -119,6 +124,9 @@ popd %doc %{gem_instdir}/README.rdoc %changelog +* Wed Feb 09 2022 Pavel Valena - 1:7.0.2-1 +- Update to activesupport 7.0.2. + * Thu Feb 03 2022 Pavel Valena - 1:7.0.1-1 - Update to activesupport 7.0.1. diff --git a/sources b/sources index 9f6e045..c2e0dcf 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (activesupport-7.0.1.gem) = 38747dabe8364d07899525e8b2feeedad0e7aa1efc591f3747a0a0eca91b73049bdf1a4397f3d4ac554e92bfa17898c509bc8a66de5a1ef30490ec14947ee0e7 -SHA512 (activesupport-7.0.1-tests.txz) = 2186f868b921c0535dc1faf45523383aa3a5e040531f16ed5e55846aafd80b3db4c78447c025304f90ea2ed7c3d0f10ce67f924e393790bec241c7ec5ca8bbb4 -SHA512 (rails-7.0.1-tools.txz) = 3959bbb7bb5dcfa75d65d586bbdf694b80088af51597940ab06683719b37a00d52a81f61cd8c43dd1c7bf057cfea9b1b89acb74ee45c01fc3da8adec505bb4fd +SHA512 (activesupport-7.0.2.gem) = 1fbb50e0c0c05a3db2018e969590f812380156e45d4edde4034056a57a10a89f05de5a9780f7222eda7aa51d607f2107474d76a2d919b772c6e58e90557cfbe5 +SHA512 (activesupport-7.0.2-tests.txz) = e5e9bdf4d8a2e913c3518d6ed544543dce5ce4549424f633e3e6bf4b1e06bdf7bd9e23773ad1a7708e939ab4e0db599a3a6944a72d3b5f5aa1c1d117cb3bbfbf +SHA512 (rails-7.0.2-tools.txz) = 079127967e3a544910775dd9739292ecc5a387863f1a25fd4d876af1e144cf4f1538a058c1007d97a58c5cead3f56a28fff1b87b382248e84f0cfb87ee01e574