summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMamoru Tasaka <tasaka1@localhost.localdomain>2012-12-31 17:45:25 +0900
committerMamoru Tasaka <tasaka1@localhost.localdomain>2012-12-31 17:45:25 +0900
commitf7f82ee52f74e8fb1349550445501f29b829cebe (patch)
tree3628ca52a0de7f047f4a2ff99ba94d74224db436
parente0df5ed72106e456a9fc96396b32f1f22cd3f569 (diff)
parent61b5ec3f296c1641a1407883d34c4a4f8eafe12b (diff)
downloadrubygem-nokogiri-f7f82ee52f74e8fb1349550445501f29b829cebe.tar.gz
rubygem-nokogiri-f7f82ee52f74e8fb1349550445501f29b829cebe.tar.xz
rubygem-nokogiri-f7f82ee52f74e8fb1349550445501f29b829cebe.zip
fix merge conflict
-rw-r--r--rubygem-nokogiri-1.5.0.beta3-test-failure.patch11
-rw-r--r--rubygem-nokogiri.spec12
2 files changed, 10 insertions, 13 deletions
diff --git a/rubygem-nokogiri-1.5.0.beta3-test-failure.patch b/rubygem-nokogiri-1.5.0.beta3-test-failure.patch
deleted file mode 100644
index 7e1f317..0000000
--- a/rubygem-nokogiri-1.5.0.beta3-test-failure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nokogiri-1.5.0.beta.3/test/html/test_element_description.rb.fail 2010-12-07 04:41:24.000000000 +0900
-+++ nokogiri-1.5.0.beta.3/test/html/test_element_description.rb 2010-12-07 04:46:35.000000000 +0900
-@@ -59,7 +59,7 @@
- if Nokogiri.uses_libxml? && Nokogiri::LIBXML_VERSION == '2.7.7'
- assert_equal 65, sub_elements.length
- elsif Nokogiri.uses_libxml?
-- assert_equal 61, sub_elements.length
-+ assert(61 <= sub_elements.length)
- else
- assert sub_elements.length > 0
- end
diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec
index 77c8178..54185f5 100644
--- a/rubygem-nokogiri.spec
+++ b/rubygem-nokogiri.spec
@@ -1,18 +1,20 @@
+%if 0%{?fedora} <= 16 && 0%{?fedora} <= 6
%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
%global rubyabi 1.8
+%endif
%global mainver 1.5.5
#%%global prever .beta.4
-%global mainrel 1
+%global mainrel 2
%global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g')
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname nokogiri
%global geminstdir %{gemdir}/gems/%{gemname}-%{mainver}%{?prever}
-%if %{?fedora:0%{fedora} >= 17}%{?rhel:0%{rhel} >= 7}
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
%global ruby19 1
%global rubyabi 1.9.1
%global gemdir %{gem_dir}
@@ -289,6 +291,12 @@ popd
%endif
%changelog
+* Fri Aug 17 2012 Vít Ondruch <vondruch@redhat.com> - 1.5.5-2
+- Rebuilt againts libxml2 2.9.
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.5-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
* Mon Jun 25 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.5.5-1
- 1.5.5