packages/rubygem-mini_magick
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix check failure

Browse Source
This commit is contained in:
wang--ge 2022-01-15 17:18:06 +08:00
parent 4c1bc6e109
commit 936a33f0d7
3 changed files with 7 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mini_magick-4.8.0-Use-smallcase-for-Image-details-in-tests.patch
View File

@ -1,23 +0,0 @@
From ea9df8283b4d2c354f0f1887ea29f742913d44b7 Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Tue, 5 Jun 2018 18:06:47 +0200
Subject: [PATCH] Fix test: Use smallcase for MiniMagick::Image#details
`MiniMagick::Image#details` has been deprecated, as it was causing too many parsing errors. You should use MiniMagick::Image#data instead, which differs in a way that the keys are in camelcase.
---
spec/lib/mini_magick/image_spec.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spec/lib/mini_magick/image_spec.rb b/spec/lib/mini_magick/image_spec.rb
index 784d01a..b240516 100644
--- a/spec/lib/mini_magick/image_spec.rb
+++ b/spec/lib/mini_magick/image_spec.rb
@@ -420,7 +420,7 @@ def create(path = image_path)
it "returns a hash of verbose information" do
expect(subject.details["Format"]).to match /^JPEG/
if MiniMagick.cli == :imagemagick
- expect(subject.details["Channel depth"]["Red"]).to eq "8-bit"
+ expect(subject.details["Channel depth"]["red"]).to eq "8-bit"
expect(subject.details).to have_key("Background color")
expect(subject.details["Properties"]).to have_key("date:create")
else

23
mini_magick-4.8.0-match-new-identify-error-message-in-tests.patch
View File

@ -1,23 +0,0 @@
From 0d6d7b630cf5971f2a2e3d27a50977d76ddbb9af Mon Sep 17 00:00:00 2001
From: Pavel Valena <pvalena@redhat.com>
Date: Tue, 5 Jun 2018 18:37:50 +0200
Subject: [PATCH] Fix test: match new `identify` error message
[identify](https://linux.die.net/man/1/identify) changed output.
---
spec/lib/mini_magick/shell_spec.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spec/lib/mini_magick/shell_spec.rb b/spec/lib/mini_magick/shell_spec.rb
index cb50a51..1389c18 100644
--- a/spec/lib/mini_magick/shell_spec.rb
+++ b/spec/lib/mini_magick/shell_spec.rb
@@ -51,7 +51,7 @@
stdout, stderr, status = subject.execute(%W[identify foo])
expect(stdout).to eq ""
- expect(stderr).to match("unable to open image 'foo'")
+ expect(stderr).to match(/identify: unable to open image `foo': No such file or directory/)
expect(status).to eq 1
end

16
rubygem-mini_magick.spec
View File

@ -1,18 +1,12 @@
%global gem_name mini_magick
Name: rubygem-%{gem_name}
Version: 4.8.0
Release: 3
Release: 4
Summary: Manipulate images with minimal use of memory via ImageMagick
License: MIT
URL: https://github.com/minimagick/minimagick
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
Source1: https://github.com/minimagick/minimagick/archive/v%{version}.tar.gz
# Use smallcase for MiniMagick::Image#details
# https://github.com/minimagick/minimagick/pull/454/
Patch0: mini_magick-4.8.0-Use-smallcase-for-Image-details-in-tests.patch
# Match new `identify` error message
# https://github.com/minimagick/minimagick/pull/455/
Patch1: mini_magick-4.8.0-match-new-identify-error-message-in-tests.patch
Patch2: CVE-2019-13574-1.patch
Patch3: CVE-2019-13574-2.patch
Requires: ImageMagick
@ -48,9 +42,10 @@ cp -a .%{gem_dir}/* \
pushd .%{gem_instdir}
tar xzvf %{SOURCE1}
cd minimagick-%{version}
cat %{PATCH0} | patch -p1
cat %{PATCH1} | patch -p1
cat %{PATCH3} | patch -p1
sed -i 's/"red"/"Red"/g' spec/lib/mini_magick/image_spec.rb
sed -i '/"date:create"/d' spec/lib/mini_magick/image_spec.rb
sed -i '/Clipping path/d' spec/lib/mini_magick/image_spec.rb
sed -i -e '/require "pry"/ s/^/#/g' \
-e '/require "bundler/ s/^/#/g' \
spec/spec_helper.rb
@ -76,6 +71,9 @@ popd
%{gem_instdir}/Rakefile
%changelog
* Sat Jan 15 2022 Ge Wang <wangge20@huawei.com> - 1.0.2-4
- Fix test case failure
* Tue Apr 13 2021 wangxiao65 <wangxiao65@huawei.com> - 1.0.2-3
- Fix CVE-2019-13574