ciel: ajoute le conflict de ciel-git

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b3929c4a121..522e349c3e7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ciel
 	pkgdesc = A tool for controlling multi-layer file systems and containers.
 	pkgver = 3.0.0rc4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/AOSC-Dev/ciel-rs
 	arch = i686
 	arch = x86_64
@@ -14,6 +14,7 @@ pkgbase = ciel
 	depends = openssl
 	optdepends = libgit2: git vcs support
 	optdepends = xz: xzip archive support
+	conflicts = ciel-git
 	source = ciel-3.0.0rc4.tar.gz::https://github.com/AOSC-Dev/ciel-rs/archive/v3.0.0-rc4.tar.gz
 	sha256sums = acd7843d051affb265b9bec5a8b3d10fc4271ea3c2d0d683d52896a88b5e2e9c
 
diff --git a/PKGBUILD b/PKGBUILD
index 2e4503c7705f..36663990b2bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=ciel
 _pkgname=${pkgname}-rs
 _pkgver=3.0.0-rc4
 pkgver=${_pkgver/-/}
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for controlling multi-layer file systems and containers."
 arch=('i686' 'x86_64')
 url="https://github.com/AOSC-Dev/ciel-rs"
@@ -14,6 +14,7 @@ optdepends=('libgit2: git vcs support'
             'xz: xzip archive support')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/AOSC-Dev/${_pkgname}/archive/v${_pkgver}.tar.gz")
 sha256sums=('acd7843d051affb265b9bec5a8b3d10fc4271ea3c2d0d683d52896a88b5e2e9c')
+conflicts=('ciel-git')
 
 build() {
     cd ${_pkgname}-${_pkgver}