update to 6.1.4.1

(cherry picked from commit 50d8dc668b3389356a3d17a35e335c8ec7f12de9)

rubygem-activestorage.spec

@@ -1,21 +1,29 @@
 %global gem_name activestorage
-%{?_with_bootstrap: %global bootstrap 1}
+%bcond_without bootstrap
-%global bootstrap 1
 %bcond_with ffmpeg
 Name:                rubygem-%{gem_name}
-Version:             5.2.4.4
+Version:             6.1.4.1
 Release:             1
 Summary:             Local and cloud file storage framework
 License:             MIT
 URL:                 http://rubyonrails.org
-Source0:             https://rubygems.org/gems/activestorage-5.2.4.4.gem
+Source0:             https://rubygems.org/gems/%{gem_name}-%{version}.gem
-Source1:             https://github.com/rails/rails/archive/v5.2.4.4.tar.gz
+# The gem doesn't ship with the test suite.
+# You may check it out like so
+# git clone https://github.com/rails/rails.git
+# cd rails/activestorage && git archive -v -o activestorage-6.1.4.1-tests.txz v6.1.4.1 test/
+Source1:             %{gem_name}-%{version}-tests.txz
+# The tools are needed for the test suite, are however unpackaged in gem file.
+# You may check it out like so
+# git clone http://github.com/rails/rails.git --no-checkout
+# cd rails && git archive -v -o rails-6.1.4.1-tools.txz v6.1.4.1 tools/
+Source2:             rails-%{version}-tools.txz
 BuildRequires:       ruby(release) rubygems-devel ruby
-%if ! 0%{?bootstrap}
+%if %{without bootstrap}
 BuildRequires:       rubygem(actionpack) = %{version} rubygem(activerecord) = %{version}
 BuildRequires:       rubygem(activejob) = %{version} rubygem(railties) = %{version}
 BuildRequires:       rubygem(rails) = %{version} rubygem(sprockets-rails) rubygem(connection_pool)
-BuildRequires:       rubygem(mini_magick) rubygem(sqlite3)
+BuildRequires:       rubygem(image_processing) rubygem(sqlite3)
 %{?with_ffmpeg:BuildRequires: %{_bindir}/ffmpeg}
 BuildRequires:       %{_bindir}/mutool %{_bindir}/pdftoppm
 %endif
@@ -34,7 +42,7 @@ BuildArch:           noarch
 Documentation for %{name}.
 
 %prep
-%setup -q -n %{gem_name}-%{version}
+%setup -q -n %{gem_name}-%{version} -b1 -b2
 
 %build
 gem build ../%{gem_name}-%{version}.gemspec
@@ -46,7 +54,7 @@ cp -a .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
 %check
-%if ! 0%{?bootstrap}
+%if %{without bootstrap}
 ln -s %{gem_dir}/specifications/rails-%{version}.gemspec .%{gem_dir}/gems/rails.gemspec
 ln -s %{gem_dir}/gems/railties-%{version}/ .%{gem_dir}/gems/railties
 ln -s %{gem_dir}/gems/activerecord-%{version}/ .%{gem_dir}/gems/activerecord
@@ -55,29 +63,31 @@ ln -s %{gem_dir}/gems/actionpack-%{version}/ .%{gem_dir}/gems/actionpack
 ln -s %{gem_dir}/gems/activesupport-%{version}/ .%{gem_dir}/gems/activesupport
 ln -s ${PWD}%{gem_instdir} .%{gem_dir}/gems/%{gem_name}
 pushd .%{gem_dir}/gems/%{gem_name}
-tar xzvf %{SOURCE1}
+ln -s %{_builddir}/tools ..
+cp -a %{_builddir}/test .
 touch Gemfile
 echo 'gem "actionpack"' >> ../Gemfile
 echo 'gem "activerecord"' >> ../Gemfile
 echo 'gem "activejob"' >> ../Gemfile
 echo 'gem "sprockets-rails"' >> ../Gemfile
-echo 'gem "mini_magick"' >> ../Gemfile
+echo 'gem "image_processing"' >> ../Gemfile
 echo 'gem "rails"' >> ../Gemfile
 echo 'gem "sqlite3"' >> ../Gemfile
-cd rails-%{version}/%{gem_name}
+%if %{without ffmpeg}
-%if ! 0%{?with_ffmpeg}
 mv test/analyzer/video_analyzer_test.rb{,.disable}
+mv test/previewer/video_previewer_test.rb{,.disable}
 for f in \
   models/preview \
   models/representation \
-  previewer/video_previewer
+  %{nil}
 do
-sed -i '/^  test ".* an MP4 video" do$/,/^  end$/ s/^/#/g' \
+sed -i '/^  test ".* MP4 video.*" do$/,/^  end$/ s/^/#/g' \
   test/${f}_test.rb
 done
-sed -i '/^  test "analyze newly-attached blobs" do$/,/^  end$/ s/^/#/g' \
-  test/models/attachments_test.rb
 %endif
+sed -i -e '/test "optimized variation of GIF"/ a skip' \
+    -e '/thumbnail variation of extensionless GIF/ a skip' \
+  test/models/variant_test.rb
 export RUBYOPT="-I${PWD}/../%{gem_name}/lib"
 export PATH="${PWD}/../%{gem_name}/exe:$PATH"
 export BUNDLE_GEMFILE=${PWD}/../Gemfile
@@ -101,6 +111,9 @@ popd
 %doc %{gem_instdir}/README.md
 
 %changelog
+* Wed Mar 02 2022 jiangxinyu <jiangxinyu@kylinos.cn> - 6.1.4.1-1
+- update to 6.1.4.1
+
 * Mon Feb  8 2021 sunguoshuai<sunguoshuai@huawei.com>- 5.2.4.4-1
 - Upgrade to 5.2.4.4