summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBilal Elmoussaoui2016-07-31 15:00:48 +0200
committerBilal Elmoussaoui2016-07-31 15:00:48 +0200
commit6e844fe5a459a1ea2399678d8a0d6a64b52052ef (patch)
treef3109fe2b9c56127dac57d581e23598fc4147810
parent4d8660f9a24c0b3631d973061d0ba272324e238d (diff)
downloadaur-6e844fe5a459a1ea2399678d8a0d6a64b52052ef.tar.gz
update conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5d36dfb1b396..3be370be9e39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,6 +20,8 @@ pkgbase = gradio-git
depends = libgee
depends = libsoup
provides = gradio=2.3
+ conflicts = gradio
+ conflicts = gradio-bin
options = !emptydirs
source = git://github.com/haecker-felix/gradio.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 9628bd2310a3..4b711bedf1df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ options=('!emptydirs')
install=gradio.install
source=("git://github.com/haecker-felix/${_gitname}.git")
md5sums=('SKIP')
-conflicts=('')
+conflicts=('gradio' 'gradio-bin')
provides=("gradio=$pkgver")
build() {
@@ -29,4 +29,4 @@ build() {
package() {
cd "$srcdir/${_gitname}/build"
make DESTDIR="${pkgdir}" install
-} \ No newline at end of file
+}