Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
c9114dab5c
!17 update to 4.12.0
From: @lyn1001 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
2023-11-20 01:24:23 +00:00
lyn1001
ded328b651 update to 4.12.0 2023-11-17 10:48:34 +08:00
openeuler-ci-bot
ff4b4b4ba2
!16 Replacei deprecated File.exists with File.exist due to ruby upgrade to 3.2.2
From: @chen-jan 
Reviewed-by: @lyn1001 
Signed-off-by: @lyn1001
2023-08-02 02:13:09 +00:00
chen-jan
f944d1ded2 Replacei deprecated File.exists with File.exist due to ruby upgrade to 3.2.2 2023-08-02 11:14:33 +08:00
openeuler-ci-bot
07db6a29a0
!13 Fix no implicit conversion of Hash into Integer
From: @lyn1001 
Reviewed-by: @shinwell_hu 
Signed-off-by: @shinwell_hu
2022-03-30 08:33:05 +00:00
lyn1001
117a0907ba Fix no implicit conversion of Hash into Integer 2022-03-29 20:01:40 +08:00
openeuler-ci-bot
4c1bc6e109 !6 fix CVE-2019-13574
From: @wangxiao65
Reviewed-by: @wang_yue111,@small_leek
Signed-off-by: @small_leek
2021-04-14 14:38:36 +08:00
wangxiao65
090e719b85 fix CVE-2019-13574 2021-04-14 09:30:16 +08:00
openeuler-ci-bot
78c037b408 !4 修正yaml格式问题
From: @small_leek
Reviewed-by: @shinwell_hu
Signed-off-by: @shinwell_hu
2020-11-22 11:43:25 +08:00
small_leek
4bfeeeb88c correct the yaml 2020-11-22 11:16:49 +08:00
8 changed files with 26 additions and 61 deletions

BIN
mini_magick-4.12.0.gem Normal file

Binary file not shown.

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

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

Binary file not shown.

View File

@ -1,20 +1,14 @@
%global gem_name mini_magick %global gem_name mini_magick
Name: rubygem-%{gem_name} Name: rubygem-%{gem_name}
Version: 4.8.0 Version: 4.12.0
Release: 2 Release: 1
Summary: Manipulate images with minimal use of memory via ImageMagick Summary: Manipulate images with minimal use of memory via ImageMagick
License: MIT License: MIT
URL: https://github.com/minimagick/minimagick URL: https://github.com/minimagick/minimagick
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
Source1: https://github.com/minimagick/minimagick/archive/v%{version}.tar.gz 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
Requires: ImageMagick Requires: ImageMagick
BuildRequires: ruby(release) rubygems-devel ruby rubygem(rspec) rubygem(webmock) ImageMagick BuildRequires: ruby(release) rubygems-devel ruby rubygem(rspec) rubygem(webmock) ImageMagick rubygem(rexml)
BuildArch: noarch BuildArch: noarch
%description %description
A ruby wrapper for ImageMagick command line. Using MiniMagick the ruby A ruby wrapper for ImageMagick command line. Using MiniMagick the ruby
@ -45,8 +39,6 @@ cp -a .%{gem_dir}/* \
pushd .%{gem_instdir} pushd .%{gem_instdir}
tar xzvf %{SOURCE1} tar xzvf %{SOURCE1}
cd minimagick-%{version} cd minimagick-%{version}
cat %{PATCH0} | patch -p1
cat %{PATCH1} | patch -p1
sed -i -e '/require "pry"/ s/^/#/g' \ sed -i -e '/require "pry"/ s/^/#/g' \
-e '/require "bundler/ s/^/#/g' \ -e '/require "bundler/ s/^/#/g' \
spec/spec_helper.rb spec/spec_helper.rb
@ -57,6 +49,13 @@ sed -i '/^ it "identifies when gm exists" do$/,/ end/ s/^/#/g' \
spec/lib/mini_magick/utilities_spec.rb spec/lib/mini_magick/utilities_spec.rb
sed -i "/^ it \"returns GraphicsMagick's version\" do$/,/ end/ s/^/#/g" \ sed -i "/^ it \"returns GraphicsMagick's version\" do$/,/ end/ s/^/#/g" \
spec/lib/mini_magick_spec.rb spec/lib/mini_magick_spec.rb
sed -i -e 's|, "GraphicsMagick"||' \
spec/lib/mini_magick/image_spec.rb
sed -i "/ have_key(\"date:create\")/ s/^/#/" \
spec/lib/mini_magick/image_spec.rb
sed -i "/^\s*it \"does not hang when parsing verbose data\" do$/ a \ skip" \
spec/lib/mini_magick/image_spec.rb
rspec spec rspec spec
popd popd
@ -72,6 +71,18 @@ popd
%{gem_instdir}/Rakefile %{gem_instdir}/Rakefile
%changelog %changelog
* Fri Nov 17 2023 liyanan <liyanan32@huawei.com> - 4.12.0-1
- Update to 4.12.0
* Wed Aug 02 2023 chenchen <chen_aka_jan@163.com> - 4.8.0-5
- Replacei deprecated File.exists with File.exist due to ruby upgrade to 3.2.2
* Tue Mar 29 2022 liyanan <liyanan32@huawei.com> - 1.0.2-4
- Fix no implicit conversion of Hash into Integer
* Tue Apr 13 2021 wangxiao65 <wangxiao65@huawei.com> - 1.0.2-3
- Fix CVE-2019-13574
* Tue Sep 8 2020 yanan li <liyanan032@huawei.com> - 1.0.2-2 * Tue Sep 8 2020 yanan li <liyanan032@huawei.com> - 1.0.2-2
- fix build fail - fix build fail

View File

@ -1,4 +1,4 @@
version_control:github version_control: github
src_repo:/minimagick/minimagick src_repo: minimagick/minimagick
tag_prefix:"v" tag_prefix: "v"
seperator:"." separator: "."

BIN
v4.12.0.tar.gz Normal file

Binary file not shown.

Binary file not shown.