Fix some namcap warnings and install BouncyCastleProvider

- Also use branch fragment for git VCS

3 files changed, 20 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 471b06c95d83..6f29a0bddb4b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 # Generated by mksrcinfo v8
-# Tue May 17 21:36:19 UTC 2016
+# Wed May 18 22:33:50 UTC 2016
 pkgbase = bitsquare-git
-	pkgdesc = Bitsquare is a cross-platform desktop application that allows users to trade national currency (dollars, euros, etc) for bitcoin without relying on centralized exchanges
+	pkgdesc = Cross-platform desktop application that allows users to trade national currency (dollars, euros, etc) for bitcoin without relying on centralized exchanges
 	pkgver = v0.4.6.r5.gbf8e3c3
 	pkgrel = 1
 	url = https://bitsquare.io/
-	arch = x86_64
+	arch = any
 	license = AGPL3
 	makedepends = maven
-	depends = bash
 	depends = java-openjfx
 	source = bitsquare-git::git+https://github.com/bitsquare/bitsquare.git
-	source = git+https://github.com/bitsquare/bitcoinj.git
+	source = git+https://github.com/bitsquare/bitcoinj.git#branch=FixBloomFilters
 	source = bitsquare.sh
 	source = bitsquare.desktop
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = b2e5e85f842f0bc9910087d62f78f5fd9fc1b6232849b59e785acbec5d8955cf
+	sha256sums = 95a61502d44523c983549d6bf3deb81dc49fef490a187d28fd16e024c2d3e2aa
 	sha256sums = 15592a05a2a4d6cb65c757e9eec5e3818bf38e7397a3b98e7651a8a3b51f9ba9
 
 pkgname = bitsquare-git
diff --git a/PKGBUILD b/PKGBUILD
index 5d0986ce88cc..1fb4f05a209f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,19 @@
 pkgname=bitsquare-git
 pkgver=v0.4.6.r5.gbf8e3c3
 pkgrel=1
-pkgdesc="Bitsquare is a cross-platform desktop application that allows users to trade national currency (dollars, euros, etc) for bitcoin without relying on centralized exchanges"
-arch=('x86_64')
+pkgdesc="Cross-platform desktop application that allows users to trade national currency (dollars, euros, etc) for bitcoin without relying on centralized exchanges"
+arch=('any')
 url="https://bitsquare.io/"
 license=('AGPL3')
-depends=('bash' 'java-openjfx')
+depends=('java-openjfx')
 makedepends=('maven')
 source=("${pkgname}::git+https://github.com/bitsquare/bitsquare.git"
-  "git+https://github.com/bitsquare/bitcoinj.git"
-  "bitsquare.sh"
-  "bitsquare.desktop")
+            "git+https://github.com/bitsquare/bitcoinj.git#branch=FixBloomFilters"
+            "bitsquare.sh"
+            "bitsquare.desktop")
 sha256sums=('SKIP'
             'SKIP'
-            'b2e5e85f842f0bc9910087d62f78f5fd9fc1b6232849b59e785acbec5d8955cf'
+            '95a61502d44523c983549d6bf3deb81dc49fef490a187d28fd16e024c2d3e2aa'
             '15592a05a2a4d6cb65c757e9eec5e3818bf38e7397a3b98e7651a8a3b51f9ba9')
 
 pkgver() {
@@ -23,11 +23,6 @@ pkgver() {
   git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-  cd "${srcdir}/bitcoinj"
-  git checkout FixBloomFilters
-}
-
 build() {
   # Use a temporary local maven repository.
   local mvn_repo="$srcdir/mvn-repository"
@@ -42,11 +37,17 @@ build() {
 }
 
 package() {
-  # Install executable. 
+  # Install executable.
   install -D -m755 "bitsquare.sh" "${pkgdir}/usr/bin/bitsquare"
   install -D -m644 "${srcdir}/${pkgname}/gui/target/shaded.jar" "${pkgdir}/usr/share/java/bitsquare/shaded.jar"
 
   # Install desktop launcher.
   install -Dm644 bitsquare.desktop "${pkgdir}/usr/share/applications/bitsquare.desktop"
   install -Dm644 "${srcdir}/${pkgname}/package/linux/icon.png" "${pkgdir}/usr/share/pixmaps/bitsquare.png"
+
+  # Install BouncyCastleProvider
+  # https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#3-copy-the-bountycastle-provider-jar-file
+  local mvn_repo="$srcdir/mvn-repository"
+  install -Dm644 "$mvn_repo/org/bouncycastle/bcprov-jdk15on/1.53/bcprov-jdk15on-1.53.jar" \
+    "${pkgdir}/usr/lib/jvm/java-8-openjdk/jre/lib/ext/bcprov-jdk15on-1.53.jar"
 }
diff --git a/bitsquare.sh b/bitsquare.sh
index 268195b8712d..d70a945e166e 100644
--- a/bitsquare.sh
+++ b/bitsquare.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec "$JAVA_HOME/bin/java" -jar /usr/share/java/bitsquare/shaded.jar "$@"
+exec "$JAVA_HOME/bin/java" -Dsecurity.provider.11=org.bouncycastle.jce.provider.BouncyCastleProvider -jar /usr/share/java/bitsquare/shaded.jar "$@"