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

Mamoru Tasaka mtasaka at fedoraproject.org
Thu Mar 7 06:03:03 UTC 2013


commit 068fcfad261b65e411a246607b654930d7eb852b
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Thu Mar 7 15:02:54 2013 +0900

    F-19: Rebuild for ruby 2.0.0

 rubygem-hpricot.spec |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 deletions(-)
---
diff --git a/rubygem-hpricot.spec b/rubygem-hpricot.spec
index 05c2c24..c585972 100644
--- a/rubygem-hpricot.spec
+++ b/rubygem-hpricot.spec
@@ -1,6 +1,8 @@
 # Initially generated from hpricot-0.6.164.gem by gem2rpm -*- rpm-spec -*-
 %if 0%{?fedora} >= 17
+%if 0%{?fedora} < 19
 %define	rubyabi		1.9.1
+%endif
 %else
 %define	rubyabi		1.8
 %define        ruby_sitelib            %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
@@ -12,7 +14,7 @@
 Summary:	A Fast, Enjoyable HTML Parser for Ruby
 Name:		rubygem-%{gem_name}
 Version:	0.8.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Group:		Development/Languages
 # ext/fast_xs/FastXsService.java is licensed under ASL 2.0
 License:	MIT and ASL 2.0
@@ -22,20 +24,26 @@ URL:		http://github.com/hpricot/hpricot
 Source0:	%{gem_name}-%{version}-modified.gem
 Source10:	rubygem-hpricot-create-free-gem.sh
 
+%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
 # Recompile
 BuildRequires:	rubygem(rake)
 # Others
 BuildRequires:	rubygem(rake-compiler)
-%if 0%{?fedora} >= 16
 BuildRequires:	rubygem(rdoc)
-%endif
 BuildRequires:	ruby-devel
 BuildRequires:	ragel
 BuildRequires:  rubygem(minitest)
 BuildRequires:  rubygem(rake)
-Requires:	ruby(abi) = %{rubyabi}
 Requires:	ruby(rubygems)
 Provides:	rubygem(%{gem_name}) = %{version}-%{release}
 %if 0%{?fedora} >= 17
@@ -69,13 +77,7 @@ This package provides non-Gem support for %{gem_name}.
 
 %prep
 %setup -q -T -c
-mkdir -p ./%{gem_dir}
-export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
-gem install \
-	--local \
-	--install-dir ./%{gem_dir} \
-	-V --force \
-	%{SOURCE0}
+%gem_install -n %{SOURCE0}
 
 pushd .%{gem_instdir}/test
 # Kill tests related to BOINGBOING, licensed under CC-BY-NC
@@ -93,8 +95,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_libdir}/*.so %{buildroot}%{gem_extdir}/lib
+mkdir -p %{buildroot}%{gem_extdir_mri}/lib
+mv %{buildroot}%{gem_libdir}/*.so %{buildroot}%{gem_extdir_mri}/lib
 %else
 mkdir -p %{buildroot}%{ruby_sitearch}
 mv %{buildroot}%{gem_libdir}/*.so %{buildroot}%{ruby_sitearch}/
@@ -201,7 +203,7 @@ popd
 %files
 %defattr(-,root, root,-)
 %if 0%{?fedora} >= 17
-%{gem_extdir}
+%{gem_extdir_mri}
 %else
 %{ruby_sitearch}/*.so
 %endif
@@ -227,6 +229,9 @@ popd
 %endif
 
 %changelog
+* Thu Mar  7 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 0.8.6-4
+- F-19: Rebuild for ruby 2.0.0
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list