X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ruby.spec;h=faf9054f01c655e1d8b6d53b01a5f4d05938c459;hb=1a82b3648fe7e57c4500ac165447373478c33f23;hp=dfa6dce8954a17e9425151ca3d574a29791c0996;hpb=313c55d4be464751381a70cf99cee124d76c7b0d;p=packages%2Fruby.git diff --git a/ruby.spec b/ruby.spec index dfa6dce..faf9054 100644 --- a/ruby.spec +++ b/ruby.spec @@ -97,7 +97,7 @@ Provides: ruby(ver) = %{ruby_version} Obsoletes: ruby-REXML <= 2.4.0-2 Obsoletes: ruby-doc < 1.8.4 Obsoletes: ruby-fastthread <= 0.6.3 -Conflicts: rpm-build-macros < 1.694 +Conflicts: rpm-build-macros < 1.695 Conflicts: ruby-activesupport < 2.3.11-2 Conflicts: ruby-activesupport2 < 2.3.11-2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -316,6 +316,9 @@ Epoch: 0 License: GPL v2 and Ruby and MIT Group: Development/Libraries Requires: %{name}-modules = 1:%{basever}.%{patchlevel}-%{rel} +Requires: %{name}-irb >= %{irb_ver} +Requires: %{name}-json >= %{json_ver} +Epoch: 0 Obsoletes: rdoc <= 0.9.0 %if "%{_rpmversion}" >= "5" BuildArch: noarch