summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorcrystaly2016-07-24 21:26:09 +0200
committercrystaly2016-07-24 21:26:09 +0200
commitad299e4f38f2e861b85b0fcb00542297547f9aef (patch)
treeb3740b234c011ff9f88e4176678590e82674a77d
parent80fc98e3fa6db7108c119745c448fb629ca61554 (diff)
downloadaur-ad299e4f38f2e861b85b0fcb00542297547f9aef.tar.gz
Add confict to pyspotify since they share files
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2367460d1e5..107c91705c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sun Jul 24 19:13:53 UTC 2016
+# Sun Jul 24 19:25:43 UTC 2016
pkgbase = spotify-connect-web
pkgdesc = Simple Web client for accessing Spotify connect api (Raspberry Pi 2)
pkgver = 0.0.3.alpha.r6.g565767b
@@ -19,6 +19,7 @@ pkgbase = spotify-connect-web
depends = python2
provides = spotify-connect-web
conflicts = spotify-connect-web
+ conflicts = python2-pyspotify-connect
source = git+https://github.com/Fornoth/spotify-connect-web#branch=master
source = https://github.com/sashahilton00/spotify-connect-resources/raw/master/armhf%20version/libspotify_embedded_shared.so
source = spotify-connect-web@.service
diff --git a/PKGBUILD b/PKGBUILD
index 7e3b8313ac0..35a6dac2529 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ groups=()
depends=('python2-flask' 'python2-flask-bootstrap' 'python2-flask-cors' 'python2-pyalsaaudio' 'python2-gevent' 'python2-cffi' 'python2-pycparser' 'python2')
makedepends=('git')
provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
+conflicts=("${pkgname%-git}" 'python2-pyspotify-connect')
replaces=()
backup=()
options=()