summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWojciech Ochmański2015-10-16 22:08:21 +0200
committerWojciech Ochmański2015-10-16 22:08:21 +0200
commitd8d1156d628c6b3f81af634c4ad58ff9bb2d2e93 (patch)
treed2d5708bc8d8bd98d1650b9792c4afe175363118
parent490aace49a1480e788c7c0ae9c68fc043d7e86da (diff)
downloadaur-d8d1156d628c6b3f81af634c4ad58ff9bb2d2e93.tar.gz
chromium package provides own version of chromium - set it as conflicting
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 45cccede9b89..03c844ef551b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = chromedriver
pkgdesc = Standalone server which implements WebDriver's wire protocol
pkgver = 2.20
- pkgrel = 4
+ pkgrel = 2
url = https://sites.google.com/a/chromium.org/chromedriver/
arch = i686
arch = x86_64
@@ -9,7 +9,7 @@ pkgbase = chromedriver
depends = libpng
depends = gconf
optdepends = google-chrome
- optdepends = chromium
+ conflicts = chromium
source = chromedriver_2.20_.zip::http://chromedriver.storage.googleapis.com/2.20/chromedriver_.zip
pkgname = chromedriver
diff --git a/PKGBUILD b/PKGBUILD
index 68dde899ea3a..3fa13e271fd2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,14 @@
pkgname=chromedriver
pkgver=2.20
-pkgrel=4
+pkgrel=2
pkgdesc="Standalone server which implements WebDriver's wire protocol"
arch=('i686' 'x86_64')
url="https://sites.google.com/a/chromium.org/chromedriver/"
license=('Apache')
+conflicts=('chromium')
depends=('libpng' 'gconf')
-optdepends=('google-chrome' 'chromium')
+optdepends=('google-chrome')
if [ "$CARCH" = "i686" ]; then
_arch='linux32'