mtasaka pushed to rubygem-rmagick (master). "2.14.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 1 07:54:14 UTC 2015
>From 65a462070b5cc442cf46318b90e6c0077c164ea4 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Wed, 1 Apr 2015 16:53:51 +0900
Subject: 2.14.0
diff --git a/.gitignore b/.gitignore
index c8b490a..01943fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/rmagick-2.13.4.gem
+/rmagick-2.14.0.gem
diff --git a/RMagick-2.13.1-format-security.patch b/RMagick-2.13.1-format-security.patch
deleted file mode 100644
index b098930..0000000
--- a/RMagick-2.13.1-format-security.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- RMagick-2.13.1/ext/RMagick/rmutil.c.format 2009-12-21 19:34:58.000000000 +0900
-+++ RMagick-2.13.1/ext/RMagick/rmutil.c 2013-12-03 22:56:36.000000000 +0900
-@@ -1609,7 +1609,7 @@
- void
- rm_fatal_error_handler(const ExceptionType severity, const char *reason, const char *description)
- {
-- rb_raise(Class_FatalImageMagickError, GetLocaleExceptionMessage(severity, reason));
-+ rb_raise(Class_FatalImageMagickError, "%s", GetLocaleExceptionMessage(severity, reason));
- description = description;
- }
-
-@@ -1649,7 +1649,7 @@
- exception->description ? ": " : "",
- exception->description ? GetLocaleExceptionMessage(exception->severity, exception->description) : "");
- msg[sizeof(msg)-1] = '\0';
-- rb_warning(msg);
-+ rb_warning("%s", msg);
-
- // Caller deletes ExceptionInfo...
-
diff --git a/rubygem-rmagick.spec b/rubygem-rmagick.spec
index 5515ea9..cfb1c32 100644
--- a/rubygem-rmagick.spec
+++ b/rubygem-rmagick.spec
@@ -8,21 +8,24 @@ Requires: ImageMagick%{?_isa} = %2\
%{nil}
Name: rubygem-%{gem_name}
-Version: 2.13.4
-Release: 2%{?dist}.2
+Version: 2.14.0
+Release: 1%{?dist}
Summary: Ruby binding to ImageMagick
License: MIT
URL: https://github.com/gemhome/rmagick
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
-# Compilation fix for -Werror=format-security
-# https://github.com/gemhome/rmagick/issues/166
-# Merged upstream: https://github.com/gemhome/rmagick/commit/e8088582fab6d99fb74f1b2affd3df5997d26dff
-Patch0: RMagick-2.13.1-format-security.patch
BuildRequires: rubygems-devel
BuildRequires: ruby-devel
+%if 0%{?fedora} >= 22
BuildRequires: rubygem(test-unit)
+%endif
+%if 0%{?fedora} >= 21
+BuildRequires: rubygem(minitest4)
+%else
+BuildRequires: rubygem(minitest)
+%endif
# Due to test/RMagick/rmmain.c test_Magick_version(), for now
# we specify the exact version for ImageMagick
%if 0%{?fedora}
@@ -62,21 +65,9 @@ gem unpack %{SOURCE0}
%setup -q -D -T -n %{gem_name}-%{version}
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-%patch0 -p1
-
# permission
find . -name \*.rb -or -name \*.gif | xargs chmod ugo-x
-# shebang
-grep -rIl '^#!.*/usr/local' doc test examples | \
- xargs sed -i -e '1s|/usr/local|/usr|'
-
-# Change to test-unit
-sed -i \
- -e 's|minitest/autorun|test/unit|' \
- -e 's|Minitest::Test|Test::Unit::TestCase|' \
- test/tmpnam_test.rb
-
%build
export CFLAGS="%{optflags}"
# Make sure that .so is to be created newly
@@ -102,7 +93,8 @@ mv %{buildroot}%{gem_instdir}/lib/* \
pushd %{buildroot}%{gem_instdir}
rm -rf \
- .gitignore .travis.yml \
+ .gitignore .[^.]*.yml \
+ .simplecov \
Doxyfile Gemfile Rakefile \
before_*.sh \
doc/.cvsignore \
@@ -114,15 +106,10 @@ popd
%check
pushd .%{gem_instdir}
-# Once do full test anyway
-ruby \
-%if 0%{?fedora} >= 21
- -Ilib:ext/RMagick:test:. \
-%else
- -Ilib:test:. \
-%endif
- -e "gem 'test-unit' ; require 'test/test_all_basic.rb'" \
- || true
+
+# ??? remove simplecov
+sed -i test/test_all_basic.rb \
+ -e '\@simplecov at s|require|#require|'
remove_fail_test() {
filename=$1
@@ -142,6 +129,19 @@ remove_fail_test() {
done
}
+# First remove this
+remove_fail_test test/Image2.rb test_destroy2 test_destroy
+
+# Once do full test anyway
+ruby \
+%if 0%{?fedora} >= 21
+ -Ilib:ext/RMagick:test:. \
+%else
+ -Ilib:test:. \
+%endif
+ -e "gem 'minitest', '~> 4' ; require 'test/test_all_basic.rb'" \
+ || true
+
# Remove failing tests, need investigating
remove_fail_test test/Image_attributes.rb test_mime_type
%ifnarch %ix86 x86_64
@@ -158,7 +158,7 @@ ruby \
%else
-Ilib:test:. \
%endif
- -e "gem 'test-unit' ; require 'test/test_all_basic.rb'"
+ -e "gem 'minitest', '~> 4' ; require 'test/test_all_basic.rb'"
for f in test/*.orig ; do mv $f ${f%.orig} ; done
@@ -172,6 +172,7 @@ popd
%doc %{gem_instdir}/README.textile
%{gem_libdir}/
+%{gem_instdir}/deprecated/
%{gem_extdir_mri}/
%exclude %{gem_cache}
%{gem_spec}
@@ -182,6 +183,9 @@ popd
%doc %{gem_instdir}/examples/
%changelog
+* Wed Apr 1 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.14.0-1
+- 2.14.0
+
* Thu Mar 11 2015 Mamoru TASAKA <mtasaka at fedoraproject.org>
- F-23: rebuild against new ImageMagick
diff --git a/sources b/sources
index 8bb8816..62178c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2be71aebd8050fdc0c09ae33a8590af7 rmagick-2.13.4.gem
+857c63a14dd07c58c68bfe0b14577d2f rmagick-2.14.0.gem
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/rubygem-rmagick.git/commit/?h=master&id=65a462070b5cc442cf46318b90e6c0077c164ea4
More information about the scm-commits
mailing list