diff options
| author | Mamoru Tasaka <tasaka1@localhost.localdomain> | 2012-12-31 17:41:59 +0900 |
|---|---|---|
| committer | Mamoru Tasaka <tasaka1@localhost.localdomain> | 2012-12-31 17:41:59 +0900 |
| commit | 592f2ca50a36a3d0c6330cccc7434d3d3e088df6 (patch) | |
| tree | 3628ca52a0de7f047f4a2ff99ba94d74224db436 | |
| parent | cc9122df69464ce25c2e8957b87ffe10ef0d348a (diff) | |
| parent | 9fcb90ef2eb4aa7d44cbc3a2557a8ea82adf0199 (diff) | |
| download | rubygem-nokogiri-592f2ca50a36a3d0c6330cccc7434d3d3e088df6.tar.gz rubygem-nokogiri-592f2ca50a36a3d0c6330cccc7434d3d3e088df6.tar.xz rubygem-nokogiri-592f2ca50a36a3d0c6330cccc7434d3d3e088df6.zip | |
fix merge conflict
| -rw-r--r-- | rubygem-nokogiri.spec | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec index a9da3c0..54185f5 100644 --- a/rubygem-nokogiri.spec +++ b/rubygem-nokogiri.spec @@ -1,17 +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} @@ -288,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 |