commit bedfa90adf351a705b1c1046366e0a675805b8f7
Author: Elan Ruusamäe <[email protected]>
Date: Wed Jan 31 22:54:08 2018 +0200
up to 5.11.0
config.yml.patch | 8 ++++----
gitlab-shell.spec | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gitlab-shell.spec b/gitlab-shell.spec
index ebb9fb3..caa7dfa 100644
--- a/gitlab-shell.spec
+++ b/gitlab-shell.spec
@@ -1,11 +1,11 @@
Summary: GitLab ssh access and repository management
Name: gitlab-shell
-Version: 5.9.4
+Version: 5.11.0
Release: 1
License: MIT
Group: Applications/Shells
Source0:
https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.bz2?ref=v%{version}&/%{name}-%{version}.tar.bz2
-# Source0-md5: bd383d50ee7299332f9e3ed6d900deb2
+# Source0-md5: 275faae9b75785f595aed87c8eb3a577
Patch0: unvendor-redis.patch
Patch1: skip_hooks_setup.patch
Patch2: config.yml.patch
@@ -55,7 +55,7 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0
-r -l512 rm -f
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -a VERSION *.yml bin lib hooks support $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -a VERSION *.yml bin lib hooks $RPM_BUILD_ROOT%{_datadir}/%{name}
install -d $RPM_BUILD_ROOT%{_sysconfdir}/gitlab
mv $RPM_BUILD_ROOT%{_datadir}/gitlab-shell/config.yml
$RPM_BUILD_ROOT%{_sysconfdir}/gitlab/gitlab-shell-config.yml
diff --git a/config.yml.patch b/config.yml.patch
index 78e4b25..a3ad740 100644
--- a/config.yml.patch
+++ b/config.yml.patch
@@ -1,5 +1,5 @@
---- gitlab-shell-4.1.1/config.yml~ 2016-12-23 20:20:05.000000000 +0200
-+++ gitlab-shell-4.1.1/config.yml 2016-12-23 20:20:45.966319553 +0200
+--- gitlab-shell-5.11.0/config.yml~ 2018-01-31 22:52:26.000000000 +0200
++++ gitlab-shell-5.11.0/config.yml 2018-01-31 22:53:20.803527526 +0200
@@ -25,7 +25,7 @@
self_signed_cert: false
@@ -18,10 +18,10 @@
# Parent directory for global custom hook directories (pre-receive.d,
update.d, post-receive.d)
# Default is hooks in the gitlab-shell directory.
-@@ -38,11 +38,11 @@
+@@ -37,11 +37,11 @@
+
# Redis settings used for pushing commit notices to gitlab
redis:
- bin: /usr/bin/redis-cli
- # host: 127.0.0.1
- # port: 6379
+ host: 127.0.0.1
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-shell.git/commitdiff/bedfa90adf351a705b1c1046366e0a675805b8f7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
