[rubygem-rubyforge] F-17: rebuild against ruby 19

Mamoru Tasaka mtasaka at fedoraproject.org
Tue Jan 24 09:48:53 UTC 2012


commit fd43c33978aa024dc9ae681f3a6f6f8996fd130a
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Tue Jan 24 18:48:49 2012 +0900

    F-17: rebuild against ruby 19

 rubygem-rubyforge.spec |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)
---
diff --git a/rubygem-rubyforge.spec b/rubygem-rubyforge.spec
index 8243945..d3d8e85 100644
--- a/rubygem-rubyforge.spec
+++ b/rubygem-rubyforge.spec
@@ -2,21 +2,29 @@
 %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global gemname rubyforge
 %global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global	 rubyabi 1.8
 
 # Depency loop here. Kill test when resolving dependency loop
 # is needed
 %global enable_test 1
 
+%if 0%{?fedora} >= 17
+%global	gem_name	%{gemname}
+%global	gemdir	%{gem_dir}
+%global	geminstdir	%{gem_instdir}
+%global	rubyabi	1.9.1
+%endif
+
 Summary:       A script which automates a limited set of rubyforge operations
 Name:          rubygem-%{gemname}
 Version:       2.0.4
-Release:       4%{?dist}
+Release:       5%{?dist}
 Group:         Development/Languages
 License:       MIT
 URL:           http://rubyforge.org/projects/codeforpeople
 Source0:       http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:      ruby(abi) = 1.8
+Requires:      ruby(abi) = %{rubyabi}
 Requires:      rubygems
 Requires:      rubygem(json) >= 1.1.7
 BuildRequires: rubygems
@@ -27,6 +35,9 @@ BuildRequires: rubygem(json)
 # The following line causes dependency loop
 BuildRequires: rubygem(hoe)
 %endif
+%if 0%{?fedora} >= 17
+BuildRequires: rubygems-devel
+%endif
 BuildArch:     noarch
 Provides:      rubygem(%{gemname}) = %{version}
 
@@ -59,7 +70,6 @@ find . -name Rakefile -or -name \*.gemspec | \
 %build
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
 cp -a .%{gemdir}/* %{buildroot}/%{gemdir}/
 
@@ -71,23 +81,16 @@ find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
 chmod 0755 %{buildroot}%{geminstdir}/lib/rubyforge.rb
 chmod 0755 %{buildroot}%{geminstdir}/bin/rubyforge
 
-%clean
-rm -rf %{buildroot}
-
 %check
 %if ! %{enable_test}
 exit 0
 %endif
 
-pushd .%{gemdir}
-# Hoe needs rubyforge, so make it sure that system-widely installed
-# Hoe looks for rubyforge just trying to install now first, not
-# system-widely installed rubyforge
-export GEM_PATH=$(pwd)
-popd
+mkdir TMP
+export TMPDIR=$(pwd)/TMP
 
 pushd .%{geminstdir}
-rake test
+ruby -rubygems -Ilib -S rake test
 popd
 
 %files
@@ -110,6 +113,9 @@ popd
 
 
 %changelog
+* Tue Jan 24 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 2.0.4-5
+- F-17: rebuild against ruby 19
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list