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

Mamoru Tasaka mtasaka at fedoraproject.org
Thu Mar 7 05:38:08 UTC 2013


commit 98c5b39787866101f5a93dbbf88ed3bab4d87daa
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Thu Mar 7 14:38:02 2013 +0900

    F-19: Rebuild for ruby 2.0.0

 rubygem-ruby-opengl.spec |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)
---
diff --git a/rubygem-ruby-opengl.spec b/rubygem-ruby-opengl.spec
index 60210b5..8bc1e73 100644
--- a/rubygem-ruby-opengl.spec
+++ b/rubygem-ruby-opengl.spec
@@ -1,5 +1,7 @@
 %if 0%{fedora} >= 17
+%if 0%{?fedora} < 19
 %define	rubyabi		1.9.1
+%endif
 %else
 %define	ruby_sitelib		%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %define	ruby_sitearch		%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
@@ -11,7 +13,7 @@
 Summary:	OpenGL Interface for Ruby
 Name:		rubygem-%{gem_name}
 Version:	0.60.1
-Release:	11%{?dist}
+Release:	12%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://ruby-opengl.rubyforge.org/
@@ -20,15 +22,23 @@ Patch0:	rubygem-ruby-opengl-0.60.1-ruby19-macro.patch
 Patch1:	rubygem-ruby-opengl-0.60.1-newrake.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?fedora} >= 19
+Requires:	ruby(release)
+BuildRequires:	ruby(release)
+%else
+Requires:	ruby(abi) = %{rubyabi}
+Requires:	ruby 
+BuildRequires:	ruby(abi) = %{rubyabi}
+BuildRequires:	ruby 
+%endif
+
 BuildRequires:	freeglut-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
-BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	rubygems-devel
 BuildRequires:	rubygem(mkrf)
 BuildRequires:	rubygem(rake)
 BuildRequires:	ruby-devel
-Requires:	ruby(abi) = %{rubyabi}
 Requires:	ruby(rubygems)
 Provides:	rubygem(%{gem_name}) = %{version}-%{release}
 %if %{fedora} >= 17
@@ -96,12 +106,7 @@ export RUBYLIB=$(pwd)
 %endif
 
 export rake="rake --trace"
-
-gem install \
-	--local \
-	--install-dir ./%{gem_dir} \
-	-V --force \
-	./%{gem_name}-%{version}.gem
+%gem_install
 
 %install
 rm -rf %{buildroot}
@@ -109,8 +114,8 @@ mkdir -p %{buildroot}%{gem_dir}
 cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}
 
 %if 0%{?fedora} >= 17
-mkdir -p %{buildroot}%{gem_extdir}/lib
-mv %{buildroot}%{gem_instdir}/lib/*.so %{buildroot}%{gem_extdir}/lib
+mkdir -p %{buildroot}%{gem_extdir_mri}/lib
+mv %{buildroot}%{gem_instdir}/lib/*.so %{buildroot}%{gem_extdir_mri}/lib
 %else
 mkdir -p %{buildroot}%{ruby_sitearch}
 mv %{buildroot}%{gem_instdir}/lib/*.so %{buildroot}%{ruby_sitearch}
@@ -193,9 +198,9 @@ exit 0
 %files
 %defattr(-,root, root,-)
 %if 0%{?fedora} >= 17
-%dir %{gem_extdir}
-%dir %{gem_extdir}/lib
-%{gem_extdir}/lib/*.so
+%dir %{gem_extdir_mri}
+%dir %{gem_extdir_mri}/lib
+%{gem_extdir_mri}/lib/*.so
 %else
 %{ruby_sitearch}/*.so
 %endif
@@ -219,6 +224,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Mar  7 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.60.1-12
+- F-19: Rebuild for ruby 2.0.0
+
 * Thu Feb  7 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.60.1-11
 - Patch for new rake
 


More information about the scm-commits mailing list