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

Mamoru Tasaka mtasaka at fedoraproject.org
Wed Feb 27 14:48:52 UTC 2013


commit a76eba35acfb260bd3eed24e2b8d2eab21f0d7e4
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Wed Feb 27 23:48:47 2013 +0900

    F-19: Rebuild for ruby 2.0.0

 rubygem-glib2.spec |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)
---
diff --git a/rubygem-glib2.spec b/rubygem-glib2.spec
index 73e5461..86236c0 100644
--- a/rubygem-glib2.spec
+++ b/rubygem-glib2.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
@@ -19,31 +21,34 @@
 Summary:	Ruby binding of GLib-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
-# https://bugzilla.redhat.com/show_bug.cgi?id=804319
-# https://github.com/ruby-gnome2/ruby-gnome2/issues/106
-Patch0:	rubygem-glib2-1.1.2-ifdef-enum.patch
-# https://github.com/ruby-gnome2/ruby-gnome2/issues/107
-Patch1:	rubygem-glib2-1.1.2-utf-endian.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
 BuildRequires:	rubygems-devel
 BuildRequires:	rubygem(pkg-config)
 BuildRequires:	ruby-devel
 BuildRequires:	glib2-devel
 # For patch
-BuildRequires:	rubygem(rake-compiler)
+#BuildRequires:	rubygem(rake-compiler)
 ## %%check
 BuildRequires:	rubygem(test-unit)
-Requires:	ruby(abi) = %{rubyabi}
 Requires:	rubygems
 # Ruby-GetText-Package support in glib2.rb
-Requires:	rubygem(gettext)
+# Seems no longer needed
+#Requires:	rubygem(gettext)
 # If someone uses gnome2-win32-binary-downloader.rb, please explicitly
 # require the following by yourself
 #Requires:	rubygem(mechanize)
@@ -178,8 +183,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
 
@@ -285,9 +290,9 @@ popd
 %{gem_instdir}/lib/glib2/deprecatable.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
 %dir	%{ruby_sitearch}/ruby-gnome2/
 %{ruby_sitearch}/ruby-gnome2/%{gem_name}.so
@@ -343,6 +348,9 @@ popd
 
 
 %changelog
+* Wed Feb 27 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