2.2.7

diff --git a/ruby.spec b/ruby.spec
index 1531465364fcfbbe19429ae092573b62ed9cefd8..d83075d10d4743a01cce6331260ef2af932eeb0a 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -18,7 +18,7 @@
 %define                rel             0.2
 %define                ruby_version    2.2
 %define                basever         2.2
-%define                patchlevel      5
+%define                patchlevel      7
 %define                pkg_version     %{basever}.%{patchlevel}
 
 %define                ruby_suffix %{!?with_default_ruby:%{ruby_version}}
@@ -32,7 +32,7 @@
 %define                psych_ver       2.0.8
 %define                rake_ver        10.4.2
 %define                rdoc_ver        4.2.0
-%define                rubygems_ver    2.4.5.1
+%define                rubygems_ver    2.4.5.2
 %define                test_unit_ver   3.0.8
 %define                power_assert_ver 0.2.2
 
@@ -54,7 +54,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://ftp.ruby-lang.org/pub/ruby/2.2/%{oname}-%{pkg_version}.tar.xz
-# Source0-md5: 4b9506c37e908b5b17215b66b2760438
+# Source0-md5: d55c94d9258121d3780e331712f3d15f
 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

diff --git a/strip-ccache.patch b/strip-ccache.patch
index b9ee410c1a6be73ce46499bba2fd9c7309a9f682..801ee3c2e5d17b378657c660e1dfd93a259d3718 100644 (file)
--- a/strip-ccache.patch
+++ b/strip-ccache.patch
@@ -8,15 +8,15 @@
      when /^arch$/; if val.empty? then val = arch else arch = val end
      when /^sitearch$/; val = '$(arch)' if val.empty?
      end
---- ruby-2.2.5/common.mk.orig  2016-03-29 23:07:26.000000000 +0200
-+++ ruby-2.2.5/common.mk       2016-09-19 14:02:16.189655531 +0200
+--- ruby-2.2.7/common.mk~      2017-04-19 20:22:53.000000000 +0300
++++ ruby-2.2.7/common.mk       2017-04-19 20:23:24.847180464 +0300
 @@ -186,7 +186,7 @@
  configure-ext: $(EXTS_MK)
  
  build-ext: $(EXTS_MK)
 -      $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
 +      $(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) CC="$(CC)" \
-           ENCOBJS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
+           EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
  
  prog: program wprogram
 @@ -598,7 +598,7 @@