From 033ba0485a3aef8aa8a28553e1617bed02e3c498 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <tasaka1@localhost.localdomain>
Date: Dec 31 2012 08:40:19 +0000
Subject: Merge remote-tracking branch 'origin/master' into f18


---

diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec
index 8e33852..54185f5 100644
--- a/rubygem-nokogiri.spec
+++ b/rubygem-nokogiri.spec
@@ -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 +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}