diff --git a/activestorage-6.1.4.1.gem b/activestorage-6.1.4.1.gem deleted file mode 100644 index e8cf9edd036212e6ecaa7ade61779f3a8cc3f56f..0000000000000000000000000000000000000000 Binary files a/activestorage-6.1.4.1.gem and /dev/null differ diff --git a/activestorage-6.1.4.1-tests.txz b/activestorage-7.0.4-tests.txz similarity index 81% rename from activestorage-6.1.4.1-tests.txz rename to activestorage-7.0.4-tests.txz index 8a3b91c6a520c3902e141ae5e786bf15f531e67a..df7984d5159a8ac0dec416d33a7b77dca5e17fba 100644 Binary files a/activestorage-6.1.4.1-tests.txz and b/activestorage-7.0.4-tests.txz differ diff --git a/activestorage-7.0.4.gem b/activestorage-7.0.4.gem new file mode 100644 index 0000000000000000000000000000000000000000..0a9d21df646c16c9829f56bbe852a3f70b6bb289 Binary files /dev/null and b/activestorage-7.0.4.gem differ diff --git a/rails-6.1.4.1-tools.txz b/rails-7.0.4-tools.txz similarity index 95% rename from rails-6.1.4.1-tools.txz rename to rails-7.0.4-tools.txz index 2a295780575dec0533adacc500837f9b5da9206a..a34575fdf39b93e8e835d608b0b5ba493a31d89d 100644 Binary files a/rails-6.1.4.1-tools.txz and b/rails-7.0.4-tools.txz differ diff --git a/rubygem-activestorage.spec b/rubygem-activestorage.spec index 30cbd93a8ce1799ee9eb6a2d44d630e6621441cb..b1af2878d03e4e1b02e5bd21713e977abddc9c2f 100644 --- a/rubygem-activestorage.spec +++ b/rubygem-activestorage.spec @@ -2,7 +2,7 @@ %bcond_without bootstrap %bcond_with ffmpeg Name: rubygem-%{gem_name} -Version: 6.1.4.1 +Version: 7.0.4 Release: 1 Summary: Local and cloud file storage framework License: MIT @@ -11,12 +11,12 @@ Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem # 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/ +# cd rails/activestorage && git archive -v -o activestorage-7.0.4-tests.txz v7.0.4 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/ +# cd rails && git archive -v -o rails-7.0.4-tools.txz v7.0.4 tools/ Source2: rails-%{version}-tools.txz BuildRequires: ruby(release) rubygems-devel ruby %if %{without bootstrap} @@ -75,6 +75,7 @@ echo 'gem "rails"' >> ../Gemfile echo 'gem "sqlite3"' >> ../Gemfile %if %{without ffmpeg} mv test/analyzer/video_analyzer_test.rb{,.disable} +mv test/analyzer/audio_analyzer_test.rb{,.disable} mv test/previewer/video_previewer_test.rb{,.disable} for f in \ models/preview \ @@ -85,8 +86,16 @@ sed -i '/^ test ".* MP4 video.*" do$/,/^ end$/ s/^/#/g' \ test/${f}_test.rb done %endif +# Blobs seem to be broken +# https://github.com/rails/rails/pull/40226 +# https://github.com/rails/rails/issues/44395 sed -i -e '/test "optimized variation of GIF"/ a skip' \ -e '/thumbnail variation of extensionless GIF/ a skip' \ + -e '/test "resized variation of PSD blob" do/ a skip' \ + -e '/test "resized variation of BMP blob" do/ a skip' \ + -e '/test "resized variation of ICO blob" do/ a skip' \ + -e '/test "resized variation of GIF blob" do/ a skip' \ + -e '/test "optimized variation of GIF blob" do/ a skip' \ test/models/variant_test.rb export RUBYOPT="-I${PWD}/../%{gem_name}/lib" export PATH="${PWD}/../%{gem_name}/exe:$PATH" @@ -111,6 +120,9 @@ popd %doc %{gem_instdir}/README.md %changelog +* Thu Jan 19 2023 wangkai - 7.0.4-1 +- Upgrade to version 7.0.4 + * Wed Mar 02 2022 jiangxinyu - 6.1.4.1-1 - update to 6.1.4.1