summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTASAKA Mamoru <mtasaka@localhost.localdomain>2012-05-28 17:18:37 +0900
committerTASAKA Mamoru <mtasaka@localhost.localdomain>2012-05-28 17:18:37 +0900
commitb03de4de248da38389fc908c5189a697f3a91450 (patch)
tree28fe410bfcc3b53e1bd47d72140deeaa782c38b0
parentdfc11c7870b877ae6f82ed8c981da85ad4026823 (diff)
downloadrubygem-nokogiri-b03de4de248da38389fc908c5189a697f3a91450.tar.gz
rubygem-nokogiri-b03de4de248da38389fc908c5189a697f3a91450.tar.xz
rubygem-nokogiri-b03de4de248da38389fc908c5189a697f3a91450.zip
Fix Obsoletes (bug 822931)
-rw-r--r--rubygem-nokogiri.spec9
1 files changed, 6 insertions, 3 deletions
diff --git a/rubygem-nokogiri.spec b/rubygem-nokogiri.spec
index 1afcbfa..375890a 100644
--- a/rubygem-nokogiri.spec
+++ b/rubygem-nokogiri.spec
@@ -4,7 +4,7 @@
%global mainver 1.5.2
#%%global prever .beta.4
-%global mainrel 1
+%global mainrel 3
%global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g')
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
@@ -46,6 +46,7 @@ BuildRequires: ruby(rubygems)
BuildRequires: rubygem(minitest)
%if 0%{?ruby19} > 0
BuildRequires: rubygems-devel
+Obsoletes: ruby-%{gemname} <= 1.5.2-2
%endif
#BuildRequires: ruby(racc)
##
@@ -56,7 +57,6 @@ BuildRequires: ruby-devel
Requires: ruby(abi) = %{rubyabi}
Requires: ruby(rubygems)
Provides: rubygem(%{gemname}) = %{version}-%{release}
-Obsoletes: ruby-%{gemname} <= 1.5.0-2
%description
Nokogiri parses and searches XML/HTML very quickly, and also has
@@ -243,7 +243,7 @@ popd
%defattr(-,root, root,-)
%{_bindir}/%{gemname}
%if 0%{?ruby19} < 1
-%{ruby_sitearch}/*.so
+%{ruby_sitearch}/%{gemname}
%else
%{gem_extdir}/
%endif
@@ -280,6 +280,9 @@ popd
%endif
%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
- 1.5.2