[rubygem-hoe] Rebuild against ruby 1.9

Mamoru Tasaka mtasaka at fedoraproject.org
Sat Jan 21 23:14:28 UTC 2012


commit 26aa067900479ad7328ac804f65685be765dd66d
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Jan 22 08:14:22 2012 +0900

    Rebuild against ruby 1.9

 rubygem-hoe-2.12.4-rdoctask-rescue.patch |    4 ++--
 rubygem-hoe.spec                         |   20 +++++++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/rubygem-hoe-2.12.4-rdoctask-rescue.patch b/rubygem-hoe-2.12.4-rdoctask-rescue.patch
index 7ccf2fb..12753e2 100644
--- a/rubygem-hoe-2.12.4-rdoctask-rescue.patch
+++ b/rubygem-hoe-2.12.4-rdoctask-rescue.patch
@@ -1,5 +1,5 @@
 --- hoe-2.12.4/lib/hoe/publish.rb.dep	2011-12-04 21:42:40.000000000 +0900
-+++ hoe-2.12.4/lib/hoe/publish.rb	2011-12-04 21:48:08.000000000 +0900
++++ hoe-2.12.4/lib/hoe/publish.rb	2012-01-22 06:27:08.000000000 +0900
 @@ -98,10 +98,14 @@
            require 'rdoc/task'
          rescue LoadError
@@ -7,7 +7,7 @@
 +          rdoctask = Rake::RDocTask
          end
        end
-+      if defined? RDoc::Task:
++      if defined? RDoc::Task then
 +        rdoctask = RDoc::Task
 +      end
  
diff --git a/rubygem-hoe.spec b/rubygem-hoe.spec
index 441700f..6139a50 100644
--- a/rubygem-hoe.spec
+++ b/rubygem-hoe.spec
@@ -1,11 +1,14 @@
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemdir %{gem_dir}
 %global gemname hoe
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global	gem_name	%{gemname}
+%global geminstdir %{gem_instdir}
+
+%global	rubyabi	1.9.1
 
 Summary:    	Hoe is a simple rake/rubygems helper for project Rakefiles
 Name:       	rubygem-%{gemname}
 Version:    	2.12.5
-Release:    	2%{?dist}
+Release:    	4%{?dist}
 Group:      	Development/Languages
 License:    	MIT
 URL:        	http://rubyforge.org/projects/seattlerb/
@@ -15,16 +18,16 @@ Source0:    	http://rubygems.org/gems/%{gemname}-%{version}.gem
 Patch0:		rubygem-hoe-2.12.2-rescue-missing-Manifest.patch
 # Rescue RDoc::Task when rubygem(rdoc) is not installed
 Patch1:		rubygem-hoe-2.12.4-rdoctask-rescue.patch
-Requires:   	ruby(abi) = 1.8
+Requires:   	ruby(abi) = %{rubyabi}
 Requires:   	rubygems >= 1.3.6
-Requires:   	rubygem(rubyforge) >= 2.0.4
+#Requires:   	rubygem(rubyforge) >= 2.0.4
 Requires:   	rubygem(rake)      >= 0.8.7
 #Requires:       rubygem(minitest)  >= 1.7.0
-BuildRequires:  rubygems >= 1.3.6
+BuildRequires:  rubygems-devel >= 1.3.6
 # %%check
 BuildRequires:	rubygem(minitest)
 BuildRequires:	rubygem(rake)
-BuildRequires:	rubygem(rubyforge)
+#BuildRequires:	rubygem(rubyforge)
 BuildArch:  	noarch
 Provides:   	rubygem(%{gemname}) = %{version}
 
@@ -129,6 +132,9 @@ popd
 %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Sun Jan 21 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 2.12.5-4
+- Rebuild against ruby 1.9
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list