Merge branch 'master' of gitproxy:rails/rails

1 files changed, 19 insertions, 22 deletions

diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index 1e6b141a09..e91bd0e1b5 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.gemspec
@@ -1,29 +1,26 @@
 Gem::Specification.new do |s|
-  s.platform = Gem::Platform::RUBY
-  s.name = 'railties'
-  s.version = '3.0.pre'
-  s.summary = "Controls boot-up, rake tasks and generators for the Rails framework."
-  s.description = <<-EOF
-    Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick
-    on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.
-  EOF
+  s.platform    = Gem::Platform::RUBY
+  s.name        = 'railties'
+  s.version     = '3.0.0.beta'
+  s.summary     = 'Controls boot-up, rake tasks and generators for the Rails framework.'
+  s.description = 'Controls boot-up, rake tasks and generators for the Rails framework.'
 
-  s.add_dependency('rake', '>= 0.8.3')
-  s.add_dependency('thor', '~> 0.13')
-  s.add_dependency('activesupport', '= 3.0.pre')
-  s.add_dependency('actionpack', '= 3.0.pre')
+  s.author            = 'David Heinemeier Hansson'
+  s.email             = 'david@loudthinking.com'
+  s.homepage          = 'http://www.rubyonrails.org'
+  s.rubyforge_project = 'rails'
+
+  s.files              = Dir['CHANGELOG', 'README', 'bin/**/*', 'builtin/**/*', 'guides/**/*', 'lib/**/{*,.[a-z]*}']
+  s.require_path       = 'lib'
+  s.bindir             = 'bin'
+  s.executables        = ['rails']
+  s.default_executable = 'rails'
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
 
-  s.files = Dir['CHANGELOG', 'README', 'bin/**/*', 'builtin/**/*', 'guides/**/*', 'lib/**/{*,.[a-z]*}']
-  s.require_path = 'lib'
-  s.bindir = "bin"
-  s.executables = ["rails"]
-  s.default_executable = "rails"
-
-  s.author = "David Heinemeier Hansson"
-  s.email = "david@loudthinking.com"
-  s.homepage = "http://www.rubyonrails.org"
-  s.rubyforge_project = "rails"
+  s.add_dependency('rake',          '>= 0.8.3')
+  s.add_dependency('thor',          '~> 0.13')
+  s.add_dependency('activesupport', '= 3.0.0.beta')
+  s.add_dependency('actionpack',    '= 3.0.0.beta')
 end