From 5d5970173c5bad408967d5d828fde77495999074 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Mon, 22 Aug 2016 22:17:14 +0300
Subject: [PATCH] up to 3.4.0 (Redis Sentinel support for GitLab 8.11)

---
 config.yml.patch  | 20 ++++++++------------
 gitlab-shell.spec |  9 +++++----
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/config.yml.patch b/config.yml.patch
index 18527d5..a0c2a85 100644
--- a/config.yml.patch
+++ b/config.yml.patch
@@ -1,12 +1,5 @@
---- gitlab-shell-3.3.0/config.yml~	2016-08-04 09:24:14.000000000 +0300
-+++ gitlab-shell-3.3.0/config.yml	2016-08-04 09:26:47.671443673 +0300
-@@ -1,5 +1,5 @@
- # GitLab user. git by default
--user: git
-+user: gitlab
- 
- # Url to gitlab instance. Used for api calls. Should end with a slash.
- gitlab_url: "http://localhost/"
+--- gitlab-shell-3.4.0/config.yml~	2016-08-22 22:11:19.000000000 +0300
++++ gitlab-shell-3.4.0/config.yml	2016-08-22 22:12:26.188946328 +0300
 @@ -25,7 +25,7 @@
    self_signed_cert: false
  
@@ -16,7 +9,7 @@
  
  # File that contains the secret key for verifying access to GitLab.
  # Default is .gitlab_shell_secret in the root directory.
-@@ -35,21 +35,21 @@
+@@ -29,16 +29,16 @@
  
  # File that contains the secret key for verifying access to GitLab.
  # Default is .gitlab_shell_secret in the root directory.
@@ -32,9 +25,12 @@
 +  port: 6379
    # pass: redispass # Allows you to specify the password for Redis
    database: 0
--  socket: /var/run/redis/redis.sock # Comment out this line if you want to use TCP
-+#  socket: /var/run/redis/redis.sock # Comment out this line if you want to use TCP
+-  socket: /var/run/redis/redis.sock # Comment out this line if you want to use TCP or Sentinel
++#  socket: /var/run/redis/redis.sock # Comment out this line if you want to use TCP or Sentinel
    namespace: resque:gitlab
+   # sentinels:
+   #   -
+@@ -51,7 +51,7 @@
  
  # Log file.
  # Default is gitlab-shell.log in the root directory.
diff --git a/gitlab-shell.spec b/gitlab-shell.spec
index d16d48f..db7e08c 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:	3.3.2
+Version:	3.4.0
 Release:	1
 License:	MIT
 Group:		Applications/Shells
-Source0:	https://github.com/gitlabhq/gitlab-shell/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	d456a489d1611954837e1fd4685789e2
+Source0:	https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz?ref=v%{version}&/%{name}-%{version}.tar.gz
+# Source0-md5:	cd548940ee1a3c796f5b65b577b870b0
 Patch0:		config.yml.patch
 URL:		https://gitlab.com/gitlab-org/gitlab-shell
 BuildRequires:	rpm-rubyprov
@@ -39,7 +39,8 @@ and provide ssh access to git repositories. It is not a Unix shell nor
 a replacement for Bash or Zsh.
 
 %prep
-%setup -q
+%setup -qc
+mv %{name}-*/* .
 cp -p config.yml.example config.yml
 %patch0 -p1
 
-- 
2.44.0