- irb is also needed by rdoc

[packages/ruby.git] / ruby.spec

diff --git a/ruby.spec b/ruby.spec
index 0f0407544a8c0b275910cbb71ac4adef0f1599a0..faf9054f01c655e1d8b6d53b01a5f4d05938c459 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -16,7 +16,7 @@
 %bcond_without default_ruby    # use this Ruby as default system Ruby
 %bcond_with    bootstrap       # build bootstrap version
 
-%define                rel             0.21
+%define                rel             1
 %define                ruby_version    2.0
 %define                basever         2.0.0
 %define                patchlevel      481
@@ -64,20 +64,13 @@ Source6:    operating_system.rb
 Patch0:                %{oname}-lib64.patch
 Patch1:                %{oname}-ffs.patch
 Patch2:                fix-bison-invocation.patch
-# http://redmine.ruby-lang.org/issues/5231
-#Patch3:               disable-versioned-paths.patch
-# TODO: Should be submitted upstream?
-#Patch4:               arch-specific-dir.patch
-# http://redmine.ruby-lang.org/issues/5281
-#Patch5:               site-and-vendor-arch-flags.patch
-# Make mkmf verbose by default
-Patch6:                mkmf-verbose.patch
-Patch7:                strip-ccache.patch
-Patch8:                duplicated-paths.patch
-Patch9:                DESTDIR.patch
-Patch10:       empty-ruby-version.patch
-Patch11:       rubygems-2.0.0-binary-extensions.patch
-Patch12:       custom-rubygems-location.patch
+Patch3:                mkmf-verbose.patch
+Patch4:                strip-ccache.patch
+Patch5:                duplicated-paths.patch
+Patch6:                DESTDIR.patch
+Patch7:                empty-ruby-version.patch
+Patch8:                rubygems-2.0.0-binary-extensions.patch
+Patch9:                custom-rubygems-location.patch
 URL:           http://www.ruby-lang.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -104,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)
@@ -323,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
@@ -430,16 +426,13 @@ Biblioteka JSON dla języka Ruby.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
 
 # must be regenerated with new bison
 %{__rm} parse.{c,h}