Fix Obsoletes (bug 822931)

This commit is contained in:
TASAKA Mamoru 2012-05-28 17:18:37 +09:00
parent dfc11c7870
commit b03de4de24

View File

@ -4,7 +4,7 @@
%global mainver 1.5.2 %global mainver 1.5.2
#%%global prever .beta.4 #%%global prever .beta.4
%global mainrel 1 %global mainrel 3
%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)
@ -46,6 +46,7 @@ BuildRequires: ruby(rubygems)
BuildRequires: rubygem(minitest) BuildRequires: rubygem(minitest)
%if 0%{?ruby19} > 0 %if 0%{?ruby19} > 0
BuildRequires: rubygems-devel BuildRequires: rubygems-devel
Obsoletes: ruby-%{gemname} <= 1.5.2-2
%endif %endif
#BuildRequires: ruby(racc) #BuildRequires: ruby(racc)
## ##
@ -56,7 +57,6 @@ BuildRequires: ruby-devel
Requires: ruby(abi) = %{rubyabi} Requires: ruby(abi) = %{rubyabi}
Requires: ruby(rubygems) Requires: ruby(rubygems)
Provides: rubygem(%{gemname}) = %{version}-%{release} Provides: rubygem(%{gemname}) = %{version}-%{release}
Obsoletes: ruby-%{gemname} <= 1.5.0-2
%description %description
Nokogiri parses and searches XML/HTML very quickly, and also has Nokogiri parses and searches XML/HTML very quickly, and also has
@ -243,7 +243,7 @@ popd
%defattr(-,root, root,-) %defattr(-,root, root,-)
%{_bindir}/%{gemname} %{_bindir}/%{gemname}
%if 0%{?ruby19} < 1 %if 0%{?ruby19} < 1
%{ruby_sitearch}/*.so %{ruby_sitearch}/%{gemname}
%else %else
%{gem_extdir}/ %{gem_extdir}/
%endif %endif
@ -280,6 +280,9 @@ popd
%endif %endif
%changelog %changelog
* Mon May 28 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.5.2-3
- Fix Obsoletes (bug 822931)
* Mon Apr 9 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.5.2-1 * Mon Apr 9 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.5.2-1
- 1.5.2 - 1.5.2