Add conflicts option

2 files changed, 7 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e92aa0cc3a3..be28bf625470 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gcad3d-bin
 	pkgdesc = Parametric 3D CAD with viewer, import, export, NC
 	pkgver = 2.60.04
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.gcad3d.org
 	arch = x86_64
 	license = GPL-3.0-or-later
@@ -18,6 +18,8 @@ pkgbase = gcad3d-bin
 	depends = libglvnd
 	depends = pango
 	optdepends = xorg-xwayland: run under Wayland
+	conflicts = gcad3d-git
+	conflicts = gcad3d
 	options = !debug
 	source = https://www.gcad3d.org/download/gCAD3D-2.60.04-bin-amd64.deb
 	b2sums = 502f8501faf4464fa303a03cba90f07c6cb1f4ae4e56e8cdae0cc5b05f6b6aa6b869864942e1b6fb86302438af6fd0f64e9c7a7f1f96ede2ba393ffc2d21f89b
diff --git a/PKGBUILD b/PKGBUILD
index 34e802b61395..42f0849fbc99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,18 @@
 
 pkgname=gcad3d-bin
 pkgver=2.60.04
-pkgrel=1
+pkgrel=2
 pkgdesc="Parametric 3D CAD with viewer, import, export, NC"
 arch=(x86_64)
 url="https://www.gcad3d.org"
 license=(GPL-3.0-or-later)
 depends=(at-spi2-core cairo fontconfig freetype2 gdk-pixbuf2 glib2 glu gtk2 gtkglarea harfbuzz libglvnd pango)
 optdepends=('xorg-xwayland: run under Wayland')
-#conflicts=(${pkgname%-bin}-git ${pkgname%-bin})
+conflicts=(${pkgname%-bin}-git ${pkgname%-bin})
 options=(!debug)
-source=(${url}/download/gCAD3D-${pkgver}-bin-amd64.deb)
+source=($url/download/gCAD3D-$pkgver-bin-amd64.deb)
 b2sums=('502f8501faf4464fa303a03cba90f07c6cb1f4ae4e56e8cdae0cc5b05f6b6aa6b869864942e1b6fb86302438af6fd0f64e9c7a7f1f96ede2ba393ffc2d21f89b')
 
 package() {
-  bsdtar -xf ${srcdir}/data.tar.xz -C ${pkgdir}
+    bsdtar -xf $srcdir/data.tar.xz -C $pkgdir
 }