merge revision(s) 49689,49752,49753: [Backport ruby#10953]

	* common.mk: use ruby organization for rubyspec.

	* spec/default.mspec: remove specific version number.
	  ruby/spec@7a909e9

	* spec/default.mspec: use default configuration file name.
	  ruby/spec@cc69f33


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Author: nurse

ChangeLog

@@ -1,3 +1,17 @@
+Sun Mar 22 12:39:17 2015  SHIBATA Hiroshi  <[email protected]>
+
+	* spec/default.mspec: use default configuration file name.
+	  https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf
+
+Sun Mar 22 12:39:17 2015  SHIBATA Hiroshi  <[email protected]>
+
+	* spec/default.mspec: remove specific version number.
+	  https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714
+
+Sun Mar 22 12:39:17 2015  SHIBATA Hiroshi  <[email protected]>
+
+	* common.mk: use ruby organization for rubyspec.
+
 Thu Feb 26 15:48:41 2015  NAKAMURA Usaku  <[email protected]>
 
 	* ext/win32/Win32API.rb (initialize): accept both a string and an array

common.mk

@@ -17,7 +17,7 @@ RUBYLIB       = $(PATH_SEPARATOR)
 RUBYOPT       = -
 RUN_OPTS      = --disable-gems
 
-SPEC_GIT_BASE = git://github.com/nurse
+SPEC_GIT_BASE = git://github.com/ruby
 MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
 RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
 

spec/default.mspec

@@ -1,4 +1,4 @@
-load File.dirname(__FILE__) + '/rubyspec/ruby.2.2.mspec'
+load File.dirname(__FILE__) + '/rubyspec/default.mspec'
 class MSpecScript
   builddir = Dir.pwd
   srcdir = ENV['SRCDIR']

version.h

@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.2.2"
-#define RUBY_RELEASE_DATE "2015-03-03"
-#define RUBY_PATCHLEVEL 86
+#define RUBY_RELEASE_DATE "2015-03-22"
+#define RUBY_PATCHLEVEL 87
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 22
 
 #include "ruby/version.h"