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

[Sergej Pupykin]

    Date: Saturday, November 13, 2021 @ 20:11:17
  Author: spupykin
Revision: 1046025

upgpkg: redmine 4.2.3-1

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

-----------------+
 Gemfile.local   |    9 ++-------
 PKGBUILD        |   28 +++++++++++++++++-----------
 redmine.service |    2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

Modified: Gemfile.local
===================================================================
--- Gemfile.local	2021-11-13 20:11:12 UTC (rev 1046024)
+++ Gemfile.local	2021-11-13 20:11:17 UTC (rev 1046025)
@@ -1,8 +1,3 @@
-gem "xpath", "< 4.0"
-gem "ffi", ">= 0"
-gem "childprocess", "= 0.9.0"
-gem "docile", "= 1.1.5"
-gem "metaclass", "= 0.0.4"
-gem "mocha", ">= 1.4.0"
 gem "mysql2", "~> 0.5.0"
-gem "pg", "~> 1.1.4"
+gem "pg", "~> 1.2.2"
+gem "sqlite3", "~> 1.4.0"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-13 20:11:12 UTC (rev 1046024)
+++ PKGBUILD	2021-11-13 20:11:17 UTC (rev 1046025)
@@ -2,14 +2,14 @@
 # Contributor: Federico Cuello <fedux at fedux.com.ar>
 
 pkgname=redmine
-pkgver=4.2.2
-pkgrel=2
+pkgver=4.2.3
+pkgrel=1
 pkgdesc="A flexible project management web application written using Ruby on Rails framework."
-arch=('any')
+arch=('x86_64')
 url="https://www.redmine.org"
 license=('GPL2')
-depends=('ruby2.6' 'imagemagick' 'libxml2' 'libxslt')
-makedepends=('mariadb-libs' 'postgresql-libs' 'systemd')
+depends=('ruby2.7' 'imagemagick' 'libxml2' 'libxslt')
+makedepends=('mariadb-libs' 'postgresql-libs' 'sqlite' 'systemd')
 optdepends=('apache: A supported application server'
             'nginx: A supported application server'
             'mysql: MySQL database support'
@@ -18,22 +18,28 @@
 source=("$url/releases/$pkgname-$pkgver.tar.gz"
 	"Gemfile.local"
 	"redmine.service")
-sha512sums=('71155358ca68d9eb5bf6b79e26202c29ba3355d499662bfe659ff1672625a25d91694d5f1e4bb8db18456642470244aca914efe4456adef2850b70ff7eb216b2'
-            '4121bc1c30ca626a7cef5b4993dbe8480acfcb0c84367520a45433ba09878ed541247be1980a32a8b74f9a4f0802ff5fa341efca3cde91cd2fe1fe11c8412754'
-            '0b897980a8920538674fa7585e1dbaef48a152226215d598c41b3fcf4ac6566b5866d6e3132c30c0adbdc0d8e0080e2541cb4a119aedc6bef24fd6c129abd4eb')
+sha512sums=('456117b0d5d72ee58c87def84327e29f79937fa71098b48a80103e3e6653648c0df46afcc4f533803384ba7413e690538deeee33e263d86dd9e4e5dec65144e3'
+            '1943883fdc5479f8acb4c256108b6ae054360eb7298b696bc3e16995dac0e51529b4a9f4c8e9158645a15d7b90fdcdaedb4502986a8a6dc4015671fae6861b6e'
+            'e25398fc0287244a2adf1e242bd2bf0ae08ade055a1eab843fda301cd16a8ce73ec8a0b23a5d77f06fa4af08c6bf8cee877feb7a247549e7decd8438ff2b6caa')
 
 build() {
     cd "$srcdir"/redmine-$pkgver
 
-    export PATH=/opt/ruby2.6/bin:$PATH
+    export PATH=/opt/ruby2.7/bin:$PATH
 
     cp "${srcdir}"/Gemfile.local Gemfile.local
-    bundle-2.6 lock
-    bundle-2.6 install --no-cache --deployment --without development test
+    bundle-2.7 config set force_ruby_platform true
+    bundle-2.7 config build.nokogiri --use-system-libraries
+    bundle-2.7 lock
+    bundle-2.7 install --no-cache --deployment --without development test
 }
 
 package() {
     install -dm 755 "$pkgdir"/usr/share/webapps/
+
+    rm "$srcdir"/redmine-$pkgver/vendor/bundle/ruby/2.7.0/extensions/*/*/*/{mkmf.log,gem_make.out}
+    rm -rf "$srcdir"/redmine-$pkgver/vendor/bundle/ruby/2.7.0/gems/*/ext/
+
     cp -a --no-preserve=ownership "$srcdir"/redmine-$pkgver "$pkgdir"/usr/share/webapps/redmine
 
     install -Dm0644 "${srcdir}"/redmine.service "${pkgdir}"/usr/lib/systemd/system/redmine.service

Modified: redmine.service
===================================================================
--- redmine.service	2021-11-13 20:11:12 UTC (rev 1046024)
+++ redmine.service	2021-11-13 20:11:17 UTC (rev 1046025)
@@ -7,7 +7,7 @@
 User=http
 Group=http
 WorkingDirectory=/usr/share/webapps/redmine
-ExecStart=/usr/bin/ruby-2.6 ./bin/rails server webrick -e production -b 127.0.0.1 -p 3020
+ExecStart=/usr/bin/ruby-2.7 ./bin/rails server webrick -e production -b 127.0.0.1 -p 3020
 RestartSec=60
 Restart=always