diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 527b52a..280035f 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -8,8 +8,8 @@ pkgdesc="A flexible project management web application written using Ruby on Rai arch=('x86_64') url="https://www.redmine.org" license=('GPL2') -depends=('ruby2.7' 'imagemagick' 'libxml2' 'libxslt') -makedepends=('mariadb-libs' 'postgresql-libs' 'sqlite' 'systemd') +depends=('ruby' 'imagemagick' 'libxml2' 'libxslt') +makedepends=('mariadb-libs' 'postgresql-libs' 'sqlite' 'systemd' 'ruby-bundler') optdepends=('apache: A supported application server' 'nginx: A supported application server' 'mysql: MySQL database support' @@ -25,20 +25,18 @@ sha512sums=('9f0a866fdb941df4404a794e71a06b961bec814aae1b0fe56a876bfe0c7f96fe3b5 build() { cd "$srcdir"/redmine-$pkgver - export PATH=/opt/ruby2.7/bin:$PATH - cp "${srcdir}"/Gemfile.local Gemfile.local - 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 + bundle config set force_ruby_platform true + bundle config build.nokogiri --use-system-libraries + bundle lock + bundle 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/ + rm "$srcdir"/redmine-$pkgver/vendor/bundle/ruby/3.0.0/extensions/*/*/*/{mkmf.log,gem_make.out} + rm -rf "$srcdir"/redmine-$pkgver/vendor/bundle/ruby/3.0.0/gems/*/ext/ cp -a --no-preserve=ownership "$srcdir"/redmine-$pkgver "$pkgdir"/usr/share/webapps/redmine