summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Li2018-02-04 21:50:12 -0500
committerJoshua Li2018-02-04 21:50:12 -0500
commitf0fe1f219d820353a3e64a3cf66736525535687b (patch)
treedd11349a0ce56a7da889f4b52ff3b397fb77d1c3
parent6115332b32bc83b9c44a3633739b939e5710fcfd (diff)
downloadaur-f0fe1f219d820353a3e64a3cf66736525535687b.tar.gz
add conflict with currently outdated standardnotes-desktop
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD5
2 files changed, 5 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 31cae7779238..ae94ad63648a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,6 +6,7 @@ pkgbase = sn-bin
arch = x86_64
license = GPL3
provides = standard-notes
+ conflicts = standardnotes-desktop
noextract = standard-notes-2.0.42-x86_64.AppImage
options = !strip
source_x86_64 = https://github.com/standardnotes/desktop/releases/download/v2.0.42/standard-notes-2.0.42-x86_64.AppImage
diff --git a/PKGBUILD b/PKGBUILD
index 82b07ac5cc79..79fda12772fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,6 +10,9 @@ url="https://github.com/standardnotes/desktop"
license=('GPL3')
provides=('standard-notes')
+# This conflicting package is currently marked out-of-date.
+conflicts=('standardnotes-desktop')
+
source_x86_64=("https://github.com/standardnotes/desktop/releases/download/v${pkgver}/standard-notes-${pkgver}-x86_64.AppImage"
"standard-notes.desktop"
"https://github.com/standardnotes/desktop/raw/master/app/icon/Icon-512x512.png")
@@ -21,7 +24,7 @@ sha256sums_x86_64=('55aa58ebd78a4186d190895042009047c6b346626df185ddb478b54a2098
# An AppImage is a binary format, not an archive, so do not attempt to extract it.
noextract=("standard-notes-${pkgver}-x86_64.AppImage")
-# stripping an AppImage binary will pretty much destroy it, so tell makepkg not to do so
+# Stripping an AppImage binary will pretty much destroy it, so tell makepkg not to do so.
options=(!strip)
package () {