summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Malik2021-07-29 10:25:23 +0200
committerKonrad Malik2021-07-29 10:25:23 +0200
commitac1d752bcfaa22ef0e4e5a1439a882a76e2f64c7 (patch)
tree81654ba9ef6cae9ecc51aadb8399c6b1c95c5f45
parent2ed747770f2cd7bf88c3d2ccd2f818ad12b69ff8 (diff)
downloadaur-ac1d752bcfaa22ef0e4e5a1439a882a76e2f64c7.tar.gz
add evernote conflict fix
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0bfda9ff41e7..3aaff2ab2347 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = evernote-beta-bin
pkgdesc = Official Evernote client for Linux (beta, early-access)
pkgver = 10.17.8
- pkgrel = 1
+ pkgrel = 2
url = https://evernote.com/earlyaccess
install = evernote-beta-bin.install
arch = x86_64
@@ -14,6 +14,7 @@ pkgbase = evernote-beta-bin
optdepends = gnome-keyring: for credentials persistence after reboot
provides = evernote
conflicts = evernote-for-linux-bin
+ conflicts = evernote-bin
noextract = Evernote-Beta-10.17.8-linux-ddl-beta-2809.deb
source = https://cdn1.evernote.com/boron/linux/builds/Evernote-Beta-10.17.8-linux-ddl-beta-2809.deb
sha256sums = 32316391424097f84ba28adaacec8339005329c9583a86648d1ea8b35e3c5a15
diff --git a/PKGBUILD b/PKGBUILD
index 2c59b2a383eb..51c60c296fc8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ depends=(
'libnotify' 'libappindicator-gtk3' 'libxtst' 'nss' 'attr'
)
optdepends=('gnome-keyring: for credentials persistence after reboot')
-conflicts=('evernote-for-linux-bin', 'evernote-bin')
+conflicts=('evernote-for-linux-bin' 'evernote-bin')
replaces=()
install=$pkgname.install
source=(