summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Stryker2019-01-23 13:03:42 -0500
committerJason Stryker2019-01-23 13:03:42 -0500
commit0b6c19cf561e602f12ae9b51d767a95600808f1f (patch)
tree6d9658bcb6a2a1cfd21e3affc2d538159101fc98
parenta9cf287561d4e04202e88a9286c6c2f5a4bfb481 (diff)
downloadaur-0b6c19cf561e602f12ae9b51d767a95600808f1f.tar.gz
conflict with non-git package
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD6
2 files changed, 8 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0049050ef577..e8a254673f42 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = gallium-nine-git
pkgdesc = Gallium Nine Standalone
- pkgver = 0.r121.136dca6
- pkgrel = 3
+ pkgver = 0.r137.13e9b40
+ pkgrel = 1
url = https://github.com/dhewg/nine
arch = x86_64
license = LGPL2
@@ -15,9 +15,11 @@ pkgbase = gallium-nine-git
pkgname = gallium-nine-git
depends = mesa
provides = gallium-nine
+ conflicts = gallium-nine
pkgname = lib32-gallium-nine-git
depends = gallium-nine
depends = lib32-mesa
provides = lib32-gallium-nine
+ conflicts = lib32-gallium-nine
diff --git a/PKGBUILD b/PKGBUILD
index bb86417d60d6..a185f99b5e07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
pkgbase=gallium-nine-git
pkgname=('gallium-nine-git' 'lib32-gallium-nine-git')
-pkgver=0.r121.136dca6
-pkgrel=3
+pkgver=0.r137.13e9b40
+pkgrel=1
pkgdesc="Gallium Nine Standalone"
arch=('x86_64')
url="https://github.com/dhewg/nine"
@@ -63,6 +63,7 @@ _package_gallium-nine-git() {
package_gallium-nine-git() {
provides=("gallium-nine")
+ conflicts=("gallium-nine")
depends=('mesa')
_package_gallium-nine-git 64
@@ -74,6 +75,7 @@ package_gallium-nine-git() {
package_lib32-gallium-nine-git() {
provides=("lib32-gallium-nine")
+ conflicts=("lib32-gallium-nine")
depends=('gallium-nine' 'lib32-mesa')
_package_gallium-nine-git 32