[arch-commits] Commit in gitlab-gitaly/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Wednesday, January 9, 2019 @ 22:57:32
  Author: svenstaro
Revision: 421328

upgpkg: gitlab-gitaly 1.12.0-2

Fix version to ruby2.5

Modified:
  gitlab-gitaly/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-09 22:54:11 UTC (rev 421327)
+++ PKGBUILD	2019-01-09 22:57:32 UTC (rev 421328)
@@ -5,14 +5,14 @@
 # need this again at some point in the future.
 pkgname=gitlab-gitaly
 pkgver=1.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Speed up Git access using caching"
 arch=('x86_64')
 url="https://gitlab.com/gitlab-org/gitaly"
 license=('MIT')
-depends=(glibc ruby libxml2 libxslt)
+depends=(glibc ruby2.3 libxml2 libxslt)
 options=(!buildflags)
-makedepends=(go ruby-bundler cmake)
+makedepends=(go ruby2.3-bundler cmake)
 backup=("etc/gitlab-gitaly/config.toml")
 source=("${pkgname}-${pkgver}.tar.gz::https://gitlab.com/api/v4/projects/gitlab-org%2Fgitaly/repository/archive?sha=v${pkgver}"
         "gitlab-gitaly.service")
@@ -24,6 +24,15 @@
 prepare() {
   cd "gitaly-"*
 
+  sed -i "s/bundle install/bundle-2.3 install/" Makefile
+  sed -i "s/bundle config/bundle-2.3 config/" Makefile
+  sed -i "s/bundle show/bundle-2.3 show/" Makefile
+  sed -i "s/bundle/bundle-2.3/" internal/rubyserver/rubyserver.go
+  sed -i "s/bundle/bundle-2.3/" internal/linguist/linguist.go
+  sed -i "s/bundle/bundle-2.3/" _support/makegen.go
+  sed -i "s/\"ruby\"/\"ruby-2.3\"/" internal/linguist/linguist.go
+  sed -i "s/env ruby/env ruby-2.3/" ruby/bin/gitaly-ruby
+  sed -i "s/env ruby/env ruby-2.3/" ruby/bin/ruby-cd
   sed -i "s/VERSION = .*/VERSION = ${pkgver}/" Makefile
   sed -i "s|dir = \"/home/git/gitaly/ruby\"|dir = \"/usr/share/webapps/gitlab-gitaly/ruby\"|" config.toml.example
   sed -i "s|dir = \"/home/git/gitlab-shell\"|dir = \"/usr/share/webapps/gitlab-shell\"|" config.toml.example