1.5.0

4 files changed, 40 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 7ff52bf..331b17b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ nokogiri-1.4.3.1.gem
 /nokogiri-1.5.0.beta.2.gem
 /nokogiri-1.5.0.beta.3.gem
 /nokogiri-1.5.0.beta.4.gem
+/nokogiri-1.5.0.gem
diff --git a/rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch b/rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch
new file mode 100644
index 0000000..f45734b
--- /dev/null
+++ b/rubygem-nokogiri-1.5.0-allow-non-crosscompile.patch
@@ -0,0 +1,26 @@
+--- nokogiri-1.5.0/Rakefile.debug	2012-01-18 16:23:02.472224272 +0900
++++ nokogiri-1.5.0/Rakefile	2012-01-18 16:23:29.935430496 +0900
+@@ -83,14 +83,21 @@
+     HOE.spec.files += ['lib/nokogiri/nokogiri.jar']
+   end
+ else
+-  require 'tasks/cross_compile'
++  do_cross_compile = true
++  begin
++    require 'tasks/cross_compile'
++  rescue RuntimeError => e
++    warn "WARNING: Could not perform some cross-compiling: #{e}"
++    do_cross_compile = false
++  end
+   require "rake/extensiontask"
+ 
+-  HOE.spec.files.reject! { |f| f =~ %r{^ext/java|\.jar$} }
++  HOE.spec.files.reject! { |f| f =~ %r{^ext/java|\.jar$} } if do_cross_compile
+ 
+   Rake::ExtensionTask.new("nokogiri", HOE.spec) do |ext|
+     ext.lib_dir = File.join(*['lib', 'nokogiri', ENV['FAT_DIR']].compact)
+     ext.config_options << ENV['EXTOPTS']
++    next unless do_cross_compile
+     ext.cross_compile  = true
+     ext.cross_platform = ["x86-mswin32-60", "x86-mingw32"]
+     ext.cross_config_options << "--with-xml2-include=#{File.join($recipes[:libxml2].path, 'include', 'libxml2')}"
diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec
index 949301a..806f582 100644
--- a/rubygem-nokogiri.spec
+++ b/rubygem-nokogiri.spec
@@ -3,9 +3,9 @@
 %global	rubyabi		1.8
 
 %global	mainver		1.5.0
-%global	prever			.beta.4
+#%%global	prever			.beta.4
 
-%global	mainrel		5
+%global	mainrel		1
 %global	prerpmver		%(echo "%{?prever}" | sed -e 's|\\.||g')
 
 %global	gemdir			%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
@@ -20,13 +20,14 @@
 Summary:	An HTML, XML, SAX, and Reader parser
 Name:		rubygem-%{gemname}
 Version:	%{mainver}
-Release:	%{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}.1
+Release:	%{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}}%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://nokogiri.rubyforge.org/nokogiri/
 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
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	ruby(rubygems)
 ##
@@ -94,7 +95,7 @@ gem install \
 
 # patches
 pushd .%{geminstdir}
-#%%patch0 -p1
+%patch0 -p1
 popd
 
 # Permission
@@ -139,7 +140,7 @@ done
 # cleanups
 rm -rf %{buildroot}%{geminstdir}/ext/%{gemname}/
 rm -rf %{buildroot}%{geminstdir}/tmp/
-rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths}
+rm -f %{buildroot}%{geminstdir}/{.autotest,.require_paths,.gemtest}
 
 # The following method is completely copied from rubygem-gettext
 # spec file
@@ -238,6 +239,7 @@ popd
 %{ruby_sitearch}/%{gemname}/
 %dir	%{geminstdir}/
 %doc	%{geminstdir}/[A-Z]*
+%doc	%{geminstdir}/nokogiri_help_responses.md
 %exclude %{geminstdir}/Rakefile
 %{geminstdir}/bin/
 %{geminstdir}/lib/
@@ -253,7 +255,7 @@ popd
 %files	doc
 %defattr(-,root,root,-)
 %{geminstdir}/Rakefile
-%{geminstdir}/deps.rip
+#%%{geminstdir}/deps.rip
 #%%{geminstdir}/spec/
 %{geminstdir}/tasks/
 %{geminstdir}/test/
@@ -266,8 +268,11 @@ popd
 %{ruby_sitelib}/xsd/
 
 %changelog
+* Thu Jan 18 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.5.0-1
+- 1.5.0
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-0.5.beta4.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+- F-17: Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
 * Sun Jun 26 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.5.0-0.5.beta4
 - Remove unneeded patch
diff --git a/sources b/sources
index cd5394c..e744f2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ec5d28bfcfddfa3144333c2474b380b  nokogiri-1.5.0.beta.4.gem
+91aef0c0d912554f0abfbd82666a0504  nokogiri-1.5.0.gem