summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMamoru Tasaka <mtasaka@fedoraproject.org>2010-04-28 16:17:11 +0000
committerMamoru Tasaka <mtasaka@fedoraproject.org>2010-04-28 16:17:11 +0000
commit14517e31e2399d054b7731fd97e506202980417b (patch)
tree0bf59332bc709b29fc16c1cc0ea1331022e91a9b
parent6fecb2a9b0cc203e2d47ac8549e62b5a97ad9946 (diff)
downloadrubygem-nokogiri-14517e31e2399d054b7731fd97e506202980417b.tar.gz
rubygem-nokogiri-14517e31e2399d054b7731fd97e506202980417b.tar.xz
rubygem-nokogiri-14517e31e2399d054b7731fd97e506202980417b.zip
- Fix build failure with libxml2 >= 2.7.7
-rw-r--r--nokogiri-1.4.1-test-xml-element-number.patch11
-rw-r--r--rubygem-nokogiri.spec10
2 files changed, 20 insertions, 1 deletions
diff --git a/nokogiri-1.4.1-test-xml-element-number.patch b/nokogiri-1.4.1-test-xml-element-number.patch
new file mode 100644
index 0000000..ee85228
--- /dev/null
+++ b/nokogiri-1.4.1-test-xml-element-number.patch
@@ -0,0 +1,11 @@
+--- nokogiri-1.4.1/test/html/test_element_description.rb.fail 2010-04-29 00:37:20.000000000 +0900
++++ nokogiri-1.4.1/test/html/test_element_description.rb 2010-04-29 01:06:02.000000000 +0900
+@@ -56,7 +56,7 @@
+
+ def test_subelements
+ sub_elements = ElementDescription['body'].sub_elements
+- assert_equal 61, sub_elements.length
++ assert ( 61 <= sub_elements.length )
+ end
+
+ def test_default_sub_element
diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec
index a45d01b..d476248 100644
--- a/rubygem-nokogiri.spec
+++ b/rubygem-nokogiri.spec
@@ -13,11 +13,12 @@
Summary: An HTML, XML, SAX, and Reader parser
Name: rubygem-%{gemname}
Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Development/Languages
License: MIT
URL: http://nokogiri.rubyforge.org/nokogiri/
Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Patch0: nokogiri-1.4.1-test-xml-element-number.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ruby(abi) = %{rubyabi}
@@ -71,6 +72,10 @@ gem install \
-V --force \
%{SOURCE0}
+pushd .%{geminstdir}
+%patch0 -p1 -b .fail
+popd
+
%build
# cflags wrong (-O3 passed), recompiling
pushd ./%{geminstdir}
@@ -202,6 +207,9 @@ popd
%{ruby_sitelib}/xsd/
%changelog
+* Thu Apr 29 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.4.1-2
+- Fix build failure with libxml2 >= 2.7.7
+
* Tue Dec 15 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.4.1-1
- 1.4.1