conflict with git version

2 files changed, 4 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86e749f1ef87..731ec980bcca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,9 +15,11 @@ pkgbase = gallium-nine
 pkgname = gallium-nine
 	depends = mesa
 	provides = gallium-nine
+	conflicts = gallium-nine-git
 
 pkgname = lib32-gallium-nine
 	depends = gallium-nine
 	depends = lib32-mesa
 	provides = lib32-gallium-nine
+	conflicts = lib32-gallium-nine-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 243ad5c5c1d1..fff7abe2ad9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -57,6 +57,7 @@ _package_gallium-nine() {
 
 package_gallium-nine() {
     provides=("gallium-nine")
+    conflicts=("gallium-nine-git")
     depends=('mesa')
 
     _package_gallium-nine 64
@@ -68,6 +69,7 @@ package_gallium-nine() {
 
 package_lib32-gallium-nine() {
     provides=("lib32-gallium-nine")
+    conflicts=("lib32-gallium-nine-git")
     depends=('gallium-nine' 'lib32-mesa')
 
     _package_gallium-nine 32