[rubygem-nokogiri/f17: 7/7] fix merge conflict

[Mamoru Tasaka]

commit 592f2ca50a36a3d0c6330cccc7434d3d3e088df6
Merge: cc9122d 9fcb90e
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Mon Dec 31 17:41:59 2012 +0900

    fix merge conflict

 rubygem-nokogiri.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --cc rubygem-nokogiri.spec
index a9da3c0,8e33852..54185f5
--- a/rubygem-nokogiri.spec
+++ b/rubygem-nokogiri.spec
@@@ -1,5 -1,5 +1,8 @@@
++%if 0%{?fedora} <= 16 && 0%{?fedora} <= 6
++%global        ruby_sitelib            %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
  %global        ruby_sitearch           %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
  %global	rubyabi		1.8
++%endif
  
  %global	mainver		1.5.5
  #%%global	prever			.beta.4
@@@ -11,7 -11,7 +14,7 @@@
  %global	gemname		nokogiri
  %global	geminstdir		%{gemdir}/gems/%{gemname}-%{mainver}%{?prever}
  
--%if %{?fedora:0%{fedora} >= 17}%{?rhel:0%{rhel} >= 7}
++%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
  %global	ruby19		1
  %global	rubyabi		1.9.1
  %global	gemdir		%{gem_dir}