Merge branch 'dev-2.0': ruby-2.0.0.481

Conflicts:
	ruby.spec

diff --cc ruby.spec
index b0db1ddd97fde926873b97d5ee038c563d73d592,0f0407544a8c0b275910cbb71ac4adef0f1599a0..38a3de8dd7140c95a3cb34c3bab079c62490f75c
--- 1/ruby.spec
--- 2/ruby.spec
+++ b/ruby.spec
@@@ -12,22 -16,25 +16,25 @@@
  %bcond_without        default_ruby    # use this Ruby as default system Ruby
  %bcond_with   bootstrap       # build bootstrap version
  
- %define               rel             3
- %define               ruby_version    1.9
- %define               basever         1.9.3
- %define               patchlevel      547
 -%define               rel             0.21
++%define               rel             1
+ %define               ruby_version    2.0
+ %define               basever         2.0.0
+ %define               patchlevel      481
  
  %define               ruby_suffix %{!?with_default_ruby:%{ruby_version}}
- %define               doc_version     1_9_3
- %define               json_ver        1.5.5
- %define               rake_ver        0.9.2.2
- %define               rubygems_ver    1.8.23.2
- %define               minitest_ver    2.5.1
- # when increasing rdoc_ver, please remove "11." prefix in rdoc package release
- %define               rdoc_ver        3.9.5
+ %define               doc_version     2_0_0
+ 
+ %define               bigdecimal_ver  1.2.0
+ %define               io_console_ver  0.4.2
  %define               irb_ver         0.9.6
- %define               bigdecimal_ver  1.1.0
- %define               io_console_ver  0.3
+ %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
+ %define               test_unit_ver   2.0.0.0
+ 
  %define               oname   ruby
  Summary:      Ruby - interpreted scripting language
  Summary(ja.UTF-8):    オブジェクト指向言語Rubyインタプリタ