[packages/ruby: 13/15] Merge branch 'dev-2.1' to master, ruby 2.0 left on 'v2.0.x' branch

[glen]

commit 9d2fb26491c4e473510ea465355f57a7b532be9d
Merge: 7654375 fff139e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Nov 5 00:10:13 2015 +0200

    Merge branch 'dev-2.1' to master, ruby 2.0 left on 'v2.0.x' branch
    
    Conflicts:
    	ruby.spec

 archlibdir.patch               |  28 ++++++++
 custom-rubygems-location.patch |  82 +++++++++++++----------
 duplicated-paths.patch         | 121 ++++++++++++++++++++++++---------
 mkmf-verbose.patch             |   8 +--
 operating_system.rb            |  31 ++++++++-
 ruby-ffs.patch                 |  22 +++---
 ruby.spec                      | 149 ++++++++++++++++++++++++-----------------
 7 files changed, 293 insertions(+), 148 deletions(-)
---
diff --cc ruby.spec
index 6ef5461,2e9dce2..086a08d
--- a/ruby.spec
+++ b/ruby.spec
@@@ -15,25 -9,26 +9,26 @@@
  %bcond_without	batteries	# Don't include rubygems, json, rake, minitest
  %bcond_without	default_ruby	# use this Ruby as default system Ruby
  %bcond_with	bootstrap	# build bootstrap version
+ %bcond_with	tests		# build without tests
  
- %define		rel		2
- %define		ruby_version	2.0
- %define		basever		2.0.0
- %define		patchlevel	647
 -%define		rel		0.2
++%define		rel		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.1
- %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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/0251c7382eb9addf3a233bcf21fe536ab5eb691c