summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoulHarsh0072024-03-18 10:09:28 +0530
committerSoulHarsh0072024-03-18 10:09:28 +0530
commit8965efb35935c49234b7f9ace377ebd22b709d0e (patch)
tree560002a2b688bc5fc30dc0ef70c3827567ca6c0a
parent06642204624c43f81203dbc1a92396f60d1b4bd7 (diff)
downloadaur-8965efb35935c49234b7f9ace377ebd22b709d0e.tar.gz
fix: add telegram-desktop to conflicts array
Signed-off-by: SoulHarsh007 <harsh.peshwani@outlook.com>
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f9e8c3e466fd..fe4f4b1e4850 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = forkgram
pkgdesc = Fork of Telegram Desktop messaging app.
pkgver = 4.15.5
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/Forkgram/tdesktop
arch = x86_64
arch = x86_64_v3
@@ -53,6 +53,7 @@ pkgbase = forkgram
optdepends = xdg-desktop-portal: desktop integration
provides = forkgram-bin
conflicts = forkgram-bin
+ conflicts = telegram-desktop
options = !debug
source = https://github.com/Forkgram/tdesktop/releases/download/v4.15.5/frk-v4.15.5-full.tar.gz
source = forkgram.desktop
diff --git a/PKGBUILD b/PKGBUILD
index cfae2ae6e7d7..499d28faf43c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=forkgram
_pkgname=frk
pkgver=4.15.5
-pkgrel=1
+pkgrel=2
pkgdesc='Fork of Telegram Desktop messaging app.'
arch=('x86_64' 'x86_64_v3')
url="https://github.com/Forkgram/tdesktop"
@@ -20,7 +20,7 @@ makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-
optdepends=('webkit2gtk: embedded browser features'
'xdg-desktop-portal: desktop integration')
provides=(forkgram-bin)
-conflicts=(forkgram-bin)
+conflicts=(forkgram-bin telegram-desktop)
options=(!debug)
source=("https://github.com/Forkgram/tdesktop/releases/download/v${pkgver}/${_pkgname}-v${pkgver}-full.tar.gz"
"${pkgname}.desktop")