rpms/rubygem-hoe/F-12 hoe-2.6.0-rubyforge-without-account.patch, 1.1, 1.2 rubygem-hoe.spec, 1.28, 1.29
Mamoru Tasaka
mtasaka at fedoraproject.org
Wed Jun 2 17:03:23 UTC 2010
- Previous message: rpms/javasqlite/EL-6 .cvsignore, 1.8, 1.9 javasqlite.spec, 1.16, 1.17 sources, 1.8, 1.9
- Next message: rpms/rubygem-hoe/F-13 hoe-2.6.0-rubyforge-without-account.patch, 1.1, 1.2 rubygem-hoe.spec, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/rubygem-hoe/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19136/F-12
Modified Files:
hoe-2.6.0-rubyforge-without-account.patch rubygem-hoe.spec
Log Message:
* Thu Jun 3 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.6.0-2
- Use upstreamed patch for rubyforge-without-account.patch
hoe-2.6.0-rubyforge-without-account.patch:
lib/hoe.rb | 2 +-
lib/hoe/rubyforge.rb | 14 +++++++++-----
test/test_hoe.rb | 6 ++++--
3 files changed, 14 insertions(+), 8 deletions(-)
Index: hoe-2.6.0-rubyforge-without-account.patch
===================================================================
RCS file: /cvs/extras/rpms/rubygem-hoe/F-12/hoe-2.6.0-rubyforge-without-account.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hoe-2.6.0-rubyforge-without-account.patch 3 May 2010 16:57:04 -0000 1.1
+++ hoe-2.6.0-rubyforge-without-account.patch 2 Jun 2010 17:03:22 -0000 1.2
@@ -1,23 +1,62 @@
---- hoe-2.6.0/lib/hoe/rubyforge.rb.account 2010-04-28 15:34:32.000000000 +0900
-+++ hoe-2.6.0/lib/hoe/rubyforge.rb 2010-04-28 16:11:18.000000000 +0900
-@@ -40,12 +40,20 @@
- end
+commit 9c85d4b40f63716608f5d36ee3ac00e832fe0404
+Author: Ryan Davis <ryand at zenspider.com>
+Date: Tue Jun 1 15:20:02 2010 -0800
+
+ - Fix up hoe to be happy when rubyforge is missing or misconfigured
+ [git-p4: depot-paths = "//src/hoe/dev/": change = 5750]
+
+diff --git a/lib/hoe.rb b/lib/hoe.rb
+index ef04b5d..246be9f 100644
+--- a/lib/hoe.rb
++++ b/lib/hoe.rb
+@@ -386,7 +386,7 @@ class Hoe
+
+ unless self.version then
+ version = nil
+- version_re = /VERSION += +([\"\'])([\d][\d\w\.]+)\1/
++ version_re = /VERSION += +([\"\'])([\d][\w\.]+)\1/
+
+ spec.files.each do |file|
+ next unless File.exist? file
+diff --git a/lib/hoe/rubyforge.rb b/lib/hoe/rubyforge.rb
+index 6ec893d..b36ab39 100644
+--- a/lib/hoe/rubyforge.rb
++++ b/lib/hoe/rubyforge.rb
+@@ -41,11 +41,15 @@ module Hoe::RubyForge
if Hoe.plugins.include? :publish then
-+ begin
path = File.expand_path("~/.rubyforge/user-config.yml")
- config = YAML.load(File.read(path))
- base = "/var/www/gforge-projects"
- dir = "#{base}/#{rubyforge_name}/#{remote_rdoc_dir}"
-
- rdoc_locations << "#{config["username"]}@rubyforge.org:#{dir}"
-+
-+ rescue Errno::ENOENT => err
-+ hoe_ver = Hoe::VERSION
-+ msg = err.message
-+ # puts "Hoe #{hoe_ver}: warning: #{msg}"
-+ end
+- config = YAML.load(File.read(path))
+- base = "/var/www/gforge-projects"
+- dir = "#{base}/#{rubyforge_name}/#{remote_rdoc_dir}"
+-
+- rdoc_locations << "#{config["username"]}@rubyforge.org:#{dir}"
++ config = YAML.load(File.read(path)) rescue nil
++ if config then
++ base = "/var/www/gforge-projects"
++ dir = "#{base}/#{rubyforge_name}/#{remote_rdoc_dir}"
+
++ rdoc_locations << "#{config["username"]}@rubyforge.org:#{dir}"
++ else
++ warn "Couldn't read #{path}. Run `rubyforge setup`."
++ end
end
end
end
+diff --git a/test/test_hoe.rb b/test/test_hoe.rb
+index a64785f..154981e 100644
+--- a/test/test_hoe.rb
++++ b/test/test_hoe.rb
+@@ -53,8 +53,10 @@ class TestHoe < MiniTest::Unit::TestCase
+
+ deps = spec.dependencies.sort_by { |dep| dep.name }
+
+- expected = [["hoe", :development, ">= #{Hoe::VERSION}"],
+- ["rubyforge", :development, ">= #{::RubyForge::VERSION}"]]
++ expected = [["hoe", :development, ">= #{Hoe::VERSION}"]]
++
++ expected << ["rubyforge", :development, ">= #{::RubyForge::VERSION}"] if
++ defined? ::RubyForge
+
+ assert_equal expected, deps.map { |dep|
+ [dep.name, dep.type, dep.requirement.to_s]
Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-hoe/F-12/rubygem-hoe.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- rubygem-hoe.spec 3 May 2010 16:57:04 -0000 1.28
+++ rubygem-hoe.spec 2 Jun 2010 17:03:22 -0000 1.29
@@ -5,11 +5,12 @@
Summary: Hoe is a simple rake/rubygems helper for project Rakefiles
Name: rubygem-%{gemname}
Version: 2.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Development/Languages
License: MIT
URL: http://rubyforge.org/projects/seattlerb/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+# From upstream git
Patch0: hoe-2.6.0-rubyforge-without-account.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: ruby(abi) = 1.8
@@ -100,6 +101,9 @@ popd
%doc %{gemdir}/doc/%{gemname}-%{version}
%changelog
+* Thu Jun 3 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.6.0-2
+- Use upstreamed patch for rubyforge-without-account.patch
+
* Wed Apr 28 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.6.0-1
- 2.6.0
- gemcutter dependency dropped
- Previous message: rpms/javasqlite/EL-6 .cvsignore, 1.8, 1.9 javasqlite.spec, 1.16, 1.17 sources, 1.8, 1.9
- Next message: rpms/rubygem-hoe/F-13 hoe-2.6.0-rubyforge-without-account.patch, 1.1, 1.2 rubygem-hoe.spec, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list