summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcell Meszaros2022-05-31 16:01:08 +0200
committerMarcell Meszaros2022-05-31 16:18:01 +0200
commit68a13753c77a514503ad01cf1ffd8c209d4dd3e3 (patch)
treed4e82eeca490f117d8a3c5c62ed6248b194667fa
parenta67a29ac4f1d826314613e5279a4fd891c88f8fb (diff)
downloadaur-68a13753c77a514503ad01cf1ffd8c209d4dd3e3.tar.gz
add bcprov version constraint, fix its path (.jar got moved in bcprov v1.71)
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD11
2 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0fcbc9271781..e7be0b5151f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,7 +8,7 @@ pkgbase = android-backup-extractor
makedepends = git
makedepends = apache-ant
makedepends = java-environment>=11
- depends = bcprov
+ depends = bcprov>=1.71
depends = java-runtime>=11
provides = abe
source = https://github.com/nelenkov/android-backup-extractor/archive/refs/tags/20220119054922-ef67572.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 2581dcb23b66..67bf88bf7518 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
# Maintainer: Jason Nader <jason *add-dot-here* nader *you-know-what-goes-here* protonmail.com>
+# Maintainer: Marcell Meszaros < marcell.meszaros AT runbox.eu >
pkgname=android-backup-extractor
pkgver=20220119054922_ef67572
@@ -6,7 +7,7 @@ pkgrel=2
pkgdesc="Utility to extract and repack Android backups created with adb backup"
arch=('any')
makedepends=('git' 'apache-ant' 'java-environment>=11')
-depends=('bcprov' 'java-runtime>=11')
+depends=('bcprov>=1.71' 'java-runtime>=11')
license=('apache')
provides=('abe')
url="https://github.com/nelenkov/android-backup-extractor"
@@ -17,14 +18,14 @@ prepare() {
cd "${srcdir}/${pkgname}-${pkgver//_/-}"
# 1. set correct path to system bcprov
# 2. do not include bcprov classes in the final abe.jar file
- sed -e 's@lib/bcprov-jdk15on-1.70.jar@/usr/share/java/bcprov.jar@g' \
+ sed -e 's@lib/bcprov-jdk15on-1.70.jar@/usr/share/java/bcprov/bcprov.jar@g' \
-e 's@<zipfileset.*@@g' \
-i build.xml || return 1
# do not use the bundled abe script, a simple wrapper is good enough
echo '#!/bin/sh' > arch-abe
- echo "CP=/usr/share/java/bcprov.jar:/usr/share/java/${pkgname}/abe.jar" >> arch-abe
- echo 'exec /usr/bin/java -cp $CP org.nick.abe.Main "$@"' >> arch-abe
+ echo "CP=\"/usr/share/java/bcprov/bcprov.jar:/usr/share/java/${pkgname}/abe.jar\"" >> arch-abe
+ echo 'exec /usr/bin/java -cp "$CP" org.nick.abe.Main "$@"' >> arch-abe
chmod +x arch-abe
}
@@ -42,4 +43,4 @@ package() {
install abe.jar "${pkgdir}/usr/share/java/${pkgname}/abe.jar"
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-} \ No newline at end of file
+}