summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeakster2020-11-08 11:12:06 +0000
committerFeakster2020-11-08 11:12:06 +0000
commitc3ec9187b2f06177dd8c5f93efcaa8628486263d (patch)
treeff468ebad7b76f551dafe178b9c24cfc774e5174
parentd17100b8b94a4149453cbc89cb03552860974acb (diff)
downloadaur-c3ec9187b2f06177dd8c5f93efcaa8628486263d.tar.gz
Package conflict fixes
- Modified 'provides' & 'conflicts'.
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 2 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f1f9cc50ae48..f08b1877babe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,8 +21,7 @@ pkgbase = vivaldi-arm-bin
optdepends = pepper-flash: flash support
optdepends = libnotify: native notifications
provides = www-browser
- provides = vivaldi-stable
- conflicts = vivaldi
+ provides = vivaldi
replaces = vivaldi-rpi
replaces = vivaldi-arm64
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index f56b81cb0dd5..f82c9b346ddc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,7 @@ pkgdesc='An advanced browser made with the power user in mind.'
arch=('armv6h' 'armv7h' 'aarch64')
url="https://vivaldi.com"
license=('custom')
-provides=('www-browser' 'vivaldi-stable')
-conflicts=('vivaldi')
+provides=('www-browser' 'vivaldi')
replaces=('vivaldi-rpi' 'vivaldi-arm64')
depends=('gtk3' 'libcups' 'nss' 'alsa-lib' 'libxss' 'ttf-font' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme')
optdepends=(