summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMamoru Tasaka <tasaka1@localhost.localdomain>2011-03-18 05:18:34 +0900
committerMamoru Tasaka <tasaka1@localhost.localdomain>2011-03-18 05:18:34 +0900
commita86b5ca51b544c23256c775de2b217e99fd5e16f (patch)
treedf1d8287f9a4f61ffcc866c90672f7e5b5f2781f
parentf328d7505600b70acc45832547fca6671ebe40ef (diff)
downloadrubygem-nokogiri-a86b5ca51b544c23256c775de2b217e99fd5e16f.tar.gz
rubygem-nokogiri-a86b5ca51b544c23256c775de2b217e99fd5e16f.tar.xz
rubygem-nokogiri-a86b5ca51b544c23256c775de2b217e99fd5e16f.zip
Patch for newer rake to make testsuite run
-rw-r--r--rubygem-nokogiri-1.5.0.beta4-add-dsl-for-newer-rake.patch10
-rw-r--r--rubygem-nokogiri.spec13
2 files changed, 20 insertions, 3 deletions
diff --git a/rubygem-nokogiri-1.5.0.beta4-add-dsl-for-newer-rake.patch b/rubygem-nokogiri-1.5.0.beta4-add-dsl-for-newer-rake.patch
new file mode 100644
index 0000000..1767118
--- /dev/null
+++ b/rubygem-nokogiri-1.5.0.beta4-add-dsl-for-newer-rake.patch
@@ -0,0 +1,10 @@
+--- nokogiri-1.5.0.beta.4/Rakefile.debug 2011-03-18 03:28:41.000000000 +0900
++++ nokogiri-1.5.0.beta.4/Rakefile 2011-03-18 04:26:44.000000000 +0900
+@@ -3,6 +3,7 @@
+ require 'rubygems'
+ gem 'hoe', '>= 2.1.0'
+ require 'hoe'
++require 'rake/dsl'
+
+ windows = RUBY_PLATFORM =~ /(mswin|mingw)/i
+ java = RUBY_PLATFORM =~ /java/
diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec
index f745342..3a62b47 100644
--- a/rubygem-nokogiri.spec
+++ b/rubygem-nokogiri.spec
@@ -5,7 +5,7 @@
%global mainver 1.5.0
%global prever .beta.4
-%global mainrel 3
+%global mainrel 4
%global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g')
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
@@ -20,14 +20,17 @@
Summary: An HTML, XML, SAX, and Reader parser
Name: rubygem-%{gemname}
Version: %{mainver}
-Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1
+Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}
Group: Development/Languages
License: MIT
URL: http://nokogiri.rubyforge.org/nokogiri/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{mainver}%{?prever}.gem
# ./test/html/test_element_description.rb:62 fails, as usual......
# Patch0: rubygem-nokogiri-1.5.0.beta3-test-failure.patch
-
+# Patch for newer rake (>= 0.9.0 beta.2),
+# rake aborted!
+# Don't know how to build task 'check_manifest'
+Patch1: rubygem-nokogiri-1.5.0.beta4-add-dsl-for-newer-rake.patch
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires: ruby(rubygems)
##
@@ -96,6 +99,7 @@ gem install \
# patches
pushd .%{geminstdir}
#%%patch0 -p1
+%patch1 -p1
popd
# Permission
@@ -267,6 +271,9 @@ popd
%{ruby_sitelib}/xsd/
%changelog
+* Thu Mar 18 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.5.0-0.4.beta4
+- Patch for newer rake to make testsuite run
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-0.3.beta4.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild