summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWojciech Ochmański2015-09-24 15:25:04 +0200
committerWojciech Ochmański2015-09-24 15:25:04 +0200
commit5f5c0a91490581e21ffa42c85fd9d3a680a8718e (patch)
treed04729d79665f8d681d8d2773db97b7b244d9785
parent1ae13502e57fd498ba14048bed044bf3e8670d8b (diff)
downloadaur-5f5c0a91490581e21ffa42c85fd9d3a680a8718e.tar.gz
Chromium doesn't conflict anymore with Chromedriver, add it to optdepends
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
2 files changed, 4 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7d04c6aa4e27..b72345e76c53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = chromedriver
pkgdesc = Standalone server which implements WebDriver's wire protocol
pkgver = 2.19
- pkgrel = 1
+ 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
- conflicts = chromium
+ optdepends = chromium
source = http://chromedriver.storage.googleapis.com/2.19/chromedriver_.zip
pkgname = chromedriver
diff --git a/PKGBUILD b/PKGBUILD
index 884074d5bc46..41aaf991b04e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,13 @@
pkgname=chromedriver
pkgver=2.19
-pkgrel=1
+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')
depends=('libpng' 'gconf')
-optdepends=('google-chrome')
-conflicts=('chromium')
+optdepends=('google-chrome' 'chromium')
if [ "$CARCH" = "i686" ]; then
_arch='linux32'