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

Mamoru Tasaka mtasaka at fedoraproject.org
Sun Mar 3 04:01:28 UTC 2013


commit 78a10c2dacb37eb73e525b87dd1f7ed1dd9ca2ac
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Sun Mar 3 13:01:21 2013 +0900

    F-19: Rebuild for ruby 2.0.0

 rubygem-gtk2.spec |   35 +++++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 14 deletions(-)
---
diff --git a/rubygem-gtk2.spec b/rubygem-gtk2.spec
index 8f6bcfc..97d9d1f 100644
--- a/rubygem-gtk2.spec
+++ b/rubygem-gtk2.spec
@@ -1,6 +1,8 @@
 %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
 
+%if 0%{?fedora} < 19
 %global	rubyabi	1.9.1
+%endif
 %global	header_dir	%{ruby_vendorarchdir}
 %global	ruby19	1
 %else
@@ -18,6 +20,16 @@
 %global	pangominver	1.2.0
 %global	obsoleteevr	0.90.7-1.999
 
+%if 0%{?fedora} >= 19
+Requires:	ruby(release)
+BuildRequires:	ruby(release)
+%else
+Requires:	ruby(abi) = %{rubyabi}
+Requires:	ruby 
+BuildRequires:	ruby(abi) = %{rubyabi}
+BuildRequires:	ruby 
+%endif
+
 Summary:	Ruby binding of GTK+-2.x
 Name:		rubygem-%{gem_name}
 Version:	1.2.1
@@ -28,14 +40,12 @@ License:	LGPLv2
 URL:		http://ruby-gnome2.sourceforge.jp/
 Source0:	http://rubygems.org/downloads/%{gem_name}-%{version}.gem
 
-BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	rubygems-devel
 BuildRequires:	rubygem-cairo-devel
 BuildRequires:	rubygem-glib2-devel >= %{glibminver}
 BuildRequires:	rubygem-pango-devel >= %{pangominver}
 BuildRequires:	ruby-devel
 BuildRequires:	gtk2-devel
-Requires:	ruby(abi) = %{rubyabi}
 Requires:	rubygems
 Requires:	rubygem(atk) >= %{glibminver}
 Requires:	rubygem(gdk_pixbuf2) >= %{glibminver}
@@ -98,13 +108,7 @@ mkdir -p .%{gem_dir}
 
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
 export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-pkg-config-dir=$(pwd)%{_libdir}/pkgconfig"
-gem install \
-	-V \
-	--local \
-	--install-dir .%{gem_dir} \
-	--force \
-	--rdoc \
-	%{SOURCE0}
+%gem_install -n %{SOURCE0}
 
 find . -name \*.gem | xargs chmod 0644
 
@@ -150,8 +154,8 @@ mv .%{gem_instdir}/lib/*.h .%{header_dir}/
 mkdir -p .%{ruby_sitearch}/ruby-gnome2
 mv .%{gem_instdir}/lib/ruby-gnome2/%{gem_name}.so .%{ruby_sitearch}/ruby-gnome2/
 %else
-mkdir -p .%{gem_extdir}/lib
-mv .%{gem_instdir}/lib/%{gem_name}.so .%{gem_extdir}/lib
+mkdir -p .%{gem_extdir_mri}/lib
+mv .%{gem_instdir}/lib/%{gem_name}.so .%{gem_extdir_mri}/lib
 %endif
 popd
 
@@ -259,9 +263,9 @@ ruby -Itest ./test/run-test.rb
 %{gem_instdir}/lib/%{gem_name}.rb
 %{gem_instdir}/lib/%{gem_name}/base.rb
 %if %{ruby19}
-%dir	%{gem_extdir}
-%dir	%{gem_extdir}/lib
-%{gem_extdir}/lib/%{gem_name}.so
+%dir	%{gem_extdir_mri}
+%dir	%{gem_extdir_mri}/lib
+%{gem_extdir_mri}/lib/%{gem_name}.so
 %else
 # %%ruby_sitearch/ruby-gnome2 is owned by rubygem-glib2
 %{ruby_sitearch}/ruby-gnome2/%{gem_name}.so
@@ -294,6 +298,9 @@ ruby -Itest ./test/run-test.rb
 %{gem_instdir}/test/
 
 %changelog
+* Sun Mar  3 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.2.1-2
+- F-19: Rebuild for ruby 2.0.0
+
 * Mon Feb  4 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1.2.1-1
 - 1.2.1
 


More information about the scm-commits mailing list