[rubygem-hoe/f17] 3.0.6
Mamoru Tasaka
mtasaka at fedoraproject.org
Thu May 31 09:37:10 UTC 2012
commit de772dc841cb476553ef36e289e76eabf1ba48bf
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date: Thu May 31 18:37:07 2012 +0900
3.0.6
.gitignore | 1 +
rubygem-hoe-2.12.4-rdoctask-rescue.patch | 18 -----------
...rubygem-hoe-3.0.6-rescue-missing-Manifest.patch | 4 +-
rubygem-hoe.spec | 32 +++++++++++++++-----
sources | 2 +-
5 files changed, 28 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 88d323d..541bd57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ hoe-2.6.1.gem
/hoe-2.12.3.gem
/hoe-2.12.4.gem
/hoe-2.12.5.gem
+/hoe-3.0.6.gem
diff --git a/rubygem-hoe-2.12.2-rescue-missing-Manifest.patch b/rubygem-hoe-3.0.6-rescue-missing-Manifest.patch
similarity index 69%
rename from rubygem-hoe-2.12.2-rescue-missing-Manifest.patch
rename to rubygem-hoe-3.0.6-rescue-missing-Manifest.patch
index 47bff9c..915ef87 100644
--- a/rubygem-hoe-2.12.2-rescue-missing-Manifest.patch
+++ b/rubygem-hoe-3.0.6-rescue-missing-Manifest.patch
@@ -1,8 +1,8 @@
--- lib/hoe.rb.manifest 1970-01-01 09:00:00.000000000 +0900
-+++ lib/hoe.rb 2011-08-28 04:15:47.000000000 +0900
++++ lib/hoe.rb 2012-05-31 17:50:00.000000000 +0900
@@ -424,7 +424,7 @@
- manifest = File.read_utf("Manifest.txt").split(/\r?\n\r?/) rescue nil
+ manifest = read_manifest
- abort [
+ warn [
diff --git a/rubygem-hoe.spec b/rubygem-hoe.spec
index 80a57ac..458f629 100644
--- a/rubygem-hoe.spec
+++ b/rubygem-hoe.spec
@@ -7,17 +7,15 @@
Summary: Hoe is a simple rake/rubygems helper for project Rakefiles
Name: rubygem-%{gemname}
-Version: 2.12.5
-Release: 5%{?dist}
+Version: 3.0.6
+Release: 1%{?dist}
Group: Development/Languages
License: MIT
URL: http://rubyforge.org/projects/seattlerb/
Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
# Rescue Hoe.spec task when Manifest.txt
# seattlerb-Bugs-28571
-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
+Patch0: rubygem-hoe-3.0.6-rescue-missing-Manifest.patch
Requires: ruby(abi) = %{rubyabi}
Requires: rubygems >= 1.3.6
Requires: rubygem(rubyforge) >= 2.0.4
@@ -71,7 +69,10 @@ gem install \
pushd .%{geminstdir}
%patch0 -p0
-%patch1 -p1
+
+# Umm...
+%_fixperms .
+
%build
# Allow rake 0.9
@@ -79,10 +80,17 @@ pushd .%{gemdir}/specifications/
sed -i -e '/rake.*0\.8/s|~>|>=|' %{gemname}-%{version}.gemspec
popd
pushd .%{geminstdir}
-sed -i -e '/rake/s|~> 0\.8|>= 0.8.7|' lib/hoe.rb
+sed -i -e '/rake/s|~> 0\.8|>= 0.8.7|' \
+ lib/hoe.rb \
+ Rakefile
# Allow RubyInline 3.8.4
-sed -i -e '/RubyInline/s|~> 3\.9|>= 3.8.4|' lib/hoe/inline.rb
+sed -i -e '/RubyInline/s|~> 3\.9|>= 3.8.4|' \
+ lib/hoe/inline.rb
+
+# Allow rake-compiler 0.8.0 and above
+sed -i -e '/rake-compiler/s|~> 0\.7|>= 0.7|' \
+ lib/hoe/compiler.rb
popd
@@ -106,10 +114,15 @@ chmod 0755 %{buildroot}/%{geminstdir}/template/bin/file_name.erb
%check
pushd .%{geminstdir}
+# Save original Rakefile
+sed -i.isolate -e \
+ '/Hoe\.plugin :isolate/d' Rakefile
# Make sure that hoe currently building are loaded
export RUBYLIB=$(pwd)/lib
rake test -v --trace
+
+mv Rakefile{.isolate,}
popd
%files
@@ -132,6 +145,9 @@ popd
%{gemdir}/doc/%{gemname}-%{version}
%changelog
+* Thu May 31 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 3.0.6-1
+- 3.0.6
+
* Tue Jan 24 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 2.12.5-5
- Require rubyforge again
diff --git a/sources b/sources
index f3184a5..8088b4d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8c04090ad71123fb4b35086644a9b419 hoe-2.12.5.gem
+ad18d60333ce5698451649966a44823f hoe-3.0.6.gem
More information about the scm-commits
mailing list