merge revision(s) 5d710d7e41ef3a9877426c87de121be3bf770e34: [Backport #17476]

	Fix the wrong file detection for net-*.gemspec

	[Bug #17476][ruby-core:101724]
	---
	 tool/rbinstall.rb | 5 +++++
	 1 file changed, 5 insertions(+)

2 files changed, 8 insertions, 3 deletions

diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index b49d91fc3f..7232865c9e 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -20,6 +20,7 @@ require 'fileutils'
 require 'shellwords'
 require 'optparse'
 require 'optparse/shellwords'
+require 'pathname'
 require 'rubygems'
 begin
   require "zlib"
@@ -701,6 +702,10 @@ module RbInstall
         when "lib"
           base = @base_dir
           prefix = base.sub(/lib\/.*?\z/, "") + "lib/"
+          # for lib/net/net-smtp.gemspec
+          if m = Pathname.new(@gemspec).basename(".gemspec").to_s.match(/.*\-(.*)\z/)
+            base = "#{@base_dir}/#{m[1]}" unless remove_prefix(prefix, @base_dir).include?(m[1])
+          end
         end
 
         if base
diff --git a/version.h b/version.h
index 35b5225ec6..53bcf6f1fb 100644
--- a/version.h
+++ b/version.h
@@ -12,11 +12,11 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 2
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 103
+#define RUBY_PATCHLEVEL 104
 
 #define RUBY_RELEASE_YEAR 2021
-#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_MONTH 7
+#define RUBY_RELEASE_DAY 3
 
 #include "ruby/version.h"