[DRE-commits] [chef] 05/13: add patch to accept rspec 3.4 while it is not updated in Debian

[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 0fb76389d0c5811a90ae31f71c3006e46a234bae
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Sep 19 13:25:13 2016 -0300

    add patch to accept rspec 3.4 while it is not updated in Debian
---
 debian/changelog                           |  2 ++
 debian/patches/0003-Accept-rspec-3.4.patch | 23 +++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 81f7d5f..81fa6ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ chef (12.14.60-1) UNRELEASED; urgency=medium
   * New upstream release
     - refresh patches
     - several updates to the list of dependencies
+    - add patch to accept rspec 3.4 while it is not updated in Debian
   * debian/copyright:
     - update filename of windows gemspec in Files-Excluded
+  * 
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 24 Jun 2016 14:24:33 -0300
 
diff --git a/debian/patches/0003-Accept-rspec-3.4.patch b/debian/patches/0003-Accept-rspec-3.4.patch
new file mode 100644
index 0000000..87c8116
--- /dev/null
+++ b/debian/patches/0003-Accept-rspec-3.4.patch
@@ -0,0 +1,23 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Mon, 19 Sep 2016 13:24:00 -0300
+Subject: Accept rspec 3.4
+
+Upgrading rspec to 3.5 is under way, but let's try with rspec 3.4 for
+now
+---
+ chef.gemspec | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chef.gemspec b/chef.gemspec
+index 979b0d0..afdc20e 100644
+--- a/chef.gemspec
++++ b/chef.gemspec
+@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
+   s.add_dependency "addressable"
+ 
+   # 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.5" }
++  %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.4" }
+   s.add_dependency "serverspec", "~> 2.7"
+   s.add_dependency "specinfra", "~> 2.10"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d75d2e6..5bbb3c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Update-gemspec-file.patch
 0002-spec-work-against-source-checkout-and-installed-pack.patch
+0003-Accept-rspec-3.4.patch

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