commit df52cff8b4c99f889d4121b1ce7d12f14a49d563
Author: Elan Ruusamäe <[email protected]>
Date: Thu Jun 16 20:00:02 2016 +0300
up to 3.0.0
- uses redis ruby instead of redis-cli
- unbundle redis
gitlab-shell.spec | 6 +++---
unvendor-redis.patch | 7 +++++++
2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/gitlab-shell.spec b/gitlab-shell.spec
index 3cde0b2..13389a3 100644
--- a/gitlab-shell.spec
+++ b/gitlab-shell.spec
@@ -4,12 +4,12 @@
%define gname git
Summary: GitLab ssh access and repository management
Name: gitlab-shell
-Version: 2.7.2
+Version: 3.0.0
Release: 1
License: MIT
Group: Applications/Shells
Source0:
https://github.com/gitlabhq/gitlab-shell/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 59d89706642ba34d859448405bec9baf
+# Source0-md5: 1798d8026f92729b607d9656ca6c6c01
Patch0: config.yml.patch
URL: https://github.com/gitlabhq/gitlab-shell
BuildRequires: rpm-rubyprov
@@ -25,8 +25,8 @@ Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
Requires: git-core >= 2.7.3
-Requires: redis >= 2.8.0
Requires: ruby >= 1:2.0
+Requires: ruby-redis >= 3.3.0
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
diff --git a/unvendor-redis.patch b/unvendor-redis.patch
new file mode 100644
index 0000000..17af827
--- /dev/null
+++ b/unvendor-redis.patch
@@ -0,0 +1,7 @@
+--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-shell.git/commitdiff/16fbd2d0ee7ce711ca2db1facc27f22678aa3dbe
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
