[arch-commits] Commit in redmine/trunk (PKGBUILD redmine.service)

[Sergej Pupykin]

    Date: Wednesday, February 19, 2020 @ 23:11:28
  Author: spupykin
Revision: 576948

upgpkg: redmine 4.0.5-2

Modified:
  redmine/trunk/PKGBUILD
  redmine/trunk/redmine.service

-----------------+
 PKGBUILD        |   12 +++++++-----
 redmine.service |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-19 23:05:32 UTC (rev 576947)
+++ PKGBUILD	2020-02-19 23:11:28 UTC (rev 576948)
@@ -3,12 +3,12 @@
 
 pkgname=redmine
 pkgver=4.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="A flexible project management web application written using Ruby on Rails framework."
 arch=('any')
 url="https://www.redmine.org"
 license=('GPL2')
-depends=('ruby' 'libmagick6' 'ruby-bundler' 'libxml2' 'libxslt')
+depends=('ruby2.6' 'libmagick6' 'libxml2' 'libxslt')
 makedepends=('mariadb-libs' 'postgresql-libs')
 optdepends=('apache: A supported application server'
             'nginx: A supported application server'
@@ -20,15 +20,17 @@
 	"redmine.service")
 sha512sums=('a6aa3e2418fd83ed3783fc6644c339c54ebb1952b8c2c0be4b718fb296fdff64fb4116faa2c88f3e5c3c25d7c5b3c21cd7822ff9f99f6f67270e0b8b64053678'
             '750ae2aa12ab6b94ab818f329b95e7aa04a148512472548a3d2f91df4af59709dd841d553402d4332e6fc49a8bb643b17e5bacb1c26a99702fde32cae053ec29'
-            'aa2186ed970667baf8b80c4b65fce76291074bed25cf8e78c6a265afb6e8a00c67eb195ceb8fc021cdc0b70731a008ccb64cdd28f492e130d469a71f364d40a7')
+            '0b897980a8920538674fa7585e1dbaef48a152226215d598c41b3fcf4ac6566b5866d6e3132c30c0adbdc0d8e0080e2541cb4a119aedc6bef24fd6c129abd4eb')
 
 build() {
     cd "$srcdir"/redmine-$pkgver
 
+    export PATH=/opt/ruby2.6/bin:$PATH
     export PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig"
+
     cp "${srcdir}"/Gemfile.local Gemfile.local
-    bundle lock
-    bundle install --no-cache --deployment --without development test
+    bundle-2.6 lock
+    bundle-2.6 install --no-cache --deployment --without development test
 }
 
 package() {

Modified: redmine.service
===================================================================
--- redmine.service	2020-02-19 23:05:32 UTC (rev 576947)
+++ redmine.service	2020-02-19 23:11:28 UTC (rev 576948)
@@ -7,7 +7,7 @@
 User=http
 Group=http
 WorkingDirectory=/usr/share/webapps/redmine
-ExecStart=/usr/bin/ruby ./bin/rails server webrick -e production -b 127.0.0.1 -p 3020
+ExecStart=/usr/bin/ruby-2.6 ./bin/rails server webrick -e production -b 127.0.0.1 -p 3020
 RestartSec=60
 Restart=always