really unvendor redis

diff --git a/gitlab-shell.spec b/gitlab-shell.spec
index 0ba33471ee9d61299ee8eda30e66691495952827..4ddbb13596c6657268df73f812f09a43cc5d1e74 100644 (file)
--- a/gitlab-shell.spec
+++ b/gitlab-shell.spec
@@ -11,6 +11,7 @@ Group:                Applications/Shells
 Source0:       https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz?ref=v%{version}&/%{name}-%{version}.tar.gz
 # Source0-md5: e863a2b6e978b5da886842822861e327
 Patch0:                config.yml.patch
+Patch1:                unvendor-redis.patch
 URL:           https://gitlab.com/gitlab-org/gitlab-shell
 BuildRequires: rpm-rubyprov
 BuildRequires: rpmbuild(macros) >= 1.665
@@ -43,9 +44,12 @@ a replacement for Bash or Zsh.
 mv %{name}-*/* .
 cp -p config.yml.example config.yml
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/* hooks/*
 
+mv lib/vendor .
+
 # deprecated
 rm support/rewrite-hooks.sh
 # stupid script, rather not package it at all

diff --git a/unvendor-redis.patch b/unvendor-redis.patch
index d823580a5a73420764f2d2ee7af49ef046ccf1fb..093686aed4e20f3ed001dbdfffa48652a8b09cac 100644 (file)
--- a/unvendor-redis.patch
+++ b/unvendor-redis.patch
@@ -1,10 +1,3 @@
---- gitlab-shell-3.0.0/lib/gitlab_config.rb~   2016-05-23 12:07:23.000000000 +0300
-+++ gitlab-shell-3.0.0/lib/gitlab_config.rb    2016-06-16 19:59:25.827657934 +0300
-@@ -1,4 +1,3 @@
--$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'vendor/redis/lib')))
- require 'yaml'
- 
- class GitlabConfig
 --- gitlab-shell-3.3.0/lib/gitlab_redis.rb~    2016-07-27 18:29:35.000000000 +0300
 +++ gitlab-shell-3.3.0/lib/gitlab_redis.rb     2016-08-04 09:31:43.753514191 +0300
 @@ -1,2 +1 @@