summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan la Cour2017-10-12 21:16:16 -0600
committerJonathan la Cour2017-10-12 21:16:16 -0600
commitb706321c94023f2913e0ba588f1ef8eea9e4909b (patch)
tree59832cb5d72246b76aa84903b46c0b4197e868bd
parent88cc87cd4f3d8a0911de3251d4206addbfb92c0d (diff)
downloadaur-b706321c94023f2913e0ba588f1ef8eea9e4909b.tar.gz
Add symlink for bin and update licenses/conflicts
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD9
2 files changed, 11 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 907262f86916..5aa10c84d857 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
# Generated by mksrcinfo v8
-# Fri Oct 13 01:56:37 UTC 2017
+# Fri Oct 13 03:15:59 UTC 2017
pkgbase = armory-git
pkgdesc = Full-featured Bitcoin wallet management application
pkgver = v0.96.3.99.r0.g1c7f3e91
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/goatpig/BitcoinArmory
install = armory-git.install
arch = i686
arch = x86_64
license = AGPL3
+ license = MIT
makedepends = git
makedepends = gcc
makedepends = make
@@ -23,6 +24,8 @@ pkgbase = armory-git
optdepends = bitcoin-daemon: Communicate with the Bitcoin network
provides = armory
conflicts = armory
+ conflicts = armory-bin
+ conflicts = armory-goatpig-git
source = armory-git::git+https://github.com/goatpig/BitcoinArmory.git
source = run-armory.sh
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index bb836de49988..8f802849a727 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,17 +3,17 @@
# Contributor: Patrick Glandien <patrick@synix.io>
pkgname=armory-git
pkgver=v0.96.3.99.r0.g1c7f3e91
-pkgrel=1
+pkgrel=2
pkgdesc="Full-featured Bitcoin wallet management application"
arch=('i686' 'x86_64')
url="https://github.com/goatpig/BitcoinArmory"
-license=('AGPL3')
+license=('AGPL3' 'MIT')
depends=('crypto++' 'swig' 'qt4' 'python2' 'python2-twisted' 'python2-pyqt4' 'python2-bsddb' 'python2-psutil')
makedepends=('git' 'gcc' 'make')
optdepends=('bitcoin-daemon: Communicate with the Bitcoin network')
install="${pkgname}.install"
provides=('armory')
-conflicts=('armory')
+conflicts=('armory' 'armory-bin' 'armory-goatpig-git')
source=("$pkgname"::'git+https://github.com/goatpig/BitcoinArmory.git'
'run-armory.sh')
noextract=()
@@ -60,6 +60,9 @@ package() {
mkdir -p "$pkgdir/opt"
cp -R "$srcdir/$pkgname/" "$pkgdir/opt/"
+ mkdir -p "$pkgdir/usr/local/bin"
+ ln -s "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/local/bin/$pkgname"
+
rm -rf "$pkgdir/opt/$pkgname/cppForSwig/"
rm -rf "$pkgdir/opt/$pkgname/.git/"
rm -rf "$pkgdir/opt/$pkgname/.gitignore"