summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilien Devos2019-09-13 12:14:43 +0200
committerEmilien Devos2019-09-13 12:14:43 +0200
commit733c606b9fbd0c32cf83f3387be01f373f211347 (patch)
tree48db3b56bc6ec5775ff9ca0b548347bc19b85a3c
parent8d36556649c90e8a1d3830e470eed418353e4478 (diff)
downloadaur-733c606b9fbd0c32cf83f3387be01f373f211347.tar.gz
fix conflict
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dfffef4a7ff4..651c7a87ab9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -30,7 +30,7 @@ pkgbase = asbru-cm
optdepends = tigervnc: for VNC connections
optdepends = perl-x11-guitest: To fit perfectly RDP tabs
provides = asbru-cm
- conflicts = asbru-cm
+ conflicts = asbru-cm-git
source = git+https://github.com/asbru-cm/asbru-cm.git#tag=5.2.0
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index e4c436fd7f8d..560b77e86acd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,8 @@ depends=('perl-gnome2-gconf' 'glade-perl' 'openssh' 'perl-crypt-blowfish' 'perl-
optdepends=('uucp: Unix-to-Unix Copy' 'rdesktop: RDP connections' 'freerdp: RDP connections' 'openssh: SSH connections' 'mosh: Mobile shell' 'tigervnc: for VNC connections'
'perl-x11-guitest: To fit perfectly RDP tabs')
makedepends=('git')
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
+provides=("${pkgname}")
+conflicts=("${pkgname}-git")
source=("git+https://github.com/asbru-cm/asbru-cm.git#tag=${pkgver}")
sha256sums=('SKIP')