Add conflict python-pwntool and git makedepends

2 files changed, 4 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e90826cd916e..df43896ad096 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,6 +6,7 @@ pkgbase = python-pwntools-git
 	arch = any
 	license = GPL
 	makedepends = make
+	makedepends = git
 	depends = python
 	depends = python-intervaltree
 	depends = python-pyelftools
@@ -28,6 +29,7 @@ pkgbase = python-pwntools-git
 	depends = python-colored-traceback
 	optdepends = gdb: binary debugging
 	provides = python-pwntools
+	conflicts = python-pwntools
 	source = python-pwntools-git::git+https://github.com/Gallopsled/pwntools.git#branch=dev
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index b711c85f51dd..12dd82c92b2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,8 @@ pkgdesc='A CTF framework and exploit development library. (git branch dev)'
 url='https://github.com/Gallopsled/pwntools'
 arch=('any')
 license=('GPL')
-makedepends=('make')
+makedepends=('make' 'git')
+conflicts=('python-pwntools')
 depends=('python' 'python-intervaltree' 'python-pyelftools' 'python-tox' 'python-mako'
          'python-unicorn-git' 'python-psutil' 'python-dateutil' 'python-pysocks' 'python-pygments'
          'python-pip' 'python-pyserial' 'python-paramiko' 'ropgadget' 'python-capstone'