From 7dd6ca4bef3e95eff80c32c446a8ba9e96fa48b8 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 26 Jun 2011 01:18:01 +0900 Subject: [PATCH] Remove unneeded patch --- ...m-nokogiri-1.5.0.beta4-add-dsl-for-newer-rake.patch | 10 ---------- rubygem-nokogiri.spec | 10 ++++------ 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 rubygem-nokogiri-1.5.0.beta4-add-dsl-for-newer-rake.patch 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 deleted file mode 100644 index 1767118..0000000 --- a/rubygem-nokogiri-1.5.0.beta4-add-dsl-for-newer-rake.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 3a62b47..e8917e2 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -5,7 +5,7 @@ %global mainver 1.5.0 %global prever .beta.4 -%global mainrel 4 +%global mainrel 5 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) @@ -27,10 +27,6 @@ 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) ## @@ -99,7 +95,6 @@ gem install \ # patches pushd .%{geminstdir} #%%patch0 -p1 -%patch1 -p1 popd # Permission @@ -271,6 +266,9 @@ popd %{ruby_sitelib}/xsd/ %changelog +* Sun Jun 26 2011 Mamoru Tasaka - 1.5.0-0.5.beta4 +- Remove unneeded patch + * Thu Mar 18 2011 Mamoru Tasaka - 1.5.0-0.4.beta4 - Patch for newer rake to make testsuite run