Merge pull request #753 from projectblacklight/blacklight-marc-5.x

Require blacklight-marc ~> 5.0
projectblacklight · Feb 5, 2014 · 92987c4 · 92987c4
2 parents d4de531 + b8722e2
commit 92987c4
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,7 @@ group :test do
   gem "bootstrap-sass"
   gem 'turbolinks'
   gem 'sass-rails'
-  gem 'blacklight_marc', :github => 'projectblacklight/blacklight_marc'
+  gem 'blacklight-marc', :github => 'projectblacklight/blacklight_marc'
 end
 
 if File.exists?('spec/test_app_templates/Gemfile.extra')

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.0.0
+5.0.1
diff --git a/blacklight.gemspec b/blacklight.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency "bootstrap-sass", "~> 3.0"
   s.add_dependency "deprecation"
   s.add_development_dependency "jettywrapper", ">= 1.5.2"
-  s.add_development_dependency "blacklight_marc", "0.0.9"
+  s.add_development_dependency "blacklight-marc", "~> 5.0"
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency 'engine_cart', ">= 0.1.0"
   s.add_development_dependency "equivalent-xml"

diff --git a/lib/generators/blacklight/install_generator.rb b/lib/generators/blacklight/install_generator.rb
@@ -61,7 +61,7 @@ def create_blacklight_catalog
 
     def generate_blacklight_marc_demo
       if options[:marc]
-        gem "blacklight_marc", ">= 0.0.9"
+        gem "blacklight-marc", "~> 5.0"
 
         Bundler.with_clean_env do
           run "bundle install"

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -16,7 +16,7 @@
 end
 
 require 'blacklight'
-require 'blacklight_marc'
+require 'blacklight/marc'
 
 require 'engine_cart'
 EngineCart.load_application!

diff --git a/spec/test_app_templates/lib/generators/test_app_generator.rb b/spec/test_app_templates/lib/generators/test_app_generator.rb
@@ -22,7 +22,7 @@ def remove_index
 
   def run_blacklight_generator
     say_status("warning", "GENERATING BL", :yellow)       
-    gem 'blacklight_marc', ">= 0.0.9", :github => 'projectblacklight/blacklight_marc'
+    gem 'blacklight-marc', "~> 5.0", :github => 'projectblacklight/blacklight_marc'
 
     Bundler.with_clean_env do
       run "bundle install"