- release 2 (by relup.sh)

[packages/ruby.git] / ruby.spec

diff --git a/ruby.spec b/ruby.spec
index a3f352626293ce4ca3fbce7aee00321ccfddcb35..1856c123d41bc2c12a6df4917e93ee17a3045055 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -10,9 +10,9 @@
 %bcond_with    bootstrap       # build bootstrap version
 %bcond_with    tests           # build without tests
 
-%define                rel             7
+%define                rel             2
 %define                ruby_version    2.4
-%define                patchlevel      4
+%define                patchlevel      6
 %define                pkg_version     %{ruby_version}.%{patchlevel}
 %define                ruby_suffix %{!?with_default_ruby:%{ruby_version}}
 %define                doc_version     2_4_3
@@ -34,7 +34,7 @@ License:      (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD
 Group:         Development/Languages
 # https://www.ruby-lang.org/en/downloads/
 Source0:       https://cache.ruby-lang.org/pub/ruby/%{ruby_version}/%{oname}-%{pkg_version}.tar.xz
-# Source0-md5: 4f30cefb7d50c6fa4d801f47ed9d82ca
+# Source0-md5: e906495b65f9f31de4ceb0d4bbbea8b1
 Source2:       http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
 # Source2-md5: d21fb29009644bd174dbba0dad53f1f5
 Source3:       http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_core_rdocs.tgz
@@ -52,7 +52,7 @@ Source54:     http://www.unicode.org/Public/9.0.0/ucd/UnicodeData.txt
 Source4:       rdoc.1
 Source5:       testrb.1
 Source6:       operating_system.rb
-#Patch1:               %{oname}-ffs.patch
+Patch1:                rubygems.patch
 Patch2:                fix-bison-invocation.patch
 Patch3:                mkmf-verbose.patch
 Patch4:                strip-ccache.patch
@@ -77,6 +77,7 @@ BuildRequires:        readline-devel >= 4.2
 BuildRequires: rpm-build >= 5.4.10-49
 # which version is minimum now? 1.8.7 is not enough, fails with:
 # ./tool/generic_erb.rb:31: syntax error, unexpected ':', expecting ')'
+# ...O.popen("tput smso", "r", err: IO::NULL, &:read) rescue nil)
 BuildRequires: ruby >= 1:1.9
 BuildRequires: sed >= 4.0
 BuildRequires: systemtap-sdt-devel
@@ -105,12 +106,12 @@ BuildRoot:        %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define        json_ver                2.0.4
 %define        minitest_ver            5.10.1
 %define        net_telnet_ver          0.1.1
-%define        openssl_ver             2.0.7
+%define        openssl_ver             2.0.9
 %define        power_assert_ver        0.4.1
 %define        psych_ver               2.2.2
 %define        rake_ver                12.0.0
 %define        rdoc_ver                5.0.0
-%define        rubygems_ver            2.6.14.1
+%define        rubygems_ver            2.6.14.4
 %define        test_unit_ver           3.2.3
 %define        xmlrpc_ver              0.2.1
 
@@ -643,7 +644,7 @@ wywołującego je. Aby to osiągnąć wystarczy bardzo mało kodu.
 
 %prep
 %setup -q -n %{oname}-%{pkg_version} -a2 -a3
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1