Add conflicts with coin-or-{clp,osi,coinutils}

2 files changed, 6 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ecd729a2a649..b524a581b26f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ogdf-snapshot
 	pkgdesc = OGDF is a self-contained C++ class library for the automatic layout of diagrams. OGDF offers sophisticated algorithms and data structures to use within your own applications or scientific projects.
 	pkgver = 2017_02_16
-	pkgrel = 1
+	pkgrel = 2
 	url = http://amber-v7.cs.tu-dortmund.de/doku.php/start
 	arch = i686
 	arch = x86_64
@@ -11,6 +11,9 @@ pkgbase = ogdf-snapshot
 	makedepends = graphviz
 	makedepends = bash
 	conflicts = ogdf
+	conflicts = coin-or-clp
+	conflicts = coin-or-osi
+	conflicts = coin-or-coinutils
 	source = ogdf-snapshot-2017-02-16.zip::http://amber-v7.cs.tu-dortmund.de/lib/exe/fetch.php/tech:ogdf-snapshot-2017-02-16.zip
 	sha256sums = 5c76b842dfab8e41c4cb6ab829f4c28d9ea2be9bb68a70c94e51e4867b1ca655
 
diff --git a/PKGBUILD b/PKGBUILD
index b4a267acbdd5..734719ac7fee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,13 @@
 
 pkgname=('ogdf-snapshot' 'ogdf-snapshot-docs')
 pkgver=2017_02_16
-pkgrel=1
+pkgrel=2
 pkgdesc="OGDF is a self-contained C++ class library for the automatic layout of diagrams. OGDF offers sophisticated algorithms and data structures to use within your own applications or scientific projects."
 arch=('i686' 'x86_64')
 url="http://amber-v7.cs.tu-dortmund.de/doku.php/start"
 license=('GPL')
 makedepends=('cmake' 'doxygen' 'graphviz' 'bash')
-conflicts=('ogdf')
+conflicts=('ogdf' 'coin-or-clp' 'coin-or-osi' 'coin-or-coinutils')
 source=("$pkgname-${pkgver//_/-}.zip::http://amber-v7.cs.tu-dortmund.de/lib/exe/fetch.php/tech:$pkgname-${pkgver//_/-}.zip")
 sha256sums=("5c76b842dfab8e41c4cb6ab829f4c28d9ea2be9bb68a70c94e51e4867b1ca655")