updated conflicts

2 files changed, 5 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6eb504cdceb8..2c87c665f04a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nemo-folder-icons
 	pkgdesc = Nemo extension that makes changing folders icons easy!
 	pkgver = 3.0
-	pkgrel = 5
+	pkgrel = 6
 	url = https://github.com/bilelmoussaoui/nautilus-folder-icons
 	arch = i686
 	arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = nemo-folder-icons
 	depends = gobject-introspection
 	depends = gtk3
 	depends = nemo-python
+	conflicts = nemo-ext-git
 	options = !emptydirs
 	source = nemo-folder-icons-3.0.tar.gz::https://github.com/bilelmoussaoui/nautilus-folder-icons/archive/3.0.tar.gz
 	sha256sums = 25fa6f164f50ed84ee6fa6d7a6004cb5190051847a5c3895f41bf1b426ad2565
diff --git a/PKGBUILD b/PKGBUILD
index 073d877dd520..3a1f9ffe2530 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,15 @@
 pkgname=nemo-folder-icons
 _gitname=nautilus-folder-icons
 pkgver=3.0
-pkgrel=5
+pkgrel=6
 pkgdesc='Nemo extension that makes changing folders icons easy!'
 arch=('i686' 'x86_64')
 license=('GPL3')
 url="https://github.com/bilelmoussaoui/nautilus-folder-icons"
 depends=('gobject-introspection' 'gtk3' 'nemo-python')
 makedepends=('gnome-common' 'meson' 'appstream-glib')
+conflicts=('nemo-ext-git')
+            # See https://github.com/bilelmoussaoui/nautilus-folder-icons/issues/34
 options=('!emptydirs')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
 sha256sums=('25fa6f164f50ed84ee6fa6d7a6004cb5190051847a5c3895f41bf1b426ad2565')