rpms/rubygem-hoe/devel hoe-2.6.0-test-failure-glob-order.patch, NONE, 1.1 rubygem-hoe.spec, 1.30, 1.31

Mamoru Tasaka mtasaka at fedoraproject.org
Wed Jun 2 18:09:28 UTC 2010


Author: mtasaka

Update of /cvs/extras/rpms/rubygem-hoe/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27226

Modified Files:
	rubygem-hoe.spec 
Added Files:
	hoe-2.6.0-test-failure-glob-order.patch 
Log Message:
* Thu Jun  3 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.6.0-3
- Use upstreamed patch for rubyforge-without-account.patch
- Fix test failure related to glob
  (build failed with Matt's mass build, also failed on koji)


hoe-2.6.0-test-failure-glob-order.patch:
 test_hoe_gemcutter.rb |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE hoe-2.6.0-test-failure-glob-order.patch ---
--- hoe-2.6.0/test/test_hoe_gemcutter.rb.glob	2010-06-03 02:37:28.000000000 +0900
+++ hoe-2.6.0/test/test_hoe_gemcutter.rb	2010-06-03 02:47:22.000000000 +0900
@@ -1,4 +1,8 @@
-require "hoe/gemcutter" unless defined? Hoe::Gemcutter
+require 'minitest/unit'
+unless defined? Hoe::Gemcutter
+  require "hoe"
+  require "hoe/gemcutter"
+end
 
 class TestHoeGemcutter < MiniTest::Unit::TestCase
   include Hoe::Gemcutter


Index: rubygem-hoe.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-hoe/devel/rubygem-hoe.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- rubygem-hoe.spec	2 Jun 2010 17:03:23 -0000	1.30
+++ rubygem-hoe.spec	2 Jun 2010 18:09:28 -0000	1.31
@@ -12,6 +12,8 @@ URL:        	http://rubyforge.org/projec
 Source0:    	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 # From upstream git
 Patch0:         hoe-2.6.0-rubyforge-without-account.patch
+# Must send to the upstream
+Patch1:         hoe-2.6.0-test-failure-glob-order.patch
 BuildRoot:  	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   	ruby(abi) = 1.8
 Requires:   	rubygems >= 1.3.6
@@ -56,6 +58,7 @@ gem install \
 
 pushd .%{geminstdir}
 %patch0 -p1 -b .account
+%patch1 -p1 -b .glob
 popd
 
 %build
@@ -101,8 +104,10 @@ 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
+* Thu Jun  3 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.6.0-3
 - Use upstreamed patch for rubyforge-without-account.patch
+- Fix test failure related to glob
+  (build failed with Matt's mass build, also failed on koji)
 
 * Wed Apr 28 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.6.0-1
 - 2.6.0



More information about the scm-commits mailing list