summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Stahlberg2018-08-28 16:24:03 +0200
committerMaximilian Stahlberg2018-08-28 16:24:03 +0200
commitf6d6fc4dd28e9e15895a89b68357c837cc19568d (patch)
treeb24496f92d805c7aca38bbdb8d5853dcea29404f
parentc4f91e3655d6bc5e0ba138b7f9a8f6ded6d7ef83 (diff)
downloadaur-f6d6fc4dd28e9e15895a89b68357c837cc19568d.tar.gz
Add the git variants as conflicting packages.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
2 files changed, 7 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e57acf92845..6b29b6a827d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Aug 26 12:15:27 UTC 2018
+# Tue Aug 28 14:23:32 UTC 2018
pkgbase = python-picos
pkgdesc = A Python interface to conic optimization solvers.
pkgver = 1.1.2
- pkgrel = 5
+ pkgrel = 6
url = https://gitlab.com/picos-api/picos
arch = any
license = GPL3
@@ -16,9 +16,11 @@ pkgname = python-picos
depends = python-six
depends = python-numpy
depends = python-cvxopt
+ conflicts = python-picos-git
pkgname = python2-picos
depends = python2-six
depends = python2-numpy
depends = python2-cvxopt
+ conflicts = python2-picos-git
diff --git a/PKGBUILD b/PKGBUILD
index 71a208d8b19..85277a40012 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=('python-picos')
pkgname=('python-picos' 'python2-picos')
pkgver=1.1.2
-pkgrel=5
+pkgrel=6
pkgdesc='A Python interface to conic optimization solvers.'
arch=('any')
url='https://gitlab.com/picos-api/picos'
@@ -13,6 +13,7 @@ source=("https://gitlab.com/picos-api/picos/-/archive/v${pkgver}/picos-v${pkgver
package_python-picos() {
depends=('python-six' 'python-numpy' 'python-cvxopt')
+ conflicts=('python-picos-git')
cd "${srcdir}/picos-v${pkgver}"
@@ -21,6 +22,7 @@ package_python-picos() {
package_python2-picos() {
depends=('python2-six' 'python2-numpy' 'python2-cvxopt')
+ conflicts=('python2-picos-git')
cd "${srcdir}/picos-v${pkgver}"