From: mis <mis@pld-linux.org>
Date: Thu, 19 Dec 2019 08:59:24 +0000 (+0100)
Subject: up to 2.6.5
X-Git-Tag: auto/th/ruby-2.6.5-1~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fruby.git;a=commitdiff_plain;h=2798ed3c5c335cf7fdfe87f878629b7d4fb82608

up to 2.6.5
---

diff --git a/archlibdir.patch b/archlibdir.patch
index 43fa7f6..116bb66 100644
--- a/archlibdir.patch
+++ b/archlibdir.patch
@@ -4,15 +4,15 @@ Date: Tue, 1 Oct 2013 12:22:40 +0200
 Subject: [PATCH] Allow to configure libruby.so placement.
 
 ---
- configure.in | 5 +++++
+ configure.ac | 5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/configure.in b/configure.in
-index 37d9a62..553d4d0 100644
---- a/configure.in
-+++ b/configure.in
-@@ -3632,6 +3632,11 @@ if test ${multiarch+set}; then
- fi
+diff --git a/configure.ac b/configure.ac
+index 11fc237552..b77e88fc37 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3085,6 +3085,11 @@ AS_IF([test ${multiarch+set}], [
+ ])
  
  archlibdir='${libdir}/${arch}'
 +AC_ARG_WITH(archlibdir,
diff --git a/custom-rubygems-location.patch b/custom-rubygems-location.patch
index e82f172..c4893da 100644
--- a/custom-rubygems-location.patch
+++ b/custom-rubygems-location.patch
@@ -5,17 +5,17 @@ Subject: [PATCH] Allow to install RubyGems into custom location, outside of
  Ruby tree.
 
 ---
- configure.in            | 5 +++++
- loadpath.c              | 4 ++++
- template/verconf.h.tmpl | 3 +++
- tool/rbinstall.rb       | 9 +++++++++
- 4 files changed, 21 insertions(+)
+ configure.ac            |  5 +++++
+ loadpath.c              |  4 ++++
+ template/verconf.h.tmpl |  3 +++
+ tool/rbinstall.rb       | 10 ++++++++++
+ 4 files changed, 22 insertions(+)
 
-diff --git a/configure.in b/configure.in
-index 03a4152..0e371e2 100644
---- a/configure.in
-+++ b/configure.in
-@@ -4264,6 +4264,10 @@ AC_ARG_WITH(vendorarchdir,
+diff --git a/configure.ac b/configure.ac
+index 6bba453e3c..028ef7ca3e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3746,6 +3746,10 @@ AC_ARG_WITH(vendorarchdir,
              [vendorarchdir=$withval],
              [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
  
@@ -23,10 +23,10 @@ index 03a4152..0e371e2 100644
 +           AS_HELP_STRING([--with-rubygemsdir=DIR], [custom rubygems directory]),
 +            [rubygemsdir=$withval])
 +
- if test "${LOAD_RELATIVE+set}"; then
+ AS_IF([test "${LOAD_RELATIVE+set}"], [
      AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
      RUBY_EXEC_PREFIX=''
-@@ -4288,6 +4292,7 @@ AC_SUBST(sitearchdir)dnl
+@@ -3770,6 +3774,7 @@ AC_SUBST(sitearchdir)dnl
  AC_SUBST(vendordir)dnl
  AC_SUBST(vendorlibdir)dnl
  AC_SUBST(vendorarchdir)dnl
@@ -67,26 +67,27 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
 index b47b6e1..0b99408 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
-@@ -328,6 +328,7 @@ def CONFIG.[](name, mandatory = false)
+@@ -334,6 +334,7 @@ def CONFIG.[](name, mandatory = false)
  sitearchlibdir = CONFIG["sitearchdir"]
  vendorlibdir = CONFIG["vendorlibdir"]
  vendorarchlibdir = CONFIG["vendorarchdir"]
 +rubygemsdir = CONFIG["rubygemsdir"]
  mandir = CONFIG["mandir", true]
  docdir = CONFIG["docdir", true]
- configure_args = Shellwords.shellwords(CONFIG["configure_args"])
-@@ -506,7 +507,15 @@ def CONFIG.[](name, mandatory = false)
+ enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
+@@ -560,7 +561,16 @@ def stub
  install?(:local, :comm, :lib) do
    prepare "library scripts", rubylibdir
-   noinst = %w[README* *.txt *.rdoc *.gemspec]
-+  noinst += %w[*ubygems.rb rubygems/ datadir.rb] if rubygemsdir
+   noinst = %w[*.txt *.rdoc *.gemspec]
++  # Bundler carries "rubygems.rb" file, so it must be specialcased :/
++  noinst += %w[rubygems.rb rubygems/ bundler.rb bundler/] if rubygemsdir
    install_recursive(File.join(srcdir, "lib"), rubylibdir, :no_install => noinst, :mode => $data_mode)
 +  if rubygemsdir
-+    noinst = %w[obsolete.rb]
-+    install_recursive(File.join(srcdir, "lib", "rubygems"), File.join(rubygemsdir, "rubygems"), :mode => $data_mode)
-+    install_recursive(File.join(srcdir, "lib", "rbconfig"), File.join(rubygemsdir, "rbconfig"), :no_install => noinst, :mode => $data_mode)
-+    install(File.join(srcdir, "lib", "ubygems.rb"), File.join(rubygemsdir, "ubygems.rb"), :mode => $data_mode)
++    noinst = %w[*.txt *.rdoc *.gemspec]
++    install_recursive(File.join(srcdir, "lib", "rubygems"), File.join(rubygemsdir, "rubygems"), :no_install => noinst, :mode => $data_mode)
 +    install(File.join(srcdir, "lib", "rubygems.rb"), File.join(rubygemsdir, "rubygems.rb"), :mode => $data_mode)
++    install_recursive(File.join(srcdir, "lib", "bundler"), File.join(rubylibdir, "bundler"), :no_install => noinst, :mode => $data_mode)
++    install(File.join(srcdir, "lib", "bundler.rb"), rubylibdir, :mode => $data_mode)
 +  end
  end
  
diff --git a/duplicated-paths.patch b/duplicated-paths.patch
index eb34107..bfb197f 100644
--- a/duplicated-paths.patch
+++ b/duplicated-paths.patch
@@ -5,16 +5,16 @@ Subject: [PATCH] Prevent duplicated paths when empty version string is
  configured.
 
 ---
- configure.in     |  3 ++-
+ configure.ac     |  3 ++-
  loadpath.c       | 12 ++++++++++++
  tool/mkconfig.rb |  2 +-
  3 files changed, 15 insertions(+), 2 deletions(-)
 
-diff --git a/configure.in b/configure.in
-index db37cd6..ce8d149 100644
---- a/configure.in
-+++ b/configure.in
-@@ -4228,7 +4228,8 @@ AS_CASE(["$ruby_version_dir_name"],
+diff --git a/configure.ac b/configure.ac
+index 999e2d6d5d..11fc237552 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3710,7 +3710,8 @@ AS_CASE(["$ruby_version_dir_name"],
  ruby_version_dir=/'${ruby_version_dir_name}'
  
  if test -z "${ruby_version_dir_name}"; then
@@ -28,7 +28,7 @@ diff --git a/loadpath.c b/loadpath.c
 index 9160031..0d4d953 100644
 --- a/loadpath.c
 +++ b/loadpath.c
-@@ -65,22 +65,34 @@ const char ruby_initial_load_paths[] =
+@@ -65,21 +65,33 @@ const char ruby_initial_load_paths[] =
      RUBY_SEARCH_PATH "\0"
  #endif
  #ifndef NO_RUBY_SITE_LIB
@@ -58,16 +58,15 @@ index 9160031..0d4d953 100644
      RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0"
 +#ifndef RUBY_LIB_VERSION_BLANK
      RUBY_VENDOR_LIB "\0"
- #endif
 +#endif
+ #endif
  
      RUBY_LIB "\0"
- #ifdef RUBY_THINARCH
 diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
 index 07076d4..35e6c3c 100755
 --- a/tool/mkconfig.rb
 +++ b/tool/mkconfig.rb
-@@ -122,7 +122,7 @@ def config.write(arg)
+@@ -114,7 +114,7 @@
      val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
      case name
      when /^prefix$/
diff --git a/fix-bison-invocation.patch b/fix-bison-invocation.patch
index 5b960f3..2ff5cc3 100644
--- a/fix-bison-invocation.patch
+++ b/fix-bison-invocation.patch
@@ -1,11 +1,10 @@
---- ruby-1.9.3-p194/ext/ripper/depend~	2010-12-26 14:25:10.000000000 +0100
-+++ ruby-1.9.3-p194/ext/ripper/depend	2012-09-06 19:56:49.041137189 +0200
-@@ -16,7 +16,7 @@
- 
+--- ruby-2.6.5/ext/ripper/depend~	2019-10-01 13:01:01.000000000 +0200
++++ ruby-2.6.5/ext/ripper/depend	2019-11-25 08:47:14.265303943 +0100
+@@ -11,7 +11,7 @@
+
  .y.c:
  	$(ECHO) compiling compiler $<
 -	$(Q) $(BISON) -t -v -oy.tab.c $<
 +	$(Q) $(BISON) -d -t -v -oy.tab.c $<
- 	$(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@
+ 	$(Q) sed -e "/^#/s!y\.tab\.c!$@!" -f $(top_srcdir)/tool/ytab.sed y.tab.c > $@
  	@$(RM) y.tab.c
- 
diff --git a/ruby-version.patch b/ruby-version.patch
index e87bf46..a74fb74 100644
--- a/ruby-version.patch
+++ b/ruby-version.patch
@@ -12,15 +12,15 @@ ruby_version_dir_name now specifies custom version string for versioned
 directories, e.g. instead of default X.Y.Z, you can specify whatever
 string.
 ---
- configure.in        | 68 ++++++++++++++++++++++++++++-------------------------
+ configure.ac        | 64 ++++++++++++++++++++++++---------------------
  template/ruby.pc.in |  1 +
- 2 files changed, 37 insertions(+), 32 deletions(-)
+ 2 files changed, 35 insertions(+), 30 deletions(-)
 
-diff --git a/configure.in b/configure.in
-index db37cd6..6e73fae 100644
---- a/configure.in
-+++ b/configure.in
-@@ -4177,9 +4177,6 @@ AS_CASE(["$target_os"],
+diff --git a/configure.ac b/configure.ac
+index 8ea969412f..a00f2b6776 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3661,9 +3661,6 @@ AS_CASE(["$target_os"],
      rubyw_install_name='$(RUBYW_INSTALL_NAME)'
      ])
  
@@ -30,7 +30,7 @@ index db37cd6..6e73fae 100644
  rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
  AC_ARG_WITH(rubyarchprefix,
  	    AS_HELP_STRING([--with-rubyarchprefix=DIR],
-@@ -4202,56 +4199,62 @@ AC_ARG_WITH(ridir,
+@@ -3686,56 +3683,62 @@ AC_ARG_WITH(ridir,
  AC_SUBST(ridir)
  AC_SUBST(RI_BASE_NAME)
  
@@ -43,7 +43,7 @@ index db37cd6..6e73fae 100644
 -AS_CASE(["$ruby_version"],
 -  [full],  [RUBY_LIB_VERSION_STYLE='3	/* full */'],
 -  [minor], [RUBY_LIB_VERSION_STYLE='2	/* minor */'])
--if test ${RUBY_LIB_VERSION_STYLE+set}; then
+-AS_IF([test ${RUBY_LIB_VERSION_STYLE+set}], [
 -    {
 -    echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
 -    echo '#define STRINGIZE(x) x'
@@ -53,12 +53,12 @@ index db37cd6..6e73fae 100644
 -    } > conftest.c
 -    ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
 -    eval $ruby_version
--elif test -z "${ruby_version}"; then
+-], [test -z "${ruby_version}"], [
 -    AC_MSG_ERROR([No ruby version, No place for bundled libraries])
--else
+-], [
 -    RUBY_LIB_VERSION="${ruby_version}"
--fi
-+RUBY_LIB_VERSION_STYLE='2	/* minor */'
+-])
++RUBY_LIB_VERSION_STYLE='3	/* full */'
 +{
 +echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
 +echo '#define STRINGIZE(x) x'
@@ -118,9 +118,9 @@ index db37cd6..6e73fae 100644
 -            [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
 +            [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
  
- if test "${LOAD_RELATIVE+set}"; then
+ AS_IF([test "${LOAD_RELATIVE+set}"], [
      AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
-@@ -4270,6 +4273,7 @@ AC_SUBST(sitearchincludedir)dnl
+@@ -3752,6 +3755,7 @@ AC_SUBST(sitearchincludedir)dnl
  AC_SUBST(arch)dnl
  AC_SUBST(sitearch)dnl
  AC_SUBST(ruby_version)dnl
@@ -137,9 +137,9 @@ index 8a2c066..c81b211 100644
  TEENY=@TEENY@
  ruby_version=@ruby_version@
 +ruby_version_dir_name=@ruby_version_dir_name@
+ RUBY_API_VERSION=@RUBY_API_VERSION@
  RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
  RUBY_BASE_NAME=@RUBY_BASE_NAME@
- RUBY_VERSION_NAME=@RUBY_VERSION_NAME@
 -- 
 2.1.0
 
@@ -171,14 +171,14 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
 index d4c110e..d39c9a6 100755
 --- a/tool/rbinstall.rb
 +++ b/tool/rbinstall.rb
-@@ -406,7 +406,7 @@ def CONFIG.[](name, mandatory = false)
+@@ -424,7 +424,7 @@ def CONFIG.[](name, mandatory = false)
  
  install?(:doc, :rdoc) do
    if $rdocdir
 -    ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version'], "system")
 +    ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version_dir_name'] || CONFIG['ruby_version'], "system")
      prepare "rdoc", ridatadir
-     install_recursive($rdocdir, ridatadir, :mode => $data_mode)
+     install_recursive($rdocdir, ridatadir, :no_install => rdoc_noinst, :mode => $data_mode)
    end
 -- 
 2.1.0
@@ -205,12 +205,12 @@ index 55ca080..75eea2b 100644
 -               RbConfig::CONFIG['ruby_version']
 +               RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
               ]
-            elsif RbConfig::CONFIG['rubylibprefix'] then
+            elsif RbConfig::CONFIG['rubylibprefix']
               [
-               RbConfig::CONFIG['rubylibprefix'],
-               'gems',
--              RbConfig::CONFIG['ruby_version']
-+              RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
+                RbConfig::CONFIG['rubylibprefix'],
+                'gems',
+-               RbConfig::CONFIG['ruby_version']
++               RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
               ]
             else
               [
@@ -240,12 +240,12 @@ index 55ca080..75eea2b 100644
 +              RbConfig::CONFIG['ruby_version_dir_name'] || RbConfig::CONFIG['ruby_version']
    end
  
- end
+   ##
 diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
 index 0428bea..b6e090e 100644
 --- a/test/rubygems/test_gem.rb
 +++ b/test/rubygems/test_gem.rb
-@@ -962,7 +962,8 @@ def test_self_use_paths
+@@ -1288,7 +1288,8 @@ def test_self_use_paths
  
    def test_self_user_dir
      parts = [@userhome, '.gem', Gem.ruby_engine]
@@ -255,7 +255,7 @@ index 0428bea..b6e090e 100644
  
      assert_equal File.join(parts), Gem.user_dir
    end
-@@ -1089,7 +1090,7 @@ def test_self_user_home_user_drive_and_path
+@@ -1365,7 +1366,7 @@ def test_self_gzip
    def test_self_vendor_dir
      expected =
        File.join RbConfig::CONFIG['vendordir'], 'gems',
@@ -275,14 +275,14 @@ Subject: [PATCH 4/4] Let headers directories follow the configured version
  name.
 
 ---
- configure.in | 2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/configure.in b/configure.in
-index 6e73fae..c842725 100644
---- a/configure.in
-+++ b/configure.in
-@@ -275,7 +275,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
+diff --git a/configure.ac b/configure.ac
+index a00f2b6776..999e2d6d5d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -101,7 +101,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
  RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
  AC_SUBST(RUBY_BASE_NAME)
  AC_SUBST(RUBYW_BASE_NAME)
diff --git a/ruby.spec b/ruby.spec
index ccdd835..c902b86 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -2,6 +2,7 @@
 #	- include ext/ in docs
 #	- replace ri with fastri
 #	- patch ri to search multiple indexes (one per package), so RPMs can install ri docs
+#	- gemify irb (?)
 #
 # Conditional build:
 %bcond_without	doc		# skip (time-consuming) docs generating; intended for speed up test builds
@@ -11,11 +12,11 @@
 %bcond_with	tests		# build without tests
 
 %define		rel		1
-%define		ruby_version	2.4
-%define		patchlevel	9
+%define		ruby_version	2.6
+%define		patchlevel	5
 %define		pkg_version	%{ruby_version}.%{patchlevel}
 %define		ruby_suffix %{!?with_default_ruby:%{ruby_version}}
-%define		doc_version	2_4_3
+%define		doc_version	2_6_5
 %define		oname	ruby
 Summary:	Ruby - interpreted scripting language
 Summary(ja.UTF-8):	オブジェクト指向言語Rubyインタプリタ
@@ -34,11 +35,11 @@ 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:	028e26495bce92000aaf98da4f81ecc2
+# Source0-md5:	b8a4e2bdbb76485c3d6690e57be67750
 Source2:	http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
-# Source2-md5:	d21fb29009644bd174dbba0dad53f1f5
+# Source2-md5:	bd93bce0a482dada63ac238f2e4596cf
 Source3:	http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_core_rdocs.tgz
-# Source3-md5:	3aef8f1b7fb3d140ac9ba8f3061c832e
+# Source3-md5:	86322c0f335e8ecc9008f740807362dd
 Source50:	http://www.unicode.org/Public/9.0.0/ucd/CaseFolding.txt
 # Source50-md5:	e3fbf2f626f10070000fe66f3a2ff5ef
 Source51:	http://www.unicode.org/Public/9.0.0/ucd/CompositionExclusions.txt
@@ -99,21 +100,25 @@ Conflicts:	ruby-activesupport < 2.3.11-2
 Conflicts:	ruby-activesupport2 < 2.3.11-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define	bigdecimal_ver		1.3.2
-%define	did_you_mean_ver	1.1.0
-%define	io_console_ver		0.4.6
-%define	irb_ver			0.9.6
-%define	json_ver		2.0.4
-%define	minitest_ver		5.10.1
-%define	net_telnet_ver		0.1.1
-%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.1
-%define	rubygems_ver		2.6.14.4
-%define	test_unit_ver		3.2.3
-%define	xmlrpc_ver		0.2.1
+# hack: skip rubygem(ipaddr)
+%define	_noautoreq	ipaddr
+
+%define	bigdecimal_ver		1.4.1
+%define	bundler_ver		1.17.2
+%define	did_you_mean_ver	1.3.0
+%define	io_console_ver		0.4.7
+%define	irb_ver			1.0.0
+%define	json_ver		2.1.0
+%define	minitest_ver		5.11.3
+%define	net_telnet_ver		0.2.0
+%define	openssl_ver		2.1.2
+%define	power_assert_ver	1.1.3
+%define	psych_ver		3.1.0
+%define	rake_ver		12.3.2
+%define	rdoc_ver		6.1.2
+%define	rubygems_ver		3.0.3
+%define	test_unit_ver		3.2.9
+%define	xmlrpc_ver		0.3.0
 
 %define	ruby_ridir		%{_datadir}/ri/system
 %define	gem_dir			%{_datadir}/gems
@@ -337,6 +342,22 @@ libraries.
 RubyGems to standardowe narzędzie języka Ruby do publikowania i
 zarządzania zewnętrznymi bibliotekami.
 
+%package bundler
+Summary:    Library and utilities to manage a Ruby application's gem dependencies
+Version:	%{bundler_ver}
+Release:	%{pkg_version}.%{rel}
+Epoch:		0
+License:	MIT
+Group:		Development/Languages
+Provides:	bundler = %{bundler_ver}
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description bundler
+Bundler manages an application's dependencies through its entire life, across
+many machines, systematically and repeatably.
+
 %package rake
 Summary:	Rake is a Make-like program implemented in Ruby
 Summary(pl.UTF-8):	Program typu Make dla języka Ruby
@@ -680,7 +701,7 @@ touch enc/unicode/9.0.0/*.h
 %endif
 
 %build
-rubygems_ver=$(awk '/VERSION =/ && $1 == "VERSION" {print $3}' lib/rubygems.rb | xargs)
+rubygems_ver=$(awk '/VERSION =/ && $1 == "VERSION" {print $3}' lib/rubygems.rb | sed 's/\.freeze//g' | xargs)
 if [ $rubygems_ver != %{rubygems_ver} ]; then
 	echo "Set %%define rubygems_ver to $rubygems_ver and re-run."
 	exit 1
@@ -826,12 +847,15 @@ ln -s %{gem_dir}/gems/rdoc-%{rdoc_ver}/lib/rdoc.rb $RPM_BUILD_ROOT%{ruby_libdir}
 %{__mv} $RPM_BUILD_ROOT%{gem_dir}/specifications/default/rdoc-%{rdoc_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
 
 install -d $RPM_BUILD_ROOT%{gem_dir}/gems/bigdecimal-%{bigdecimal_ver}/lib
-install -d $RPM_BUILD_ROOT%{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib
+install -d $RPM_BUILD_ROOT%{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal
 %{__mv} $RPM_BUILD_ROOT%{ruby_libdir}/bigdecimal $RPM_BUILD_ROOT%{gem_dir}/gems/bigdecimal-%{bigdecimal_ver}/lib
 %{__mv} $RPM_BUILD_ROOT%{ruby_libarchdir}/bigdecimal.so $RPM_BUILD_ROOT%{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib
+%{__mv} $RPM_BUILD_ROOT%{ruby_libarchdir}/bigdecimal/util.so $RPM_BUILD_ROOT%{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal/
 %{__mv} $RPM_BUILD_ROOT%{gem_dir}/specifications/default/bigdecimal-%{bigdecimal_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
 ln -s %{gem_dir}/gems/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal $RPM_BUILD_ROOT%{ruby_libdir}/bigdecimal
 ln -s %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal.so $RPM_BUILD_ROOT%{ruby_libarchdir}/bigdecimal.so
+install -d $RPM_BUILD_ROOT%{ruby_libarchdir}/bigdecimal
+ln -s %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal/util.so $RPM_BUILD_ROOT%{ruby_libarchdir}/bigdecimal/util.so
 
 install -d $RPM_BUILD_ROOT%{gem_dir}/gems/io-console-%{io_console_ver}/lib
 install -d $RPM_BUILD_ROOT%{gem_libdir}/io-console-%{io_console_ver}/lib/io
@@ -866,6 +890,16 @@ ln -s %{gem_dir}/gems/psych-%{psych_ver}/lib/psych $RPM_BUILD_ROOT%{ruby_libdir}
 ln -s %{gem_dir}/gems/psych-%{psych_ver}/lib/psych.rb $RPM_BUILD_ROOT%{ruby_libdir}/psych.rb
 ln -s %{gem_libdir}/psych-%{psych_ver}/lib/psych.so $RPM_BUILD_ROOT%{ruby_archdir}/psych.so
 
+install -d $RPM_BUILD_ROOT%{gem_dir}/gems/bundler-%{bundler_ver}/lib
+install -d $RPM_BUILD_ROOT%{gem_libdir}/bundler-%{bundler_ver}/lib
+%{__mv} $RPM_BUILD_ROOT%{ruby_libdir}/bundler* $RPM_BUILD_ROOT%{gem_dir}/gems/bundler-%{bundler_ver}/lib
+%{__mv} $RPM_BUILD_ROOT%{gem_dir}/specifications/default/bundler-%{bundler_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
+ln -s %{gem_dir}/gems/bundler-%{bundler_ver}/lib/bundler $RPM_BUILD_ROOT%{ruby_libdir}/bundler
+ln -s %{gem_dir}/gems/bundler-%{bundler_ver}/lib/bundler.rb $RPM_BUILD_ROOT%{ruby_libdir}/bundler.rb
+
+# replace default irb with its not gemified version
+%{__mv} $RPM_BUILD_ROOT%{gem_dir}/gems/irb-%{irb_ver}/exe/irb $RPM_BUILD_ROOT%{_bindir}/irb%{ruby_suffix}
+
 # Adjust the gemspec files so that the gems will load properly
 sed -i '/^end$/ i\
   s.require_paths = ["lib"]' $RPM_BUILD_ROOT%{gem_dir}/specifications/rake-%{rake_ver}.gemspec
@@ -893,16 +927,18 @@ sed -i '/^end$/ i\
 # https://github.com/rubygems/rubygems/pull/694
 for s in rake-%{rake_ver}.gemspec rdoc-%{rdoc_ver}.gemspec json-%{json_ver}.gemspec; do
 	s="$RPM_BUILD_ROOT%{gem_dir}/specifications/$s"
-	%{__make} runruby TESTRUN_SCRIPT="-rubygems \
+	%{__make} runruby TESTRUN_SCRIPT="-rrubygems \
 	-e \"spec = Gem::Specification.load('$s')\" \
 	-e \"File.write '$s', spec.to_ruby\""
 done
 
 %{__sed} -i -e '1s,/usr/bin/env ruby,/usr/bin/ruby,' \
+ 	$RPM_BUILD_ROOT%{_bindir}/irb \
 	$RPM_BUILD_ROOT%{ruby_libdir}/abbrev.rb \
 	$RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/bin/console \
 	$RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/exe/rake \
 	$RPM_BUILD_ROOT%{gem_dir}/gems/rdoc-%{rdoc_ver}/exe/{rdoc,ri} \
+	$RPM_BUILD_ROOT%{gem_dir}/gems/bundler-%{bundler_ver}/exe/{bundle,bundler} \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/{cal,test,time,uumerge}.rb \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/{drb,logger,openssl,ripper,rss}/*.rb \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/webrick/*.cgi
@@ -910,10 +946,10 @@ done
 # gem non library files
 %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/test
 %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/{[A-Z]*,doc,sample,test}
-%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/power_assert-%{power_assert_ver}/{[A-Z]*,test}
-%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/did_you_mean-%{did_you_mean_ver}/{[A-Z]*,doc,test}
-%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/{[A-Z]*,doc}
-%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/net-telnet-%{net_telnet_ver}/{[A-Z]*,bin}
+%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/power_assert-%{power_assert_ver}/{[A-Z]*,.*}
+%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/did_you_mean-%{did_you_mean_ver}/{[A-Z]*,doc,test,.*,tmp,benchmark}
+%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/{[A-Z]*,doc,.*}
+%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/net-telnet-%{net_telnet_ver}/{[A-Z]*,bin,.*}
 
 %if %{without batteries}
 # packaged separately
@@ -930,7 +966,6 @@ done
 %if %{with doc}
 # too much .ri
 %{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/cache.ri
-%{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/created.rid
 %endif
 
 %clean
@@ -997,8 +1032,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gem%{ruby_suffix}
 %{rubygems_dir}/rubygems
 %{rubygems_dir}/rubygems.rb
-%{rubygems_dir}/ubygems.rb
-%{rubygems_dir}/rbconfig
+
+%files bundler
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/bundler%{ruby_suffix}
+%attr(755,root,root) %{_bindir}/bundle%{ruby_suffix}
+%{gem_dir}/gems/bundler-%{bundler_ver}
+%{gem_dir}/specifications/bundler-%{bundler_ver}.gemspec
+%{_mandir}/man1/bundle*.1*
+%{_mandir}/man5/gemfile.5*
 
 %files rake
 %defattr(644,root,root,755)
@@ -1009,7 +1051,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{gem_dir}/gems/rake-%{rake_ver}/bin/console
 %attr(755,root,root) %{gem_dir}/gems/rake-%{rake_ver}/bin/setup
 %{gem_dir}/specifications/rake-%{rake_ver}.gemspec
-%{gem_dir}/gems/rake-%{rake_ver}/appveyor.yml
 %dir %{gem_dir}/gems/rake-%{rake_ver}/exe
 %attr(755,root,root) %{gem_dir}/gems/rake-%{rake_ver}/exe/rake
 
@@ -1036,9 +1077,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{gem_dir}/gems/power_assert-%{power_assert_ver}
 %{gem_dir}/gems/power_assert-%{power_assert_ver}/lib
 %{gem_dir}/specifications/power_assert-%{power_assert_ver}.gemspec
-%dir %{gem_dir}/gems/power_assert-0.4.1/benchmarks
-%{gem_dir}/gems/power_assert-0.4.1/benchmarks/bm_yhpg.rb
-%{gem_dir}/gems/power_assert-0.4.1/benchmarks/helper.rb
 
 %files minitest
 %defattr(644,root,root,755)
@@ -1056,8 +1094,6 @@ rm -rf $RPM_BUILD_ROOT
 %files did_you_mean
 %defattr(644,root,root,755)
 %dir %{gem_dir}/gems/did_you_mean-%{did_you_mean_ver}
-%{gem_dir}/gems/did_you_mean-%{did_you_mean_ver}/benchmark
-%{gem_dir}/gems/did_you_mean-%{did_you_mean_ver}/evaluation
 %{gem_dir}/gems/did_you_mean-%{did_you_mean_ver}/lib
 %{gem_dir}/specifications/did_you_mean-%{did_you_mean_ver}.gemspec
 
@@ -1073,6 +1109,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{gem_libdir}/bigdecimal-%{bigdecimal_ver}
 %dir %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib
 %attr(755,root,root) %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal.so
+%dir %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal
+%attr(755,root,root) %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal/util.so
+%{ruby_libdir}/bigdecimal.rb
 %{ruby_libdir}/bigdecimal
 %{gem_dir}/specifications/bigdecimal-%{bigdecimal_ver}.gemspec
 
@@ -1114,7 +1153,6 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/openssl
 %{ruby_libdir}/optparse
 %{ruby_libdir}/racc
-%{ruby_libdir}/rbconfig
 %{ruby_libdir}/rexml
 %{ruby_libdir}/rinda
 %{ruby_libdir}/ripper
@@ -1130,19 +1168,25 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/abbrev.rb
 %{ruby_libdir}/base64.rb
 %{ruby_libdir}/benchmark.rb
+%{ruby_libdir}/bundler
+%{ruby_libdir}/bundler.rb
 %{ruby_libdir}/cgi.rb
 %{ruby_libdir}/cmath.rb
 %{ruby_libdir}/csv.rb
+%{ruby_libdir}/csv
+%{ruby_libdir}/coverage.rb
 %{ruby_libdir}/date.rb
 %{ruby_libdir}/debug.rb
 %{ruby_libdir}/delegate.rb
 %{ruby_libdir}/digest.rb
 %{ruby_libdir}/drb.rb
 %{ruby_libdir}/e2mmap.rb
+%{ruby_libdir}/e2mmap
 %{ruby_libdir}/erb.rb
 %{ruby_libdir}/expect.rb
 %{ruby_libdir}/fiddle.rb
 %{ruby_libdir}/fileutils.rb
+%{ruby_libdir}/fileutils
 %{ruby_libdir}/find.rb
 %{ruby_libdir}/forwardable.rb
 %dir %{ruby_libdir}/forwardable
@@ -1152,7 +1196,6 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/json.rb
 %{ruby_libdir}/kconv.rb
 %{ruby_libdir}/logger.rb
-%{ruby_libdir}/mathn.rb
 %{ruby_libdir}/matrix.rb
 %{ruby_libdir}/monitor.rb
 %{ruby_libdir}/mutex_m.rb
@@ -1185,14 +1228,15 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/sync.rb
 %{ruby_libdir}/tempfile.rb
 %{ruby_libdir}/thwait.rb
+%{ruby_libdir}/thwait
 %{ruby_libdir}/time.rb
 %{ruby_libdir}/timeout.rb
 %{ruby_libdir}/tmpdir.rb
 %{ruby_libdir}/tracer.rb
+%{ruby_libdir}/tracer
 %{ruby_libdir}/tsort.rb
 %{ruby_libdir}/un.rb
 %{ruby_libdir}/unicode_normalize
-%{ruby_libdir}/unicode_normalize.rb
 %{ruby_libdir}/uri.rb
 %{ruby_libdir}/weakref.rb
 %{ruby_libdir}/webrick.rb
@@ -1200,14 +1244,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{with batteries}
 %exclude %{ruby_libdir}/rubygems.rb
-%exclude %{ruby_libdir}/ubygems.rb
-%exclude %{ruby_libdir}/rbconfig/datadir.rb
 %endif
 %exclude %{ruby_libdir}/irb.rb
 %exclude %{ruby_libdir}/mkmf.rb
 
 %{ruby_archdir}/rbconfig.rb
 %attr(755,root,root) %{ruby_archdir}/bigdecimal.so
+%dir %{ruby_archdir}/bigdecimal
+%attr(755,root,root) %{ruby_archdir}/bigdecimal/util.so
 %attr(755,root,root) %{ruby_archdir}/continuation.so
 %attr(755,root,root) %{ruby_archdir}/coverage.so
 %attr(755,root,root) %{ruby_archdir}/date_core.so
@@ -1242,8 +1286,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{ruby_archdir}/enc/trans/*.so
 %dir %{ruby_archdir}/io
 %attr(755,root,root) %{ruby_archdir}/io/*.so
-%dir %{ruby_archdir}/mathn
-%attr(755,root,root) %{ruby_archdir}/mathn/*.so
 %dir %{ruby_archdir}/racc
 %attr(755,root,root) %{ruby_archdir}/racc/*.so
 %dir %{ruby_archdir}/rbconfig
@@ -1282,6 +1324,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_ridir}/BigDecimal
 %{ruby_ridir}/BigMath
 %{ruby_ridir}/Binding
+%{ruby_ridir}/Bundler
 %{ruby_ridir}/CGI
 %{ruby_ridir}/CMath
 %{ruby_ridir}/CSV
@@ -1327,15 +1370,22 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_ridir}/Float
 %{ruby_ridir}/FloatDomainError
 %{ruby_ridir}/Forwardable
+%{ruby_ridir}/FrozenError
 %{ruby_ridir}/GC
 %{ruby_ridir}/GDBM
 %{ruby_ridir}/GDBMError
 %{ruby_ridir}/GDBMFatalError
 %{ruby_ridir}/Gem
 %{ruby_ridir}/GetoptLong
+%{ruby_ridir}/HTTPClientException
+%{ruby_ridir}/HTTPGatewayTimeOut
 %{ruby_ridir}/HTTPMovedTemporarily
 %{ruby_ridir}/HTTPMultipleChoice
+%{ruby_ridir}/HTTPRequestEntityTooLarge
+%{ruby_ridir}/HTTPRequestTimeOut
 %{ruby_ridir}/HTTPRequestURITooLarge
+%{ruby_ridir}/HTTPRequestURITooLong
+%{ruby_ridir}/HTTPRequestedRangeNotSatisfiable
 %{ruby_ridir}/Hash
 %{ruby_ridir}/IO
 %{ruby_ridir}/IOError
@@ -1363,6 +1413,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_ridir}/Module
 %{ruby_ridir}/Monitor
 %{ruby_ridir}/MonitorMixin
+%{ruby_ridir}/Mutex
 %{ruby_ridir}/Mutex_m
 %{ruby_ridir}/NKF
 %{ruby_ridir}/NameError
@@ -1454,7 +1505,6 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_ridir}/TSort
 %{ruby_ridir}/TempIO
 %{ruby_ridir}/Tempfile
-%{ruby_ridir}/Test
 %{ruby_ridir}/ThWait
 %{ruby_ridir}/Thread
 %{ruby_ridir}/ThreadError
@@ -1477,6 +1527,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_ridir}/WEBrick
 %{ruby_ridir}/WIN32OLE
 %{ruby_ridir}/WIN32OLERuntimeError
+%{ruby_ridir}/WIN32OLEQueryInterfaceError
 %{ruby_ridir}/WIN32OLE_EVENT
 %{ruby_ridir}/WIN32OLE_METHOD
 %{ruby_ridir}/WIN32OLE_PARAM
@@ -1496,8 +1547,6 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_ridir}/fatal
 %{ruby_ridir}/lib
 %{ruby_ridir}/syntax
-%{ruby_ridir}/unknown
-%{ruby_ridir}/page-ChangeLog*.ri
 %{ruby_ridir}/page-NEWS*.ri
 %{ruby_ridir}/page-README_md.ri
 %{ruby_ridir}/page-*_rdoc.ri
diff --git a/strip-ccache.patch b/strip-ccache.patch
index c9e33cb..8c5528b 100644
--- a/strip-ccache.patch
+++ b/strip-ccache.patch
@@ -8,23 +8,3 @@
      when /^arch$/; if val.empty? then val = arch else arch = val end
      when /^sitearch$/; val = '$(arch)' if val.empty?
      end
---- 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
-@@ -66,7 +66,7 @@
- MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT) miniprelude.$(OBJEXT)
- ENC_MK        = enc.mk
- MAKE_ENC      = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \
--		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS)
-+		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) CC="$(CC)"
- 
- COMMONOBJS    = array.$(OBJEXT) \
- 		bignum.$(OBJEXT) \
-@@ -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)" \
- 	    EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
- 
- prog: program wprogram