rpms/rubygem-nokogiri
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix merge conflict

Browse Source
This commit is contained in:
Mamoru Tasaka 2012-12-31 17:41:59 +09:00
commit 592f2ca50a
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rubygem-nokogiri.spec
View File

@ -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 ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
%global rubyabi 1.8 %global rubyabi 1.8
%endif
%global mainver 1.5.5 %global mainver 1.5.5
#%%global prever .beta.4 #%%global prever .beta.4
%global mainrel 1 %global mainrel 2
%global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g') %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g')
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname nokogiri %global gemname nokogiri
%global geminstdir %{gemdir}/gems/%{gemname}-%{mainver}%{?prever} %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 ruby19 1
%global rubyabi 1.9.1 %global rubyabi 1.9.1
%global gemdir %{gem_dir} %global gemdir %{gem_dir}
@ -288,6 +291,12 @@ popd
%endif %endif
%changelog %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 * Mon Jun 25 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.5.5-1
- 1.5.5 - 1.5.5