+conflicts:android-tools +depends:gcc-libs +simg_dump.py +optdepends:python2

1 files changed, 32 insertions, 13 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 19f185881a06..ebbee4c0d70e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,44 @@
-# Maintainer: Darren Ng <$(base64 --decode <<<'ZGFycmVuMTk5NzA4MTBAZ21haWwuY29tCg==')>
+# Maintainer: Darren Ng <$(base64 --decode <<<VW4xR2ZuQGdtYWlsLmNvbQo=)>
 
 pkgname=android-simg2img
 pkgver=1.1.4
-pkgrel=2
-pkgdesc="standalone simg-tools"
-arch=("x86_64")
-url="https://github.com/anestisb/android-simg2img"
-license=("Apache")
-depends=("zlib")
-conflicts=("simg-tools")
-source=("$pkgname-$pkgver.tar.gz::https://github.com/anestisb/$pkgname/archive/$pkgver.tar.gz")
-sha256sums=('cbd32490c1e29d9025601b81089b5aec1707cb62020dfcecd8747af4fde6fecd')
+pkgrel=3
+# pkgdesc="standalone simg-tools"
+pkgdesc="tool to convert Android sparse images to raw images (anestisb standalone fork)"
+arch=($CARCH)
+url=https://github.com/anestisb/$pkgname
+license=(Apache)
+depends=(gcc-libs zlib)
+optdepends=('python2: run simg_dump.py')
+# community/android-tools has started to provide append2simg img2simg simg2img
+conflicts=(simg-tools android-tools)
+source=($pkgname-$pkgver.tar.gz::https://github.com/anestisb/$pkgname/archive/$pkgver.tar.gz)
+sha256sums=(cbd32490c1e29d9025601b81089b5aec1707cb62020dfcecd8747af4fde6fecd)
 
+# Meld - File - Format as Patch... - Copy to Clipboard
+# xclip -o -selection clipboard | sed -i -e '/^BLOB1/{r /dev/stdin' -e 'd;}' PKGBUILD
+prepare() {
+patch --verbose $pkgname-$pkgver/simg_dump.py<<EOP
+--- simg_dump.py
++++ simg_dump.py
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2
+ 
+ # Copyright (C) 2012 The Android Open Source Project
+ #
+EOP
+}
+
+# "make package" always build everything from the very beginning
 # build() {
 # 	cd "$pkgname-$pkgver"
 #   make PREFIX="$pkgdir/usr" all
 # }
 
 package() {
-	cd "$pkgname-$pkgver"
+	cd $pkgname-$pkgver
   make PREFIX="$pkgdir/usr" install
+  chmod -v 644 "$pkgdir/usr/lib/libsparse.a"
+  install -vDm755 simg_dump.py "$pkgdir/usr/bin/"
 }
-
-