summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsamK2016-03-01 16:53:30 +0100
committerAsamK2016-03-01 16:53:30 +0100
commit426cdb25e6b6016005d2dbecb2c50046869d5865 (patch)
tree6a37e079bd0bbe0f03d4deccdd7504248bb878b7
parent44224fca888c9067ca6fdc2c0cecde6a3e1579ef (diff)
downloadaur-426cdb25e6b6016005d2dbecb2c50046869d5865.tar.gz
Remove jars from package where a separate package exists
Run gradle without daemon
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD23
-rw-r--r--textsecure-cli.sh1
3 files changed, 19 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 47a3ff29831..e903993e84f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Dec 31 16:21:27 UTC 2015
+# Tue Mar 1 15:52:59 UTC 2016
pkgbase = textsecure-cli
pkgdesc = Provides a commandline and dbus interface for secure Signal/TextSecure messaging.
pkgver = 0.2.1
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/AsamK/textsecure-cli
install = textsecure-cli.install
arch = any
@@ -12,12 +12,14 @@ pkgbase = textsecure-cli
makedepends = gradle
depends = java-runtime
depends = libmatthew-unix-java
+ depends = java-commons-logging
+ depends = java-commons-io
source = https://github.com/AsamK/textsecure-cli/archive/v0.2.1.tar.gz
source = textsecure-cli.sh
source = textsecure-cli.sysusers.conf
source = textsecure-cli.tmpfiles.conf
sha256sums = 19e4c66c5699e4a7cc2213c0df56ed3240ada49507c6b670133b33f2e6ccf760
- sha256sums = 7c85aec83be668d64d336d0dd60f867647e256cafb5e599af94180a2c7c07391
+ sha256sums = 6a0229a91b87d4b2fd44e30b67feb972e4e24dc22c80eabd04aa007b68d190bf
sha256sums = e4560cafef512e59935d1562f05dd55b04f6b2ead6bf2a888dc6f9ec5b342758
sha256sums = 31a16ec54fbdef581695b797d03c47b5618030de9b9fa26c3d3fcfc476ad30b8
diff --git a/PKGBUILD b/PKGBUILD
index dd4673142fd..ddf530c4c98 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
-# Maintainer: AsamK <asmak ät gmx de>
+# Maintainer: AsamK <asamk ät gmx de>
pkgname=textsecure-cli
pkgver=0.2.1
-pkgrel=2
+pkgrel=3
pkgdesc="Provides a commandline and dbus interface for secure Signal/TextSecure messaging."
arch=('any')
url="https://github.com/AsamK/textsecure-cli"
license=('GPL3')
-depends=('java-runtime' 'libmatthew-unix-java')
+depends=('java-runtime' 'libmatthew-unix-java' 'java-commons-logging' 'java-commons-io')
makedepends=('java-environment' 'gradle')
source=("https://github.com/AsamK/${pkgname}/archive/v${pkgver}.tar.gz"
"${pkgname}.sh"
@@ -15,7 +15,7 @@ source=("https://github.com/AsamK/${pkgname}/archive/v${pkgver}.tar.gz"
"${pkgname}.tmpfiles.conf")
install="${pkgname}.install"
sha256sums=('19e4c66c5699e4a7cc2213c0df56ed3240ada49507c6b670133b33f2e6ccf760'
- '7c85aec83be668d64d336d0dd60f867647e256cafb5e599af94180a2c7c07391'
+ '6a0229a91b87d4b2fd44e30b67feb972e4e24dc22c80eabd04aa007b68d190bf'
'e4560cafef512e59935d1562f05dd55b04f6b2ead6bf2a888dc6f9ec5b342758'
'31a16ec54fbdef581695b797d03c47b5618030de9b9fa26c3d3fcfc476ad30b8')
@@ -23,16 +23,16 @@ build() {
cd "${srcdir}"
cd "${pkgname}-${pkgver}"
- gradle installDist
+ gradle --no-daemon installDist
}
package() {
install -m755 -d "${pkgdir}/usr/share/java/${pkgname}" \
- "${pkgdir}/usr/bin" \
- "${pkgdir}/usr/lib/systemd/system/" \
- "${pkgdir}/usr/lib/sysusers.d/" \
- "${pkgdir}/usr/lib/tmpfiles.d/" \
- "${pkgdir}/etc/dbus-1/system.d/"
+ "${pkgdir}/usr/bin" \
+ "${pkgdir}/usr/lib/systemd/system/" \
+ "${pkgdir}/usr/lib/sysusers.d/" \
+ "${pkgdir}/usr/lib/tmpfiles.d/" \
+ "${pkgdir}/etc/dbus-1/system.d/"
cd "${srcdir}"
@@ -48,5 +48,8 @@ package() {
cd "build/install/${pkgname}"
+ rm -f lib/unix-*.jar
+ rm -f lib/commons-logging-*.jar
+ rm -f lib/commons-io-*.jar
install -m644 lib/*.jar "${pkgdir}/usr/share/java/${pkgname}/"
}
diff --git a/textsecure-cli.sh b/textsecure-cli.sh
index d3e9c0e579a..f89b73886f0 100644
--- a/textsecure-cli.sh
+++ b/textsecure-cli.sh
@@ -1,4 +1,5 @@
#!/bin/sh
+CP="/usr/share/java/libmatthew-unix-java/unix.jar":"/usr/share/java/commons-logging/commons-logging.jar":"/usr/share/java/commons-io/commons-io.jar"
for name in /usr/share/java/textsecure-cli/*.jar ; do
CP=$CP:"$name"
done