commit 3470ff73c3507104c0ebd5d218377b3668595a67
Author: Elan Ruusamäe <[email protected]>
Date: Wed Apr 19 22:16:14 2017 +0300
up to 9.0.5
gitlab-ce.spec | 10 +++++-----
pld.patch | 22 +++++++++++-----------
2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 740b606..7c4d4bd 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -14,11 +14,11 @@
%bcond_with krb5 # build with kerberos support
%bcond_without gem_cache # use local cache to speedup gem installation
-%define shell_version 4.1.1
-%define workhorse_version 1.3.0
+%define shell_version 5.0.0
+%define workhorse_version 1.4.2
Summary: A Web interface to create projects and repositories, manage
access and do code reviews
Name: gitlab-ce
-Version: 8.17.5
+Version: 9.0.5
Release: 0.92
License: MIT
Group: Applications/WWW
@@ -52,7 +52,7 @@ BuildRequires: postgresql-devel
BuildRequires: rpm-rubyprov
BuildRequires: rpmbuild(macros) >= 1.647
BuildRequires: ruby-bundler
-BuildRequires: ruby-devel >= 1:2.1.0
+BuildRequires: ruby-devel >= 1:2.3.0
BuildRequires: yarn >= 0.17.0
BuildRequires: zlib-devel
Requires(post,preun): /sbin/chkconfig
@@ -113,12 +113,12 @@ mv config/database.yml.mysql config/database.yml
find -name .gitkeep | xargs rm
+%build
v=$(cat GITLAB_SHELL_VERSION)
test "$v" = "%{shell_version}"
v=$(cat GITLAB_WORKHORSE_VERSION)
test "$v" = "%{workhorse_version}"
-%build
%if %{with gem_cache}
cachedir="%{_specdir}/cache/%{version}.%{_arch}"
install -d vendor/bundle
diff --git a/pld.patch b/pld.patch
index ead1e99..79d7938 100644
--- a/pld.patch
+++ b/pld.patch
@@ -1,5 +1,5 @@
---- gitlabhq-8.11.3/config/gitlab.yml 2016-08-30 09:23:24.191326482 +0300
-+++ gitlabhq-8.13.2/config/gitlab.yml 2016-11-01 22:24:29.430388677 +0200
+--- gitlab-ce-9.0.5/config/gitlab.yml~ 2017-04-19 19:24:05.000000000 +0300
++++ gitlab-ce-9.0.5/config/gitlab.yml 2017-04-19 20:10:23.905562742 +0300
@@ -30,8 +30,10 @@
gitlab:
## Web server settings (note: host is the FQDN, do not include http://)
@@ -22,25 +22,25 @@
## Date & Time settings
# Uncomment and customize if you want to change the default time zone of
GitLab application.
-@@ -412,7 +412,7 @@
+@@ -462,7 +464,7 @@
# least. This setting is fed to 'rm -rf' in
# db/migrate/20151023144219_remove_satellites.rb
satellites:
- path: /home/git/gitlab-satellites/
+ path: /var/lib/gitlab/satellites/
- ## Backup settings
- backup:
-@@ -433,7 +433,7 @@
- # Paths where repositories can be stored. Give the canonicalized absolute
pathname.
- # NOTE: REPOS PATHS MUST NOT CONTAIN ANY SYMLINK!!!
+ ## Repositories settings
+ repositories:
+@@ -472,7 +474,7 @@
+ # real path not the symlink.
storages: # You must have at least a `default` storage path.
-- default: /home/git/repositories/
-+ default: /var/lib/gitlab/repositories/
+ default:
+- path: /home/git/repositories/
++ path: /var/lib/gitlab/repositories/
## Backup settings
backup:
-@@ -458,12 +458,12 @@
+@@ -499,12 +501,12 @@
## GitLab Shell settings
gitlab_shell:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/c1e6df52a3cfcc916581a582ba13863ac43c052c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
