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

Mamoru Tasaka mtasaka at fedoraproject.org
Thu Mar 7 07:32:49 UTC 2013


commit 752035faa61304df85d5682801a1fa91d724fb45
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Thu Mar 7 16:32:42 2013 +0900

    F-19: Rebuild for ruby 2.0.0

 rubygem-rsvg2.spec |   44 +++++++++++++++++++++-----------------------
 1 files changed, 21 insertions(+), 23 deletions(-)
---
diff --git a/rubygem-rsvg2.spec b/rubygem-rsvg2.spec
index 8c0901c..71f13e4 100644
--- a/rubygem-rsvg2.spec
+++ b/rubygem-rsvg2.spec
@@ -1,15 +1,8 @@
-%if 0%{?fedora} >= 17
+%if 0%{?fedora} < 19
 %global	rubyabi	1.9.1
+%endif
 %global	header_dir	%{ruby_vendorarchdir}
 %global	ruby19	1
-%else
-%global	ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%global	ruby_sitearch	%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
-
-%global	rubyabi	1.8
-%global	header_dir	%{ruby_sitearch}
-%global	ruby19	0
-%endif
 
 %global	gem_name	rsvg2
 
@@ -19,20 +12,28 @@
 Summary:	Ruby binding of librsvg-2.x
 Name:		rubygem-%{gem_name}
 Version:	1.2.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Group:		Development/Languages
 # from README
 License:	LGPLv2
 URL:		http://ruby-gnome2.sourceforge.jp/
 Source0:	http://rubygems.org/gems/%{gem_name}-%{version}.gem
 
+%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:	rubygem-cairo-devel
 BuildRequires:	rubygem-glib2-devel >= %{glibminver}
 BuildRequires:	ruby-devel
 BuildRequires:	rubygems-devel
 BuildRequires:	librsvg2-devel
-Requires:	ruby(abi) = %{rubyabi}
 Requires:	rubygem(cairo)
 Requires:	rubygem(gdk_pixbuf2) >= %{glibminver}
 Requires:	rubygem(glib2) >= %{glibminver}
@@ -92,13 +93,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
 
@@ -140,8 +135,8 @@ pushd %{buildroot}
 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
@@ -234,9 +229,9 @@ create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
 
 %{gem_instdir}/lib/%{gem_name}.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
@@ -262,6 +257,9 @@ create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
 %{gem_instdir}/sample/
 
 %changelog
+* Thu Mar  7 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