From ce1aeeee3f0cb46c21b05cd89c867ed031e43e22 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Tue, 29 Dec 2009 15:47:28 -0800
Subject: [PATCH] Move mail gem dep to Action Mailer's gemspec

---
 Gemfile                           | 3 ---
 actionmailer/actionmailer.gemspec | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8e420b1c64..4ffa9e00e8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,9 +9,6 @@ end
 # AS
 gem "i18n", ">= 0.3.0"
 
-# AM
-gem "mail", ">= 1.4.2"
-
 # AR
 gem "arel", "0.2.pre", :git => "git://github.com/rails/arel.git"
 gem "sqlite3-ruby", ">= 1.2.5"
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index d5a684aa7b..980de8ec70 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -11,7 +11,7 @@
   s.homepage = "http://www.rubyonrails.org"
 
   s.add_dependency('actionpack', '= 3.0.pre')
-  s.add_dependency('mail', '~> 1.3.0')
+  s.add_dependency('mail', '~> 1.4.2')
 
   s.files = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*']
   s.has_rdoc = true