summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD1
2 files changed, 3 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e079eeb2128f..09d34530111c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,6 +19,8 @@ pkgbase = linuxcnc
depends = boost
depends = procps-ng
depends = psmisc
+ conflicts = linuxcnc-git
+ conflicts = linuxcnc-bin
source = linuxcnc-2.8.0.tar.gz::https://github.com/LinuxCNC/linuxcnc/archive/v2.8.0.tar.gz
source = libtirpc.patch
sha256sums = 27588f90df3f23c94e058b560f6d8f815f6a00b411f71ed8e25d40d1171b1afc
diff --git a/PKGBUILD b/PKGBUILD
index faf6bc9fc1a2..4404e05b2516 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,6 +22,7 @@ depends=('bc'
'procps-ng'
'psmisc')
makedepends=('intltool')
+conflicts=('linuxcnc-git' 'linuxcnc-bin')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LinuxCNC/linuxcnc/archive/v${pkgver}.tar.gz"
'libtirpc.patch')
sha256sums=('27588f90df3f23c94e058b560f6d8f815f6a00b411f71ed8e25d40d1171b1afc'