summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-07 04:37:55 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-07 04:37:55 +0000
commita0cf0fbd84eb419120f36a1263b94f63008cfa62 (patch)
tree7d3cea51c0c0e7cade6289277247e9780c8b53ae
parente25bb03ee94d125612c50d868e7895deeb043b1b (diff)
merge revision(s) 50860: [Backport #11249]
* ext/bigdecimal/bigdecimal.gemspec: Fix require paths for released gem. [fix GH-929] Patch by @voxik * ext/io/console/io-console.gemspec: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/bigdecimal/bigdecimal.gemspec2
-rw-r--r--ext/io/console/io-console.gemspec2
-rw-r--r--version.h2
4 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 03d4312059..e040f61c7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul 7 13:37:34 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * ext/bigdecimal/bigdecimal.gemspec: Fix require paths for released gem.
+ [fix GH-929] Patch by @voxik
+ * ext/io/console/io-console.gemspec: ditto.
+
Fri Jul 3 21:54:46 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_require.rb (TestRequire#test_loading_fifo_threading):
diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
index 0b343ce3b3..690b77c9f3 100644
--- a/ext/bigdecimal/bigdecimal.gemspec
+++ b/ext/bigdecimal/bigdecimal.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
s.email = "mrkn@mrkn.jp"
s.description = "This library provides arbitrary-precision decimal floating-point number class."
s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
- s.require_path = %[.]
+ s.require_path = %[lib]
s.files = %w[
bigdecimal.gemspec
bigdecimal.c
diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
index 309b9bd85b..52ecdd9603 100644
--- a/ext/io/console/io-console.gemspec
+++ b/ext/io/console/io-console.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
s.required_ruby_version = ">= 2.0.0"
s.homepage = "http://www.ruby-lang.org"
s.authors = ["Nobu Nakada"]
- s.require_path = %[.]
+ s.require_path = %[lib]
s.files = %w[console.c extconf.rb lib/console/size.rb]
s.extensions = %w[extconf.rb]
s.licenses = "ruby"
diff --git a/version.h b/version.h
index bcd4871f75..d0e2e606e5 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.7"
#define RUBY_RELEASE_DATE "2015-07-07"
-#define RUBY_PATCHLEVEL 377
+#define RUBY_PATCHLEVEL 378
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 7