update module versions

[packages/ruby.git] / ruby.spec

diff --git a/ruby.spec b/ruby.spec
index 82cbae3e63a681f016c5b4a65b82bfbdff3be5f3..53e0b19f5b472350ed0935a06c0881151769912d 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -16,24 +16,24 @@
 %bcond_without default_ruby    # use this Ruby as default system Ruby
 %bcond_with    bootstrap       # build bootstrap version
 
-%define                rel             4
-%define                ruby_version    2.0
-%define                basever         2.0.0
-%define                patchlevel      598
+%define                rel             0.1
+%define                ruby_version    2.1
+%define                basever         2.1
+%define                patchlevel      6
 
 %define                ruby_suffix %{!?with_default_ruby:%{ruby_version}}
-%define                doc_version     2_0_0
+%define                doc_version     2_1_0
 
-%define                bigdecimal_ver  1.2.0
-%define                io_console_ver  0.4.2
+%define                bigdecimal_ver  1.2.4
+%define                io_console_ver  0.4.3
 %define                irb_ver         0.9.6
-%define                json_ver        1.7.7
-%define                minitest_ver    4.3.2
-%define                psych_ver       2.0.0
-%define                rake_ver        0.9.6
-%define                rdoc_ver        4.0.0
-%define                rubygems_ver    2.0.14
-%define                test_unit_ver   2.0.0.0
+%define                json_ver        1.8.1
+%define                minitest_ver    4.7.5
+%define                psych_ver       2.0.5
+%define                rake_ver        10.1.0
+%define                rdoc_ver        4.1.0
+%define                rubygems_ver    2.2.3
+%define                test_unit_ver   2.1.6.0
 
 %define                oname   ruby
 Summary:       Ruby - interpreted scripting language
@@ -48,14 +48,15 @@ Epoch:              1
 # Public Domain for example for: include/ruby/st.h, strftime.c, ...
 License:       (Ruby or BSD) and Public Domain
 Group:         Development/Languages
-Source0:       https://ftp.ruby-lang.org/pub/ruby/2.0/%{oname}-%{basever}-p%{patchlevel}.tar.bz2
-# Source0-md5: a3f3908103a7d209d1d1cf4712e3953c
+# https://www.ruby-lang.org/en/downloads/
+Source0:       https://ftp.ruby-lang.org/pub/ruby/2.1/%{oname}-%{basever}.%{patchlevel}.tar.xz
+# Source0-md5: ec6f10ca331ce947802ede86259513a8
 Source1:       http://www.ruby-doc.org/download/%{oname}-doc-bundle.tar.gz
 # Source1-md5: ad1af0043be98ba1a4f6d0185df63876
 Source2:       http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
-# Source2-md5: e93307804295a43512cafbf660a4cbe0
+# Source2-md5: bf479c714ba189f9df633600b40aeef5
 Source3:       http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_core_rdocs.tgz
-# Source3-md5: 900186f317b51edfbb2f5317f8855719
+# Source3-md5: 3515d672874a1e48d4a8fd32c50639e7
 Source100:     ftp://ftp.ruby-lang.org/pub/ruby/1.8/%{oname}-1.8.7-p330.tar.gz
 # Source100-md5:       50a49edb787211598d08e756e733e42e
 Source4:       rdoc.1
@@ -67,7 +68,6 @@ Patch2:               fix-bison-invocation.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
@@ -85,12 +85,16 @@ BuildRequires:      openssl-devel
 BuildRequires: pkgconfig
 BuildRequires: readline-devel >= 4.2
 BuildRequires: rpm-build >= 5.4.10-49
-# bootstrap needs ruby binary, erb module
-%{!?with_bootstrap:BuildRequires:      rpm-rubyprov}
-%{!?with_bootstrap:BuildRequires:      ruby-modules}
-%{!?with_bootstrap:BuildRequires:      ruby}
 BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 BuildRequires: yaml-devel
+%if %{without bootstrap}
+# bootstrap needs ruby binary, erb module
+BuildRequires: rpm-rubyprov
+BuildRequires: ruby
+BuildRequires: ruby-modules
+%endif
 %if %{with tk}
 BuildRequires: tk-devel
 %endif
@@ -318,9 +322,9 @@ Release:    %{basever}.%{patchlevel}.%{rel}
 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}
+Requires:      %{name}-modules = 1:%{basever}.%{patchlevel}-%{rel}
 Obsoletes:     rdoc <= 0.9.0
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
@@ -420,23 +424,18 @@ This is a JSON implementation as a Ruby extension in C.
 Biblioteka JSON dla języka Ruby.
 
 %prep
-%if %{with bootstrap}
-%setup -q -n %{oname}-%{basever}-p%{patchlevel} -a1 -a2 -a3 -a100
-%else
-%setup -q -n %{oname}-%{basever}-p%{patchlevel} -a1 -a2 -a3
-%endif
+%setup -q -n %{oname}-%{basever}.%{patchlevel} -a1 -a2 -a3 %{?with_bootstrap:-a100}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+#%patch7 -p1
+#%patch8 -p1
 %patch9 -p1
-%patch10 -p1
-%patch11 -p1
+#%patch10 -p1
+#%patch11 -p1
 
 # must be regenerated with new bison
 %{__rm} parse.{c,h}
@@ -496,7 +495,7 @@ cd ..
        --enable-multiarch \
        --disable-rubygems \
        --disable-install-doc \
-       --with-ruby-version=''
+       --with-ruby-version='' \
 
 %{__make} -j1 main \
        COPY="cp -p" Q= \
@@ -729,7 +728,6 @@ rm -rf $RPM_BUILD_ROOT
 %files rubygems
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gem%{ruby_suffix}
-%dir %{rubygems_dir}
 %{rubygems_dir}/rubygems
 %{rubygems_dir}/rubygems.rb
 %{rubygems_dir}/ubygems.rb