[rubygem-nokogiri/el6/master: 10/10] BuildRequire rubygem(minitest) so that the test suite runs

[Mark Chappell]

commit 31c6bb451c7ac915b13811d426e9245f0019e95e
Author: Mark Chappell <tremble at fedoraproject.org>
Date:   Fri Sep 24 17:03:34 2010 +0200

    BuildRequire rubygem(minitest) so that the test suite runs

 rubygem-nokogiri.spec |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec
index 313dfe8..114c754 100644
--- a/rubygem-nokogiri.spec
+++ b/rubygem-nokogiri.spec
@@ -28,6 +28,7 @@ BuildRequires:	rubygem(hoe)
 # Not available yet
 # BuildRequires:	rubygem(hoe-debugging)
 BuildRequires:	rubygem(rake)
+BuildRequires:	rubygem(minitest)
 BuildRequires:	rubygem(rake-compiler)
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-devel
@@ -74,11 +75,7 @@ gem install \
 	%{SOURCE0}
 
 pushd .%{geminstdir}
-<<<<<<< HEAD
-%patch0 -p1 -b .fail
-=======
 %patch0 -p1 -b .orig_fail
->>>>>>> master
 popd
 
 %build