Merge remote-tracking branch 'origin/master' into f18

This commit is contained in:
Mamoru Tasaka 2012-12-31 17:40:19 +09:00
commit 033ba0485a

View File

@ -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}