diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-05-15 21:54:46 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-05-15 21:54:46 +0100 |
| commit | 879493c35fd8d9e12e5cf3e56cd67ff07c3345c5 (patch) | |
| tree | 9615859e1d9a52f71da444b0b7359817bb6acc50 /railties/Rakefile | |
| parent | d6ecce66f4e125531875006eea8022b73fe135b5 (diff) | |
| parent | fc02eabf296d6edb74a95174c7322293a54c9492 (diff) | |
| download | rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.tar.gz rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.tar.bz2 rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionmailer/lib/action_mailer/base.rb
Diffstat (limited to 'railties/Rakefile')
| -rw-r--r-- | railties/Rakefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index 4eaa1bef63..45ba394299 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -303,12 +303,12 @@ spec = Gem::Specification.new do |s| on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates. EOF - s.add_dependency('rake', '>= 0.7.2') - s.add_dependency('activesupport', '= 2.0.2' + PKG_BUILD) - s.add_dependency('activerecord', '= 2.0.2' + PKG_BUILD) - s.add_dependency('actionpack', '= 2.0.2' + PKG_BUILD) - s.add_dependency('actionmailer', '= 2.0.2' + PKG_BUILD) - s.add_dependency('activeresource', '= 2.0.2' + PKG_BUILD) + s.add_dependency('rake', '>= 0.8.1') + s.add_dependency('activesupport', '= 2.0.991' + PKG_BUILD) + s.add_dependency('activerecord', '= 2.0.991' + PKG_BUILD) + s.add_dependency('actionpack', '= 2.0.991' + PKG_BUILD) + s.add_dependency('actionmailer', '= 2.0.991' + PKG_BUILD) + s.add_dependency('activeresource', '= 2.0.991' + PKG_BUILD) s.rdoc_options << '--exclude' << '.' s.has_rdoc = false |