summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael Scholer2015-09-27 04:48:38 +0200
committerRaphael Scholer2015-09-27 04:48:38 +0200
commit8e542f06bd9fa204505e397b4091d426d98f0691 (patch)
tree719889c04fd3f880305187cfc9761f6042808c4e
parentafe537e80af65842f623b3d4134f61432a8e5ce8 (diff)
downloadaur-8e542f06bd9fa204505e397b4091d426d98f0691.tar.gz
Add conflict with python-pep8-naming-git
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 18b6e6655fa0..7668ada4db59 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
pkgbase = python-pep8-naming
pkgdesc = This module provides a name plugin for flake8, the Python code checker.
pkgver = 0.3.3
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/flintwork/pep8-naming
arch = any
license = MIT
makedepends = python-setuptools
depends = python
+ conflicts = python-pep8-naming
source = python-pep8-naming-0.3.3.tar.gz::https://github.com/flintwork/pep8-naming/archive/0.3.3.tar.gz
md5sums = 5f2fdf9aed3e417f5289f0deb1c1bbef
diff --git a/PKGBUILD b/PKGBUILD
index ec40ec53ae17..82555185a42f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,11 @@
_pkgname=pep8-naming
pkgname="python-${_pkgname}"
pkgver=0.3.3
-pkgrel=1
+pkgrel=2
pkgdesc="This module provides a name plugin for flake8, the Python code checker."
arch=('any')
url="https://github.com/flintwork/${_pkgname}"
+conflicts=("${pkgname}")
license=('MIT')
depends=('python')
makedepends=('python-setuptools')