summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Treinish2016-04-21 13:08:31 -0400
committerMatthew Treinish2016-04-21 13:08:31 -0400
commit9f4634c5ab4f1ba74d2316098c9e4d1a3763f155 (patch)
treea0d2f39a50c8e274820e3a38fa2089c0726877a4
parent5b1d2bc520cddf81703bf1331909d5cb21fa9696 (diff)
downloadaur-9f4634c5ab4f1ba74d2316098c9e4d1a3763f155.tar.gz
Add conflict for git package
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bc2dc7504c55..5f8bc26eaba6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = python2-gertty
pkgdesc = console-based interface to the Gerrit Code Review system
pkgver = 1.3.2
- pkgrel = 1
+ pkgrel = 2
url = https://pypi.python.org/pypi/gertty
arch = any
license = Apache2
@@ -19,6 +19,7 @@ pkgbase = python2-gertty
depends = python2-voluptuous
depends = python2-pbr
depends = python2-six
+ conflicts = python2-gertty-git
source = https://pypi.python.org/packages/source/g/gertty/gertty-1.3.2.tar.gz
md5sums = 5f4a49840d63d445834b8ba9598ce9cd
diff --git a/PKGBUILD b/PKGBUILD
index 2cb2244efefa..8239cc58eba2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=python2-gertty
pkgver=1.3.2
-pkgrel=1
+pkgrel=2
pkgdesc="console-based interface to the Gerrit Code Review system"
arch=('any')
url='https://pypi.python.org/pypi/gertty'
@@ -9,6 +9,7 @@ source=("https://pypi.python.org/packages/source/g/gertty/gertty-$pkgver.tar.gz"
md5sums=('5f4a49840d63d445834b8ba9598ce9cd')
makedepends=('python2' 'python2-setuptools')
depends=('python2-git' 'python2-sqlalchemy' 'python2-urwid' 'python2-dateutil' 'python2-requests' 'python2-ordereddict' 'python2-alembic' 'python2-yaml' 'python2-ply' 'python2-voluptuous' 'python2-pbr' 'python2-six')
+conflicts=('python2-gertty-git')
package() {
cd $srcdir/gertty-$pkgver