[rubygem-imagesize] F-19: Rebuild for ruby 2.0.0

Mamoru Tasaka mtasaka at fedoraproject.org
Thu Mar 7 07:12:45 UTC 2013


commit 098a84433eae6e7c04cc0e77e0d6fdff63a792a6
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Thu Mar 7 16:12:35 2013 +0900

    F-19: Rebuild for ruby 2.0.0

 rubygem-imagesize-0.1.1-regex-magic.patch |    7 +++++++
 rubygem-imagesize.spec                    |   26 +++++++++++++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)
---
diff --git a/rubygem-imagesize-0.1.1-regex-magic.patch b/rubygem-imagesize-0.1.1-regex-magic.patch
new file mode 100644
index 0000000..7485bf1
--- /dev/null
+++ b/rubygem-imagesize-0.1.1-regex-magic.patch
@@ -0,0 +1,7 @@
+--- imagesize-0.1.1/lib/image_size.rb.magic	2013-03-07 15:21:32.000000000 +0900
++++ imagesize-0.1.1/lib/image_size.rb	2013-03-07 15:28:09.000000000 +0900
+@@ -1,3 +1,4 @@
++# encoding:binary
+ 
+ class ImageSize
+   require "stringio"
diff --git a/rubygem-imagesize.spec b/rubygem-imagesize.spec
index 4453631..2345a7c 100644
--- a/rubygem-imagesize.spec
+++ b/rubygem-imagesize.spec
@@ -1,10 +1,12 @@
 %global		gem_name		imagesize
+%if 0%{?fedora} < 19
 %global		rubyabi		1.9.1
+%endif
 
 Summary:	Measure image size(GIF, PNG, JPEG ,,, etc)
 Name:		rubygem-%{gem_name}
 Version:	0.1.1
-Release:	11%{?dist}
+Release:	12%{?dist}
 Group:		Development/Languages
 License:	GPLv2 or Ruby
 
@@ -13,10 +15,20 @@ Source0:	http://rubygems.org/gems/%{gem_name}-%{version}.gem
 # With ruby1.9 handling regex needs some encoding treatment...
 # bz819188
 Patch0:         ruby-imagesize-0.1.1-ruby19-regex-utf8.patch
+# Change the default encoding for regex
+Patch1:         rubygem-imagesize-0.1.1-regex-magic.patch
 
+%if 0%{?fedora} >= 19
+Requires:	ruby(release)
+BuildRequires:	ruby(release)
+%else
 Requires:	ruby(abi) = %{rubyabi}
+Requires:	ruby 
+BuildRequires:	ruby(abi) = %{rubyabi}
+BuildRequires:	ruby 
+%endif
+
 Requires:	rubygems
-BuildRequires:		ruby(abi) = %{rubyabi}
 BuildRequires:		rubygems-devel
 BuildRequires:		rubygem(minitest)
 # Don't create ruby-%%{gem_name} on F-17+
@@ -57,6 +69,7 @@ sed -i -e '1d' -e 's|\r||' lib/image_size.rb
 
 # Patches
 %patch0 -p1
+%patch1 -p1
 
 gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec
 #ERROR:  While executing gem ... (Gem::InvalidSpecificationException)
@@ -70,11 +83,7 @@ popd
 rm -rf tmpunpackdir
 
 %build
-gem install \
-	--local -V \
-	--install-dir .%{gem_dir} \
-	--force \
-	./%{gem_name}-%{version}.gem
+%gem_install
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
@@ -105,6 +114,9 @@ ruby -Ilib -rtest/unit ./test/test_image_size.rb || echo "rescue for now"
 %exclude	%{gem_instdir}/test/
 
 %changelog
+* Thu Mar  7 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.1.1-12
+- F-19: Rebuild for ruby 2.0.0
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list