adjust conflicts()

2 files changed, 7 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 89dfcd9e0298..22b1977316f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nautilus-folder-icons
 	pkgdesc = Nautilus extension that makes changing folders icons easy!
 	pkgver = 3.0
-	pkgrel = 6
+	pkgrel = 7
 	url = https://github.com/bilelmoussaoui/nautilus-folder-icons
 	arch = i686
 	arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = nautilus-folder-icons
 	depends = gtk3
 	depends = python-nautilus
 	conflicts = nautilus-ext-git
+	conflicts = nautilus-compare
 	options = !emptydirs
 	source = nautilus-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 dab27596b1d3..9dc3961d06d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,14 @@
 # Contributor: ELmoussaoui Bilal <bil dot elmoussaoui at gmail.com>
 pkgname=nautilus-folder-icons
 pkgver=3.0
-pkgrel=6
+pkgrel=7
 pkgdesc='Nautilus 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' 'python-nautilus')
 makedepends=('gnome-common' 'meson')
-#checkdepends=('appstream')
-conflicts=('nautilus-ext-git')
+conflicts=('nautilus-ext-git' 'nautilus-compare')
             # See https://github.com/bilelmoussaoui/nautilus-folder-icons/issues/34
 options=('!emptydirs')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
@@ -22,17 +21,10 @@ prepare() {
 }
 
 build() {
-	cd "$pkgname-$pkgver"
-	arch-meson builddir -Dfile_manager=nautilus
-	ninja -C builddir
+	arch-meson build "$pkgname-$pkgver" -Dfile_manager=nautilus
+	meson compile -C build
 }
 
-#check() {
-#	cd "$pkgname-$pkgver"
-#	ninja test -C builddir
-#}
-
 package() {
-	cd "$pkgname-$pkgver"
-	DESTDIR="$pkgdir" ninja -C builddir install
+	DESTDIR="$pkgdir" meson install -C build
 }