[packages/ruby: 32/32] Merge branch 'dev-2.0': ruby-2.0.0.481

[glen]

commit 3fa2b010421e58812d6cd3156224ee5ed8c6fb53
Merge: c7fefab 8bcd32f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jul 17 08:38:27 2014 +0300

    Merge branch 'dev-2.0': ruby-2.0.0.481
    
    Conflicts:
    	ruby.spec

 DESTDIR.patch                          |  73 +++++++
 custom-rubygems-location.patch         |  84 ++++++++
 duplicated-paths.patch                 |  70 +++++++
 empty-ruby-version.patch               |  34 ++++
 mkmf-verbose.patch                     |  22 ++-
 operating_system.rb                    |  85 ++++++++
 ruby-lib64.patch                       |  21 --
 ruby.spec                              | 293 ++++++++++++++++++++++------
 rubygems-2.0.0-binary-extensions.patch | 344 +++++++++++++++++++++++++++++++++
 strip-ccache.patch                     |  46 ++++-
 10 files changed, 978 insertions(+), 94 deletions(-)
---
diff --cc ruby.spec
index b0db1dd,0f04075..38a3de8
--- a/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インタプリタ
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/3fa2b010421e58812d6cd3156224ee5ed8c6fb53