usa	2015-05-29 13:56:42 +0900 (Fri, 29 May 2015)

  New Revision: 50668

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50668

  Log:
    Partially merge revision 49195: [Bug #10717]
    
    Support cmake 2.6 which is used by RHEL6/ CentOS 6
    https://github.com/rubygems/rubygems/pull/1124

  Modified files:
    branches/ruby_2_1/test/rubygems/test_gem_ext_cmake_builder.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 50667)
+++ ruby_2_1/version.h	(revision 50668)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.7"
 #define RUBY_RELEASE_DATE "2015-05-29"
-#define RUBY_PATCHLEVEL 359
+#define RUBY_PATCHLEVEL 360
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5
Index: ruby_2_1/test/rubygems/test_gem_ext_cmake_builder.rb
===================================================================
--- ruby_2_1/test/rubygems/test_gem_ext_cmake_builder.rb	(revision 50667)
+++ ruby_2_1/test/rubygems/test_gem_ext_cmake_builder.rb	(revision 50668)
@@ -20,7 +20,7 @@ class TestGemExtCmakeBuilder < Gem::Test https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/rubygems/test_gem_ext_cmake_builder.rb#L20
   def test_self_build
     File.open File.join(@ext, 'CMakeLists.txt'), 'w' do |cmakelists|
       cmakelists.write <<-eo_cmake
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.6)
 install (FILES test.txt DESTINATION bin)
       eo_cmake
     end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/