[DRE-commits] [chef] 03/13: refresh patches

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository chef.

commit cb87631e1986faa713172f5590b9976d2dc85192
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Sep 19 11:33:47 2016 -0300

    refresh patches
---
 debian/changelog                                                  | 1 +
 debian/patches/0001-Update-gemspec-file.patch                     | 6 +++---
 ...002-spec-work-against-source-checkout-and-installed-pack.patch | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b968a29..da004b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ chef (12.14.60-1) UNRELEASED; urgency=medium
     - update dependency constraint on ruby-chef-config
   * debian/copyright:
     - update filename of windows gemspec in Files-Excluded
+  * refresh patches
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 24 Jun 2016 14:24:33 -0300
 
diff --git a/debian/patches/0001-Update-gemspec-file.patch b/debian/patches/0001-Update-gemspec-file.patch
index dc22e77..8fab3e9 100644
--- a/debian/patches/0001-Update-gemspec-file.patch
+++ b/debian/patches/0001-Update-gemspec-file.patch
@@ -8,13 +8,13 @@ Subject: Update gemspec file
  1 file changed, 1 deletion(-)
 
 diff --git a/chef.gemspec b/chef.gemspec
-index 59367b0..6bd3d35 100644
+index 367761f..979b0d0 100644
 --- a/chef.gemspec
 +++ b/chef.gemspec
-@@ -37,7 +37,6 @@ Gem::Specification.new do |s|
+@@ -40,7 +40,6 @@ Gem::Specification.new do |s|
  
    # Audit mode requires these, so they are non-developmental dependencies now
-   %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.4" }
+   %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5" }
 -  s.add_dependency "rspec_junit_formatter", "~> 0.2.0"
    s.add_dependency "serverspec", "~> 2.7"
    s.add_dependency "specinfra", "~> 2.10"
diff --git a/debian/patches/0002-spec-work-against-source-checkout-and-installed-pack.patch b/debian/patches/0002-spec-work-against-source-checkout-and-installed-pack.patch
index 4e53e3c..f17648e 100644
--- a/debian/patches/0002-spec-work-against-source-checkout-and-installed-pack.patch
+++ b/debian/patches/0002-spec-work-against-source-checkout-and-installed-pack.patch
@@ -13,7 +13,7 @@ framework to setup the $LOAD_PATH.
  5 files changed, 8 insertions(+), 15 deletions(-)
 
 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 2f6747c..5eb22c0 100644
+index 47a5ec7..2ef1bb7 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
 @@ -24,16 +24,9 @@ module Shell
@@ -48,7 +48,7 @@ index 2f6747c..5eb22c0 100644
  require "chef/resource_resolver"
  require "chef/provider_resolver"
 diff --git a/spec/unit/chef_fs/config_spec.rb b/spec/unit/chef_fs/config_spec.rb
-index 5fc5ad5..57a25ec 100644
+index 0adcbbf..bda4b1c 100644
 --- a/spec/unit/chef_fs/config_spec.rb
 +++ b/spec/unit/chef_fs/config_spec.rb
 @@ -18,7 +18,7 @@
@@ -61,7 +61,7 @@ index 5fc5ad5..57a25ec 100644
  describe Chef::ChefFS::Config do
    describe "initialize" do
 diff --git a/spec/unit/chef_fs/data_handler/group_handler_spec.rb b/spec/unit/chef_fs/data_handler/group_handler_spec.rb
-index 849bc84..2fd4a02 100644
+index ac02521..1280cd5 100644
 --- a/spec/unit/chef_fs/data_handler/group_handler_spec.rb
 +++ b/spec/unit/chef_fs/data_handler/group_handler_spec.rb
 @@ -17,7 +17,7 @@
@@ -74,7 +74,7 @@ index 849bc84..2fd4a02 100644
  class TestEntry < Mash
    attr_accessor :name, :org
 diff --git a/spec/unit/file_access_control_spec.rb b/spec/unit/file_access_control_spec.rb
-index 4357a91..1b4017d 100644
+index ee806b5..5d3a6d1 100644
 --- a/spec/unit/file_access_control_spec.rb
 +++ b/spec/unit/file_access_control_spec.rb
 @@ -26,7 +26,7 @@ describe Chef::FileAccessControl do

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/chef.git