0
@@ -1,37 +1,21 @@
0
 require 'rubygems'
0
+require "merb-core"
0
 require 'rake/gempackagetask'
0
-<<<<<<< HEAD:merb-freezer/Rakefile
0
-=======
0
 require "spec/rake/spectask"
0
 require 'merb-core/tasks/merb_rake_helper'
0
->>>>>>> new_merb_gen:merb-freezer/Rakefile
0
 
0
-<<<<<<< HEAD:merb-freezer/Rakefile
0
 PLUGIN = "merb-freezer"
0
-=======
0
->>>>>>> new_merb_gen:merb-freezer/Rakefile
0
 NAME = "merb-freezer"
0
-<<<<<<< HEAD:merb-freezer/Rakefile
0
-VERSION = "0.0.1"
0
-=======
0
 GEM_VERSION = Merb::MORE_VERSION rescue "0.9.4"
0
->>>>>>> new_merb_gen:merb-freezer/Rakefile
0
 AUTHOR = "Matt Aimonetti"
0
 EMAIL = "mattaimonetti@gmail.com"
0
 HOMEPAGE = "http://www.merbivore.com"
0
 SUMMARY = "Merb plugin that let's you freeze Merb"
0
 
0
 spec = Gem::Specification.new do |s|
0
-<<<<<<< HEAD:merb-freezer/Rakefile
0
-=======
0
   s.rubyforge_project = 'merb'
0
->>>>>>> new_merb_gen:merb-freezer/Rakefile
0
   s.name = NAME
0
-<<<<<<< HEAD:merb-freezer/Rakefile
0
-  s.version = VERSION
0
-=======
0
   s.version = GEM_VERSION
0
->>>>>>> new_merb_gen:merb-freezer/Rakefile
0
   s.platform = Gem::Platform::RUBY
0
   s.has_rdoc = true
0
   s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
0
@@ -40,19 +24,13 @@ spec = Gem::Specification.new do |s|
0
   s.author = AUTHOR
0
   s.email = EMAIL
0
   s.homepage = HOMEPAGE
0
-<<<<<<< HEAD:merb-freezer/Rakefile
0
-  s.add_dependency('merb-core', '>= 0.9.2')
0
-=======
0
->>>>>>> new_merb_gen:merb-freezer/Rakefile
0
+  # we assume merb-core and merb-more versions are synchronized
0
+  s.add_dependency('merb-core', ">= #{GEM_VERSION}")
0
   s.require_path = 'lib'
0
   s.bindir = "bin"
0
   s.executables = %w( frozen-merb )
0
-<<<<<<< HEAD:merb-freezer/Rakefile
0
   s.autorequire = PLUGIN
0
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
0
-=======
0
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
0
->>>>>>> new_merb_gen:merb-freezer/Rakefile
0
 end
0
 
0
 Rake::GemPackageTask.new(spec) do |pkg|
0
@@ -61,32 +39,18 @@ end
0
 
0
 desc "install merb-freezer"
0
 task :install => [:package] do
0
-<<<<<<< HEAD:merb-freezer/Rakefile
0
-  sh %{sudo gem install pkg/#{NAME}-#{VERSION}}
0
-=======
0
   sh %{#{sudo} gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION} --no-update-sources}
0
->>>>>>> new_merb_gen:merb-freezer/Rakefile
0
 end
0
 
0
 namespace :jruby do
0
-
0
   desc "Run :package and install the resulting .gem with jruby"
0
   task :install => :package do
0
-<<<<<<< HEAD:merb-freezer/Rakefile
0
-    sh %{#{SUDO} jruby -S gem install pkg/#{NAME}-#{Merb::VERSION}.gem --no-rdoc --no-ri}
0
-=======
0
     sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
0
->>>>>>> new_merb_gen:merb-freezer/Rakefile
0
   end
0
-<<<<<<< HEAD:merb-freezer/Rakefile
0
-  
0
-=======
0
-
0
 end
0
 
0
 desc "Run the freezer specs"
0
 Spec::Rake::SpecTask.new("specs") do |t|
0
   t.spec_opts = ["--format", "specdoc", "--colour"]
0
   t.spec_files = Dir["spec/**/*_spec.rb"].sort
0
->>>>>>> new_merb_gen:merb-freezer/Rakefile
0
-end
0
\ No newline at end of file
0
+end