Compare commits
10 Commits
09fee17242
...
c9114dab5c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c9114dab5c | ||
|
|
ded328b651 | ||
|
|
ff4b4b4ba2 | ||
|
|
f944d1ded2 | ||
|
|
07db6a29a0 | ||
|
|
117a0907ba | ||
|
|
4c1bc6e109 | ||
|
|
090e719b85 | ||
|
|
78c037b408 | ||
|
|
4bfeeeb88c |
BIN
mini_magick-4.12.0.gem
Normal file
BIN
mini_magick-4.12.0.gem
Normal file
Binary file not shown.
@ -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
|
||||
@ -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.
@ -1,20 +1,14 @@
|
||||
%global gem_name mini_magick
|
||||
Name: rubygem-%{gem_name}
|
||||
Version: 4.8.0
|
||||
Release: 2
|
||||
Version: 4.12.0
|
||||
Release: 1
|
||||
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
|
||||
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
|
||||
%description
|
||||
A ruby wrapper for ImageMagick command line. Using MiniMagick the ruby
|
||||
@ -45,8 +39,6 @@ cp -a .%{gem_dir}/* \
|
||||
pushd .%{gem_instdir}
|
||||
tar xzvf %{SOURCE1}
|
||||
cd minimagick-%{version}
|
||||
cat %{PATCH0} | patch -p1
|
||||
cat %{PATCH1} | patch -p1
|
||||
sed -i -e '/require "pry"/ s/^/#/g' \
|
||||
-e '/require "bundler/ s/^/#/g' \
|
||||
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
|
||||
sed -i "/^ it \"returns GraphicsMagick's version\" do$/,/ end/ s/^/#/g" \
|
||||
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
|
||||
popd
|
||||
|
||||
@ -72,6 +71,18 @@ popd
|
||||
%{gem_instdir}/Rakefile
|
||||
|
||||
%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
|
||||
- fix build fail
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
version_control: github
|
||||
src_repo:/minimagick/minimagick
|
||||
src_repo: minimagick/minimagick
|
||||
tag_prefix: "v"
|
||||
seperator:"."
|
||||
separator: "."
|
||||
|
||||
BIN
v4.12.0.tar.gz
Normal file
BIN
v4.12.0.tar.gz
Normal file
Binary file not shown.
BIN
v4.8.0.tar.gz
BIN
v4.8.0.tar.gz
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user