summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdenQwQ2022-02-02 12:08:20 +0800
committerEdenQwQ2022-02-02 12:08:20 +0800
commit4609e3ec771595c0519831cb0b0dee81b6bbe99c (patch)
treeff194155fe1a60398fc5104e0f31049db7df848f
parent1cad4301bb91e7cd78cb3b1da64eb7e952ce2d07 (diff)
downloadaur-4609e3ec771595c0519831cb0b0dee81b6bbe99c.tar.gz
another conflict
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f95a67804774..4ebd23a5211e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,6 +20,7 @@ pkgbase = clipcc-beta-bin
depends = snappy
optdepends = xdg-utils: open URLs with desktop's default (xdg-email, xdg-open)
conflicts = clipcc-bin
+ conflicts = clipcc
noextract = clipcc-3.1.0-beta4-win-x64.exe
source = https://github.com/Clipteam/clipcc-desktop/releases/download/3.1.0-beta4/clipcc-3.1.0-beta4-win-x64.exe
source = LICENSE
diff --git a/PKGBUILD b/PKGBUILD
index 935b72b7465c..b65c2fbe4a7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ _pkgname=clipcc
pkgver=3.1.0_beta4
pkgrel=2
pkgdesc="This is ClipCC's beta release. Please note that beta release is unstable and some new features may not work as expected."
-conflicts=("clipcc-bin")
+conflicts=("clipcc-bin" "clipcc")
arch=("x86_64")
url="https://github.com/Clipteam"
license=("AGPL3")