Levente Polyak pushed to branch main at Arch Linux / Packaging / Packages / ruby


Commits:
0f5693d1 by Levente Polyak at 2024-06-02T15:53:14+02:00
upgpkg: 3.2.4-0.1: add confclits to bootstrap build

This should solve pacman dependency resolution problems

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = ruby
        pkgdesc = An object-oriented language for quick and easy programming
        pkgver = 3.2.4
-       pkgrel = 0
+       pkgrel = 0.1
        url = https://www.ruby-lang.org/en/
        arch = x86_64
        license = BSD-2-Clause


=====================================
PKGBUILD
=====================================
@@ -16,7 +16,7 @@ pkgname=(
   ruby-stdlib
 )
 pkgver=3.2.4
-pkgrel=0
+pkgrel=0.1
 pkgdesc='An object-oriented language for quick and easy programming'
 url='https://www.ruby-lang.org/en/'
 arch=(x86_64)
@@ -283,6 +283,9 @@ package_ruby() {
     declare -n bootstrap_provides=provides
     bootstrap_provides+=("${_default_tool_gems[@]/#/ruby-}" rubygems)
     bootstrap_provides+=("${_bundled_gems[@]/#/ruby-}")
+    declare -n bootstrap_conflicts=conflicts
+    bootstrap_conflicts+=("${_default_tool_gems[@]/#/ruby-}" rubygems)
+    bootstrap_conflicts+=("${_bundled_gems[@]/#/ruby-}")
   else
     # remove de-vendored parts
     _remove_default_tool_gems



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/ruby/-/commit/0f5693d13e065d6367fe13f1725a493bd4636a6e

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/ruby/-/commit/0f5693d13e065d6367fe13f1725a493bd4636a6e
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to