summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Bezies2019-09-07 13:48:51 +0200
committerFrederic Bezies2019-09-07 13:48:51 +0200
commitd53d2534dd8c9b9f3a12fb53832c2a1fe84660aa (patch)
tree1838ac84c3199004c37350d68194813ec9bd4a41
parente3d08688f5832a8d53109ac4558405f35c8f81d3 (diff)
downloadaur-d53d2534dd8c9b9f3a12fb53832c2a1fe84660aa.tar.gz
Forgot to set a conflict with firefox-beta-bin
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 944fc3190f7..6fa3fa234c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -43,6 +43,7 @@ pkgbase = firefox-beta
optdepends = pulseaudio: Audio support
optdepends = speech-dispatcher: Text-to-Speech
optdepends = hunspell-en_US: Spell checking, American English
+ conflicts = firefox-beta-bin
options = !emptydirs
options = !makeflags
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index a234144f8b2..d1623ea5454 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,7 +24,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
'pulseaudio: Audio support'
'speech-dispatcher: Text-to-Speech'
'hunspell-en_US: Spell checking, American English')
-conflits=('firefox-beta-bin')
+conflicts=('firefox-beta-bin')
options=(!emptydirs !makeflags !strip)
source=("http://ftp.mozilla.org/pub/firefox/releases/70.0b4/source/$_pkgname-$pkgver.source.tar.xz"
"$_pkgname.sh"