diff --git a/debian/patches/drop-git-ls-files.patch b/debian/patches/drop-git-ls-files.patch index 7e4395b..67f53ed 100644 --- a/debian/patches/drop-git-ls-files.patch +++ b/debian/patches/drop-git-ls-files.patch @@ -6,12 +6,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/gitlab.gemspec +++ b/gitlab.gemspec -@@ -11,7 +11,7 @@ +@@ -13,7 +13,7 @@ Gem::Specification.new do |gem| gem.summary = 'A Ruby wrapper and CLI for the GitLab API' gem.homepage = 'https://github.com/narkoz/gitlab' -- gem.files = `git ls-files`.split($/). -+ gem.files = Dir.glob('**/*'). - reject { |f| f[/^spec/] } - - %w[Dockerfile docker-compose.yml docker.env .travis.yml .rubocop.yml .dockerignore] - gem.bindir = 'exe' +- gem.files = `git ls-files`.split($/) ++ gem.files = Dir.glob('**/*') + .grep_v(/^spec/) - + %w[Dockerfile docker-compose.yml docker.env .travis.yml + .rubocop.yml .dockerignore] diff --git a/debian/patches/use-installed-libraries.patch b/debian/patches/use-installed-libraries.patch index 2e32e57..07fef65 100644 --- a/debian/patches/use-installed-libraries.patch +++ b/debian/patches/use-installed-libraries.patch @@ -5,12 +5,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb -@@ -1,8 +1,9 @@ +@@ -3,8 +3,9 @@ require 'rspec' require 'webmock/rspec' --require File.expand_path('../../lib/gitlab', __FILE__) --require File.expand_path('../../lib/gitlab/cli', __FILE__) +-require File.expand_path('../lib/gitlab', __dir__) +-require File.expand_path('../lib/gitlab/cli', __dir__) +$:.unshift File.expand_path('../../lib', __FILE__) +require 'gitlab' +require 'gitlab/cli'