diff --git a/.gitignore b/.gitignore index 529eda1..fa56a24 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ nokogiri-1.4.3.1.gem /nokogiri-1.5.0.beta.4.gem /nokogiri-1.5.0.gem /nokogiri-1.5.2.gem +/nokogiri-1.5.5.gem diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index 1376cd2..a9da3c0 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,10 +1,10 @@ %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") %global rubyabi 1.8 -%global mainver 1.5.2 +%global mainver 1.5.5 #%%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) @@ -146,6 +146,7 @@ done rm -rf %{buildroot}%{geminstdir}/ext/%{gemname}/ rm -rf %{buildroot}%{geminstdir}/tmp/ rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths,.gemtest} +rm -f %{buildroot}%{geminstdir}/{build_all,test_all} %if 0%{?ruby19} < 1 # The following method is completely copied from rubygem-gettext @@ -231,7 +232,11 @@ done # Observed fail on test_subclass_parse(Nokogiri::XML::TestDocument) # Need investigation. For now anyway build -ruby -I.:lib:test -e \ +ruby -I.:lib:test \ +%if ! 0%{?ruby19} < 1 + -rubygems \ +%endif + -e \ "require 'minitest/autorun' ; Dir.glob('test/**/test_*.rb'){|f| require f}" || \ echo "Please investigate this" @@ -252,7 +257,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/ @@ -283,6 +288,9 @@ popd %endif %changelog +* Mon Jun 25 2012 Mamoru Tasaka - 1.5.5-1 +- 1.5.5 + * Mon May 28 2012 Mamoru Tasaka - 1.5.2-3 - Fix Obsoletes (bug 822931) diff --git a/sources b/sources index 17e0cd9..54ecb7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38ce6d3bf4020667de8816bcd3daeacc nokogiri-1.5.2.gem +b65b2607bf1b3e6cdb0491faab816e68 nokogiri-1.5.5.gem