adjust conflicts()

2 files changed, 12 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8b4c237793ef..0ad887142f9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nautilus-ext-git-git
 	pkgdesc = Nautilus extension to add important information about the current git directory
 	pkgver = 1.3.r16.g5389549
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/bilelmoussaoui/nautilus-git
 	arch = i686
 	arch = x86_64
@@ -13,11 +13,10 @@ pkgbase = nautilus-ext-git-git
 	depends = gobject-introspection
 	depends = gtk3
 	depends = python-nautilus
-	provides = nautilus-ext-git=1.3
-	provides = nautilus-git=1.3
-	conflicts = nautilus-ext-git=1.3
-	conflicts = nautilus-git=1.3
+	provides = nautilus-ext-git
+	conflicts = nautilus-ext-git
 	conflicts = nautilus-folder-icons
+	conflicts = nautilus-compare
 	source = nautilus-ext-git::git+https://github.com/bilelmoussaoui/nautilus-git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 04abea09578a..d5becd0ea515 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,16 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=nautilus-ext-git-git
 pkgver=1.3.r16.g5389549
-pkgrel=4
+pkgrel=5
 pkgdesc="Nautilus extension to add important information about the current git directory"
 arch=('i686' 'x86_64')
 url="https://github.com/bilelmoussaoui/nautilus-git"
 license=('GPL3')
 depends=('git' 'gobject-introspection' 'gtk3' 'python-nautilus')
 makedepends=('gnome-common' 'meson' 'intltool')
-provides=("${pkgname%-git}=1.3" 'nautilus-git=1.3')
-conflicts=("${pkgname%-git}=1.3" 'nautilus-git=1.3' 'nautilus-folder-icons')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}"
+           'nautilus-folder-icons' 'nautilus-compare')
             # See https://github.com/bilelmoussaoui/nautilus-folder-icons/issues/34
 source=("${pkgname%-git}::git+https://github.com/bilelmoussaoui/nautilus-git")
 sha256sums=('SKIP')
@@ -23,16 +24,14 @@ prepare() {
 
 pkgver() {
 	cd "$srcdir/${pkgname%-git}"
-	printf "%s" "$(git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g')"
+	git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-	cd "$srcdir/${pkgname%-git}"
-	arch-meson builddir -Dfile_manager=nautilus
-	ninja -C builddir
+	arch-meson "${pkgname%-git}" build -Dfile_manager=nautilus
+	meson compile -C build
 }
 
 package() {
-	cd "$srcdir/${pkgname%-git}"
-	DESTDIR="$pkgdir" ninja -C builddir install
+	DESTDIR="$pkgdir" meson install -C build
 }