1 files changed, 16 insertions, 11 deletions
diff --git a/lib/rubygems/package_task.rb b/lib/rubygems/package_task.rb
index e80b1eceaf..bb0a60464e 100644
--- a/lib/rubygems/package_task.rb
+++ b/lib/rubygems/package_task.rb
@@ -97,22 +97,27 @@ class Gem::PackageTask < Rake::PackageTask
 
   def define
     super
+
     task :package => [:gem]
+
+    gem_file = gem_spec.file_name
+    gem_path = File.join package_dir, gem_file
+
     desc "Build the gem file #{gem_file}"
-    task :gem => ["#{package_dir}/#{gem_file}"]
-    file "#{package_dir}/#{gem_file}" => [package_dir] + @gem_spec.files do
-      when_writing("Creating #{gem_spec.full_name}.gem") {
+    task :gem => [gem_path]
+
+    trace = Rake.application.options.trace
+    Gem.configuration.verbose = trace
+
+    file gem_path => [package_dir] + @gem_spec.files do
+      when_writing "Creating #{gem_spec.file_name}" do
         Gem::Builder.new(gem_spec).build
-        verbose(true) {
-          mv gem_file, "#{package_dir}/#{gem_file}"
-        }
-      }
+        verbose trace do
+          mv gem_file, gem_path
+        end
+      end
     end
   end
 
-  def gem_file
-    "#{@gem_spec.full_name}.gem"
-  end
-
 end