summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorUncle Hunto2017-11-14 13:59:03 -0800
committerUncle Hunto2017-11-14 13:59:03 -0800
commit257a52ab85ff28bed1a4ff0e3212fa8e4604bcef (patch)
tree743d7c76225ebd138c714d72cee6725d2775767e
parenta1d18a40fb3075954ac694f333eed818350cf191 (diff)
downloadaur-257a52ab85ff28bed1a4ff0e3212fa8e4604bcef.tar.gz
Update to 0.96.3, add armory-bin to conflicts
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5493d494b0d8..9dd6c1178a6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Aug 31 07:20:02 UTC 2017
+# Tue Nov 14 21:58:11 UTC 2017
pkgbase = armory-goatpig-git
pkgdesc = Armory Bitcoin wallet, built from new, official github repo w/auto selection of current python2 version
- pkgver = v0.96.2.r0.g95dc5590
+ pkgver = v0.96.3.r0.g2b65ac06
pkgrel = 1
url = https://github.com/goatpig/BitcoinArmory
install = armory.install
@@ -24,6 +24,7 @@ pkgbase = armory-goatpig-git
provides = armory
conflicts = armory
conflicts = armory-git
+ conflicts = armory-bin
source = armory::git+https://github.com/goatpig/BitcoinArmory.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 880d98c61ff8..248a3041c689 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=armory-goatpig-git
_name=${pkgname%-*-*}
_py2ver=$(pacman -Qi python2 | sed -n 's/\(.*Version *: \)\(.*\..*\)\(\..*\)/\2/p')
-pkgver=v0.96.2.r0.g95dc5590
+pkgver=v0.96.3.r0.g2b65ac06
pkgrel=1
pkgdesc="Armory Bitcoin wallet, built from new, official github repo w/auto selection of current python2 version"
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ makedepends=('git' 'gcc' 'make')
optdepends=('bitcoin-daemon: Communicate with the Bitcoin network')
install="${_name}.install"
provides=('armory')
-conflicts=('armory' 'armory-git')
+conflicts=('armory' 'armory-git' 'armory-bin')
source=("${_name}::git+${url}.git")
sha256sums=('SKIP')