add git to makedepends, reaver-wps-fork-t6x to replaces/conflicts

2 files changed, 15 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fbf9c6ad508f..2f785970dc79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = reaver-wps-fork-t6x-git
 	pkgdesc = Brute force attack against Wifi Protected Setup mod with Pixie Dust Attack
 	pkgver = 1.5.2.r4.g941d383
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/t6x/reaver-wps-fork-t6x
 	arch = i686
 	arch = x86_64
 	arch = armv6h
 	license = GPL2
+	makedepends = git
 	depends = libpcap
 	depends = sqlite3
 	depends = pixiewps
@@ -14,9 +15,11 @@ pkgbase = reaver-wps-fork-t6x-git
 	conflicts = reaver
 	conflicts = reaver-svn
 	conflicts = reaver-git
+	conflicts = reaver-wps-fork-t6x
 	replaces = reaver
 	replaces = reaver-svn
 	replaces = reaver-git
+	replaces = reaver-wps-fork-t6x
 	backup = etc/reaver/reaver.db
 	source = reaver-wps-fork-t6x-git::git+https://github.com/t6x/reaver-wps-fork-t6x.git
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 7c7bcd2d4113..d823f4186d83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,18 @@
 pkgname=reaver-wps-fork-t6x-git
 _pkgname=reaver-wps-fork-t6x
 pkgver=1.5.2.r4.g941d383
-pkgrel=1
+pkgrel=2
 pkgdesc="Brute force attack against Wifi Protected Setup mod with Pixie Dust Attack"
 arch=('i686' 'x86_64' 'armv6h')
 url="https://github.com/t6x/reaver-wps-fork-t6x"
 license=('GPL2')
 depends=('libpcap' 'sqlite3' 'pixiewps')
+makedepends=('git')
 backup=('etc/reaver/reaver.db')
-replaces=('reaver' 'reaver-svn' 'reaver-git')
-conflicts=('reaver' 'reaver-svn' 'reaver-git')
+replaces=('reaver' 'reaver-svn' 'reaver-git' 'reaver-wps-fork-t6x')
+conflicts=('reaver' 'reaver-svn' 'reaver-git' 'reaver-wps-fork-t6x')
 provides=('reaver')
-source=($pkgname::git+https://github.com/t6x/$_pkgname.git)
+source=("$pkgname::git+https://github.com/t6x/$_pkgname.git")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -29,9 +30,10 @@ build() {
 }
 
 package() {
-  install -Dm755 "$srcdir/$pkgname/src/reaver" "$pkgdir/usr/bin/reaver"
-  install -Dm755 "$srcdir/$pkgname/src/wash" "$pkgdir/usr/bin/wash"
-  install -Dm644 "$srcdir/$pkgname/src/reaver.db" "$pkgdir/etc/reaver/reaver.db"
-  install -Dm644 "$srcdir/$pkgname/docs/README" "$pkgdir/usr/share/doc/reaver/README"
-  install -Dm644 "$srcdir/$pkgname/docs/reaver.1.gz" "$pkgdir/usr/share/man/man1/reaver.1.gz"
+  cd "$srcdir/$pkgname"
+  install -Dm755 src/reaver "$pkgdir/usr/bin/reaver"
+  install -Dm755 src/wash "$pkgdir/usr/bin/wash"
+  install -Dm644 src/reaver.db "$pkgdir/etc/reaver/reaver.db"
+  install -Dm644 docs/README "$pkgdir/usr/share/doc/reaver/README"
+  install -Dm644 docs/reaver.1.gz "$pkgdir/usr/share/man/man1/reaver.1.gz"
 }