From 2e45c5f4ac796153011c3606ef85366c78d3e1b6 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 28 Mar 2013 12:27:33 +0900 Subject: [PATCH] 1.5.9 --- .gitignore | 1 + rubygem-nokogiri.spec | 20 +++++++++++++++++--- sources | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2c7df60..68657bf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ nokogiri-1.4.3.1.gem /nokogiri-1.5.2.gem /nokogiri-1.5.5.gem /nokogiri-1.5.6.gem +/nokogiri-1.5.9.gem diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index c5fd30e..0a702d0 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -3,10 +3,10 @@ %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") %endif -%global mainver 1.5.6 +%global mainver 1.5.9 #%%global prever .beta.4 -%global mainrel 3 +%global mainrel 1 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) @@ -14,6 +14,9 @@ %global geminstdir %{gemdir}/gems/%{gemname}-%{mainver}%{?prever} %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 +%if 0%{?fedora} < 19 +%global rubyabi 1.9.1 +%endif %global ruby19 1 %global gemdir %{gem_dir} %global geminstdir %{gem_instdir} @@ -40,7 +43,16 @@ Source0: http://gems.rubyforge.org/gems/%{gemname}-%{mainver}%{?prever}.gem # ./test/html/test_element_description.rb:62 fails, as usual...... # Patch0: rubygem-nokogiri-1.5.0.beta3-test-failure.patch #Patch0: rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch +%if 0%{?fedora} >= 19 +Requires: ruby(release) BuildRequires: ruby(release) +%else +Requires: ruby(abi) = %{rubyabi} +Requires: ruby +BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: ruby +%endif + BuildRequires: ruby(rubygems) ## ## For %%check @@ -55,7 +67,6 @@ Obsoletes: ruby-%{gemname} <= 1.5.2-2 BuildRequires: libxml2-devel BuildRequires: libxslt-devel BuildRequires: ruby-devel -Requires: ruby(release) Requires: ruby(rubygems) Provides: rubygem(%{gemname}) = %{version}-%{release} @@ -301,6 +312,9 @@ popd %endif %changelog +* Thu Mar 28 2013 Mamoru TASAKA - 1.5.9-1 +- 1.5.9 + * Tue Mar 26 2013 Vít Ondruch - 1.5.6-3 - Use %%{gem_extdir_mri} instead of %%{gem_extdir}. diff --git a/sources b/sources index 5bc2e8a..6c2bf2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ccf492f60fd9edc4f86aef3bb97145c nokogiri-1.5.6.gem +cf4cf8b7de5a410fa1f64d07461d68ed nokogiri-1.5.9.gem