Revert "require openssl version, their abi can break with each release"

[packages/ruby.git] / ruby.spec

diff --git a/ruby.spec b/ruby.spec
index 242ceffcb2b6ecdb8ee08fe4992bfbbfa5ff6c5b..aa3c48b0cfa737f28fc134b50607b31030f082dd 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -16,10 +16,10 @@
 %bcond_without default_ruby    # use this Ruby as default system Ruby
 %bcond_with    bootstrap       # build bootstrap version
 
-%define                rel             6
+%define                rel             3
 %define                ruby_version    2.0
 %define                basever         2.0.0
-%define                patchlevel      598
+%define                patchlevel      648
 
 %define                ruby_suffix %{!?with_default_ruby:%{ruby_version}}
 %define                doc_version     2_0_0
@@ -32,7 +32,7 @@
 %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                rubygems_ver    2.0.14.1
 %define                test_unit_ver   2.0.0.0
 
 %define                oname   ruby
@@ -48,8 +48,9 @@ Epoch:                1
 # Public Domain for example for: include/ruby/st.h, strftime.c, ...
 License:       (Ruby or BSD) and Public Domain
 Group:         Development/Languages
+# https://www.ruby-lang.org/en/downloads/
 Source0:       https://ftp.ruby-lang.org/pub/ruby/2.0/%{oname}-%{basever}-p%{patchlevel}.tar.bz2
-# Source0-md5: a3f3908103a7d209d1d1cf4712e3953c
+# Source0-md5: 3544031334f4665aa2eb1414babc9345
 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
@@ -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
@@ -431,7 +435,6 @@ Biblioteka JSON dla języka Ruby.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1