From 4a4d15902258c9442ccab967b9238cd20deb49bb Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Sat, 16 Feb 2013 23:21:58 -0700 Subject: Downgrade to 1.5.0 and add RHEL 6 compatibility - Downgrade to 1.5.0 for gitorious - RHEL 6 compatibility --- rubygem-nokogiri.spec | 22 ++++++++++++---------- sources | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 78717a0..a660c72 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -4,7 +4,7 @@ %global rubyabi 1.8 %endif -%global mainver 1.5.6 +%global mainver 1.5.0 #%%global prever .beta.4 %global mainrel 1 @@ -34,7 +34,7 @@ Summary: An HTML, XML, SAX, and Reader parser Name: rubygem-%{gemname} Version: %{mainver} -Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.2 +Release: %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist} Group: Development/Languages License: MIT URL: http://nokogiri.rubyforge.org/nokogiri/ @@ -47,7 +47,11 @@ BuildRequires: ruby(rubygems) ## ## For %%check BuildRequires: rubygem(minitest) -BuildRequires: rubygems-devel +%if 0%{?el6} +BuildRequires: ruby(rubygems) +%else +BuildRequires: rubygems-devel +%endif %if 0%{?ruby19} > 0 Obsoletes: ruby-%{gemname} <= 1.5.2-2 %endif @@ -242,12 +246,6 @@ LANG=ja_JP.UTF-8 %endif pushd ./%{geminstdir} -# Some files are missing and due to it some tests fail, skip -SKIPTEST="test/xml/test_xinclude.rb" -for f in $SKIPTEST -do - mv $f $f.skip -done # Observed fail on test_subclass_parse(Nokogiri::XML::TestDocument) # Need investigation. For now anyway build @@ -276,7 +274,7 @@ popd %endif %dir %{geminstdir}/ %doc %{geminstdir}/[A-Z]* -#%%doc %{geminstdir}/nokogiri_help_responses.md +%doc %{geminstdir}/nokogiri_help_responses.md %exclude %{geminstdir}/Rakefile %{geminstdir}/bin/ %{geminstdir}/lib/ @@ -307,6 +305,10 @@ popd %endif %changelog +* Sat Feb 16 2013 Ken Dreyer - 1.5.0-1 +- Downgrade to 1.5.0 for gitorious +- RHEL 6 compatibility + * Thu Feb 14 2013 Fedora Release Engineering - 1.5.6-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 5bc2e8a..e744f2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ccf492f60fd9edc4f86aef3bb97145c nokogiri-1.5.6.gem +91aef0c0d912554f0abfbd82666a0504 nokogiri-1.5.0.gem -- cgit