summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfab2016-04-25 13:58:50 +0200
committerfab2016-04-25 13:58:50 +0200
commit4e1252aa90c4275098adbd04060720777233d546 (patch)
tree24991bef7ce1b47dbbb3eaa4cfe3a305a7f0c7be
parent932bc87607516b2328c08a2535d7c9b7794be28d (diff)
downloadaur-4e1252aa90c4275098adbd04060720777233d546.tar.gz
add conflicting package
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9d343fdd4ed..393d143f4d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
pkgbase = blender-plugin-retopoflow
pkgdesc = A suite of retopology tools for Blender
pkgver = 1.2.0
- pkgrel = 1
+ pkgrel = 2
url = https://cgcookiemarkets.com/all-products/retopoflow/
arch = any
license = GPL
makedepends = git
depends = blender
+ conflicts = blender-plugin-retopoflow-git
pkgname = blender-plugin-retopoflow
diff --git a/PKGBUILD b/PKGBUILD
index 4ae65f20044..c00aed95a4e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
# Maintainer: Fabien Devaux <fdev31@gmail.com>
pkgname=blender-plugin-retopoflow
pkgver=1.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="A suite of retopology tools for Blender"
arch=('any')
url="https://cgcookiemarkets.com/all-products/retopoflow/"
@@ -18,7 +18,7 @@ groups=()
depends=('blender')
makedepends=('git')
provides=()
-conflicts=()
+conflicts=("blender-plugin-retopoflow-git")
replaces=()
backup=()
options=()
@@ -45,7 +45,7 @@ build() {
msg "Starting build..."
rm -rf "$srcdir/$_gitname-build"
- git clone -b v1.2.0 "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+ git clone -b "v$pkgver" "$srcdir/$_gitname" "$srcdir/$_gitname-build"
}
package() {