From 30687d42efa34326e6d657fdabc646211eae9d6a Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric.bail@samsung.com>
Date: Wed, 11 Dec 2013 13:56:08 +0900
Subject: pkgbuild: we do conflict with efl-git from AUR.

---
 pkgbuild/PKGBUILD.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgbuild')

diff --git a/pkgbuild/PKGBUILD.in b/pkgbuild/PKGBUILD.in
index d7c7a8b6b..f9123f9c8 100644
--- a/pkgbuild/PKGBUILD.in
+++ b/pkgbuild/PKGBUILD.in
@@ -19,9 +19,9 @@ depends=('bullet' 'libpng' 'libjpeg-turbo' 'gstreamer0.10'
 provides=("ecore=$pkgver" "eldbus=$pkgver" "edje=$pkgver"
           "eet=$pkgver" "eeze=$pkgver" "efreet=$pkgver"
           "eina=$pkgver" "eio=$pkgver" "embryo=$pkgver" "emotion=$pkgver"
-          "ephysics=$pkgver" "ethumb=$pkgver" "evas=$pkgver")
+          "ephysics=$pkgver" "ethumb=$pkgver" "evas=$pkgver" "efl-git")
 conflicts=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' 'emotion'
-           'ethumb' 'evas')
+           'ethumb' 'evas' 'efl-git')
 options=('!libtool' 'debug')
 install=efl.install
 
-- 
cgit v1.2.3