Merge branch 'CHEF-1064' of git://github.com/danielsdeleo/chef into d…

…anielsdeleo/CHEF-1064
pblittle · Mar 30, 2010 · 4e3af93 · 4e3af93
2 parents 96c9a7a + 74cc12f
commit 4e3af93
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/chef-server-api/Rakefile b/chef-server-api/Rakefile
@@ -22,12 +22,12 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-
-  ["merb-slices",
-   "merb-core",
-   "merb-assets",
-   "merb-helpers",
-   "thin",
+  
+  s.add_dependency "merb-core", "~> 1.0"
+  s.add_dependency "merb-slices", "~> 1.0"
+  s.add_dependency "merb-assets", "~> 1.0"
+  s.add_dependency "merb-helpers", "~> 1.0"
+  ["thin",
    "json", 
    "uuidtools"
   ].each { |g| s.add_dependency g}

diff --git a/chef-server-webui/Rakefile b/chef-server-webui/Rakefile
@@ -23,13 +23,14 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
 
-  ["merb-slices",
-   "merb-core",
-   "merb-haml",
-   "merb-assets",
-   "merb-helpers",
-   "merb-param-protection",
-   "thin",
+  s.add_dependency "merb-core", "~> 1.0"
+  s.add_dependency "merb-slices", "~> 1.0"
+  s.add_dependency "merb-assets", "~> 1.0"
+  s.add_dependency "merb-helpers", "~> 1.0"
+  s.add_dependency "merb-haml", "~> 1.0"
+  s.add_dependency "merb-param-protection", "~> 1.0"
+
+  ["thin",
    "haml",
    "json",
    "ruby-openid",

diff --git a/chef-server/lib/tasks/package.rake b/chef-server/lib/tasks/package.rake
@@ -12,9 +12,11 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-
-  %w{ merb-core merb-haml merb-assets
-    merb-helpers thin haml
+  s.add_dependency "merb-core", "~> 1.0"
+  s.add_dependency "merb-haml", "~> 1.0"
+  s.add_dependency "merb-assets", "~> 1.0"
+  s.add_dependency "merb-helpers", "~> 1.0"
+  %w{ thin haml
     ruby-openid json coderay}.each { |gem| s.add_dependency gem }
 
   s.bindir       = "bin"