[ruby: 31/31] Merge branch 'private-ruby-2.1' into master

[Vít Ondruch]

commit 5ef051104ace5a976c0e99f76363cf424bc31cd0
Merge: bbb52ff 0d5d7e9
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Tue Apr 8 08:40:52 2014 +0200

    Merge branch 'private-ruby-2.1' into master
    
    Conflicts:
    	.gitignore
    	ruby.spec
    	rubygems-2.0.0-Do-not-modify-global-Specification.dirs-during-insta.patch
    	rubygems-2.0.0-Fixes-for-empty-ruby-version.patch
    	sources

 operating_system.rb                                |   31 ++-
 ruby-1.9.3-mkmf-verbose.patch                      |    8 +-
 ruby-1.9.3.p195-fix-webrick-tests.patch            |   14 +-
 ...licated-paths-when-empty-version-string-i.patch |   70 ----
 ruby-2.0.0-p195-aarch64.patch                      |  360 --------------------
 ...-Gem-Specification.files-in-default-.gems.patch |   28 --
 ....rb-prefix-install_dirs-only-with-DESTDIR.patch |   70 ----
 ...ecify-additional-preludes-by-configuratio.patch |   32 ++-
 ...-2.1.0-Enable-configuration-of-archlibdir.patch |   28 ++
 ...licated-paths-when-empty-version-string-i.patch |  113 ++++++
 ...-i386.patch => ruby-2.1.0-always-use-i386.patch |   12 +-
 ...ch => ruby-2.1.0-custom-rubygems-location.patch |   82 +++--
 ruby.spec                                          |  183 +++++-----
 rubygems-2.0.0-binary-extensions.patch             |  344 -------------------
 rubygems.attr                                      |    3 +
 rubygems.prov                                      |   36 ++
 rubygems.req                                       |   81 +++++
 17 files changed, 477 insertions(+), 1018 deletions(-)
---
diff --cc ruby.spec
index c1abd20,21f63ed..4744e93
--- a/ruby.spec
+++ b/ruby.spec
@@@ -1,8 -1,8 +1,7 @@@
  %global major_version 2
- %global minor_version 0
- %global teeny_version 0
- %global patch_level 353
- 
+ %global minor_version 1
+ %global teeny_version 1
+ %global patch_level 76
 -
  %global major_minor_version %{major_version}.%{minor_version}
  
  %global ruby_version %{major_minor_version}.%{teeny_version}