[DRE-commits] [berkshelf-api] 04/06: Drop unneeded and refresh other patches
Hleb Valoshka
tsfgnu-guest at moszumanska.debian.org
Fri Aug 5 14:31:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
tsfgnu-guest pushed a commit to branch master
in repository berkshelf-api.
commit c1b09f5b706150ab76d7ed55bf42be9821d4da1f
Author: Hleb Valoshka <375gnu at gmail.com>
Date: Fri Aug 5 16:46:39 2016 +0300
Drop unneeded and refresh other patches
---
...re-rubygems-bundler-spork-don-t-change-in.patch | 4 +--
....patch => 0002-RSA-private-key-for-tests.patch} | 0
.../0002-Workaround-rspec-core-bug-2064.patch | 28 ----------------
...t-require-archive-and-activesupport-gems.patch} | 23 +++++++------
.../0005-Relax-varia_model-dependency.patch | 38 ----------------------
debian/patches/series | 6 ++--
6 files changed, 17 insertions(+), 82 deletions(-)
diff --git a/debian/patches/0001-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch b/debian/patches/0001-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch
index 0386688..ea1e0ea 100644
--- a/debian/patches/0001-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch
+++ b/debian/patches/0001-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch
@@ -7,7 +7,7 @@ Subject: Don't require rubygems, bundler & spork, don't change $: in tests
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index d8644cb..6ea4a7a 100644
+index be454df..3df6623 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,12 +1,7 @@
@@ -24,7 +24,7 @@ index d8644cb..6ea4a7a 100644
Dir[File.join(File.expand_path("../../spec/support/**/*.rb", __FILE__))].each { |f| require f }
RSpec.configure do |config|
-@@ -48,8 +43,3 @@ Spork.prefork do
+@@ -47,8 +42,3 @@ Spork.prefork do
FileUtils.rm_rf(tmp_path)
FileUtils.mkdir_p(tmp_path)
end
diff --git a/debian/patches/0003-RSA-private-key-for-tests.patch b/debian/patches/0002-RSA-private-key-for-tests.patch
similarity index 100%
rename from debian/patches/0003-RSA-private-key-for-tests.patch
rename to debian/patches/0002-RSA-private-key-for-tests.patch
diff --git a/debian/patches/0002-Workaround-rspec-core-bug-2064.patch b/debian/patches/0002-Workaround-rspec-core-bug-2064.patch
deleted file mode 100644
index f975a6a..0000000
--- a/debian/patches/0002-Workaround-rspec-core-bug-2064.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Hleb Valoshka <375gnu at gmail.com>
-Date: Wed, 19 Aug 2015 13:36:42 +0300
-Subject: Workaround rspec-core bug 2064
-
----
- spec/spec_helper.rb | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 6ea4a7a..65c23b6 100644
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -19,6 +19,15 @@ require 'berkshelf/api'
- config.before(:suite) { Berkshelf::RSpec::ChefServer.start }
- config.before(:all) { Berkshelf::API::Logging.init(location: '/dev/null') }
-
-+ # Workaround for bug https://github.com/rspec/rspec-core/issues/2064.
-+ #
-+ # When `true', spec/unit/berkshelf/api/cache_builder/worker/github_spec.rb
-+ # will hang on `it_behaves_like "a human-readable string"', which is
-+ # spec/support/human_readable.rb `expect(subject.to_s).to_not ...'
-+ #
-+ # This feature is introduced in rspec 3.3, so rspec <= 3.2 works fine.
-+ config.threadsafe = false
-+
- config.before do
- Celluloid.shutdown
- Celluloid.boot
diff --git a/debian/patches/0004-Don-t-require-archive-gem.patch b/debian/patches/0003-Don-t-require-archive-and-activesupport-gems.patch
similarity index 68%
rename from debian/patches/0004-Don-t-require-archive-gem.patch
rename to debian/patches/0003-Don-t-require-archive-and-activesupport-gems.patch
index b200195..c4c94ac 100644
--- a/debian/patches/0004-Don-t-require-archive-gem.patch
+++ b/debian/patches/0003-Don-t-require-archive-and-activesupport-gems.patch
@@ -1,36 +1,39 @@
From: Hleb Valoshka <375gnu at gmail.com>
-Date: Thu, 24 Mar 2016 13:59:59 +0300
-Subject: Don't require archive gem
+Date: Fri, 5 Aug 2016 16:42:49 +0300
+Subject: Don't require archive and activesupport gems
---
- berkshelf-api.gemspec | 3 ---
+ berkshelf-api.gemspec | 6 ------
lib/berkshelf/api/site_connector/supermarket.rb | 1 -
- 2 files changed, 4 deletions(-)
+ 2 files changed, 7 deletions(-)
diff --git a/berkshelf-api.gemspec b/berkshelf-api.gemspec
-index a8284e5..a555329 100644
+index c6ec62e..c4e14d7 100644
--- a/berkshelf-api.gemspec
+++ b/berkshelf-api.gemspec
-@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
+@@ -26,8 +26,6 @@ Gem::Specification.new do |s|
s.specification_version = 4
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+- s.add_runtime_dependency(%q<activesupport>, ["~> 4.0"])
- s.add_runtime_dependency(%q<archive>, ["= 0.0.6"])
s.add_runtime_dependency(%q<buff-config>, ["~> 1.0"])
s.add_runtime_dependency(%q<celluloid>, ["~> 0.16"])
s.add_runtime_dependency(%q<celluloid-io>, ["~> 0.16"])
-@@ -39,7 +38,6 @@ Gem::Specification.new do |s|
+@@ -41,8 +39,6 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<semverse>, ["~> 1.0"])
- s.add_runtime_dependency(%q<varia_model>, ["< 0.5.0", ">= 0.4.0"])
+ s.add_runtime_dependency(%q<varia_model>, ["~> 0.4"])
else
+- s.add_dependency(%q<activesupport>, ["~> 4.0"])
- s.add_dependency(%q<archive>, ["= 0.0.6"])
s.add_dependency(%q<buff-config>, ["~> 1.0"])
s.add_dependency(%q<celluloid>, ["~> 0.16"])
s.add_dependency(%q<celluloid-io>, ["~> 0.16"])
-@@ -53,7 +51,6 @@ Gem::Specification.new do |s|
- s.add_dependency(%q<varia_model>, ["< 0.5.0", ">= 0.4.0"])
+@@ -57,8 +53,6 @@ Gem::Specification.new do |s|
+ s.add_dependency(%q<varia_model>, ["~> 0.4"])
end
else
+- s.add_dependency(%q<activesupport>, ["~> 4.0"])
- s.add_dependency(%q<archive>, ["= 0.0.6"])
s.add_dependency(%q<buff-config>, ["~> 1.0"])
s.add_dependency(%q<celluloid>, ["~> 0.16"])
diff --git a/debian/patches/0005-Relax-varia_model-dependency.patch b/debian/patches/0005-Relax-varia_model-dependency.patch
deleted file mode 100644
index 10c1647..0000000
--- a/debian/patches/0005-Relax-varia_model-dependency.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Hleb Valoshka <375gnu at gmail.com>
-Date: Thu, 24 Mar 2016 15:48:35 +0300
-Subject: Relax varia_model dependency
-
----
- berkshelf-api.gemspec | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/berkshelf-api.gemspec b/berkshelf-api.gemspec
-index a555329..93d4edf 100644
---- a/berkshelf-api.gemspec
-+++ b/berkshelf-api.gemspec
-@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
- s.add_runtime_dependency(%q<reel>, ["~> 0.6.0"])
- s.add_runtime_dependency(%q<ridley>, ["~> 4.4"])
- s.add_runtime_dependency(%q<semverse>, ["~> 1.0"])
-- s.add_runtime_dependency(%q<varia_model>, ["< 0.5.0", ">= 0.4.0"])
-+ s.add_runtime_dependency(%q<varia_model>, [">= 0.4.0"])
- else
- s.add_dependency(%q<buff-config>, ["~> 1.0"])
- s.add_dependency(%q<celluloid>, ["~> 0.16"])
-@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
- s.add_dependency(%q<reel>, ["~> 0.6.0"])
- s.add_dependency(%q<ridley>, ["~> 4.4"])
- s.add_dependency(%q<semverse>, ["~> 1.0"])
-- s.add_dependency(%q<varia_model>, ["< 0.5.0", ">= 0.4.0"])
-+ s.add_dependency(%q<varia_model>, [">= 0.4.0"])
- end
- else
- s.add_dependency(%q<buff-config>, ["~> 1.0"])
-@@ -61,6 +61,6 @@ Gem::Specification.new do |s|
- s.add_dependency(%q<reel>, ["~> 0.6.0"])
- s.add_dependency(%q<ridley>, ["~> 4.4"])
- s.add_dependency(%q<semverse>, ["~> 1.0"])
-- s.add_dependency(%q<varia_model>, ["< 0.5.0", ">= 0.4.0"])
-+ s.add_dependency(%q<varia_model>, [">= 0.4.0"])
- end
- end
diff --git a/debian/patches/series b/debian/patches/series
index c5a5bd4..cad90c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
0001-Don-t-require-rubygems-bundler-spork-don-t-change-in.patch
-0002-Workaround-rspec-core-bug-2064.patch
-0003-RSA-private-key-for-tests.patch
-0004-Don-t-require-archive-gem.patch
-0005-Relax-varia_model-dependency.patch
+0002-RSA-private-key-for-tests.patch
+0003-Don-t-require-archive-and-activesupport-gems.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/berkshelf-api.git
More information about the Pkg-ruby-extras-commits
mailing list