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

Conflicts:
	ruby.spec

diff --cc ruby.spec
index 6ef5461cd43eb68d78c4f7b13fb8abd27d643756,2e9dce2da514c2b51bf7b2afa78b68931b564ea3..086a08dc95c112868ca2b4548872cf3c06146b42
--- 1/ruby.spec
--- 2/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