[rubygem-nokogiri/el6/master: 8/10] Update to latest version

[Mark Chappell]

commit 9c25703bc2ae7a109318bc27a75bde236645404c
Merge: 1a71aa2 01c36f3
Author: Mark Chappell <tremble at fedoraproject.org>
Date:   Fri Sep 24 16:43:06 2010 +0200

    Update to latest version

 .gitignore                                   |    2 +-
 nokogiri-1.4.2-test-xml-element-number.patch |   11 +++++++++++
 rubygem-nokogiri.spec                        |   24 +++++++++++++++++++-----
 sources                                      |    2 +-
 4 files changed, 32 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 2387bdb,91d0793..677419c
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- nokogiri-1.4.1.gem
 -nokogiri-1.4.2.gem
+ nokogiri-1.4.3.1.gem
diff --cc rubygem-nokogiri.spec
index d476248,cbd5a9f..313dfe8
--- a/rubygem-nokogiri.spec
+++ b/rubygem-nokogiri.spec
@@@ -73,7 -74,7 +74,11 @@@ gem install 
  	%{SOURCE0}
  
  pushd .%{geminstdir}
++<<<<<<< HEAD
 +%patch0 -p1 -b .fail
++=======
+ %patch0 -p1 -b .orig_fail
++>>>>>>> master
  popd
  
  %build