summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiretza2021-01-05 14:17:48 +0100
committerXiretza2021-01-05 14:19:36 +0100
commit670cc5f525dec387c6d3c22aa58e8efff326e1af (patch)
treebc39a0ed0045ad92aefeaff5a4a1698b26d9865b
parent896504c0e763ba4cb9ab143ed01c4c607b41c6f7 (diff)
downloadaur-670cc5f525dec387c6d3c22aa58e8efff326e1af.tar.gz
Add conflicts=(grpc) to libgpr
Both provide /usr/lib/libgpr.so, as pointed out in AUR comments: https://aur.archlinux.org/pkgbase/gprbuild/#comment-783867
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD5
2 files changed, 6 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d17b74f0c17d..af1d8ea40130 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gprbuild
pkgdesc = Builder for multi-language systems
pkgver = 2020
- pkgrel = 5
+ pkgrel = 6
url = https://github.com/AdaCore/gprbuild/
arch = i686
arch = x86_64
@@ -18,6 +18,7 @@ pkgbase = gprbuild
pkgname = libgpr
pkgdesc = Ada library to handle GPRbuild project files
depends = xmlada
+ conflicts = grpc
pkgname = gprbuild
depends = libgpr
diff --git a/PKGBUILD b/PKGBUILD
index d92e1db1eb7f..d9cbf887ee1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=gprbuild
pkgname=(libgpr gprbuild)
_upstream_ver=2020-20200429-19BD2
pkgver=2020
-pkgrel=5
+pkgrel=6
pkgdesc="Builder for multi-language systems"
arch=('i686' 'x86_64')
url="https://github.com/AdaCore/gprbuild/"
@@ -53,6 +53,9 @@ package_libgpr() {
pkgdesc="Ada library to handle GPRbuild project files"
depends=('xmlada')
+ # both provide /usr/lib/libgpr.so
+ conflicts=('grpc')
+
cd "$srcdir/$pkgbase-$_upstream_ver-src"
make prefix="$pkgdir/usr" libgpr.install