Prevent merging of sources from different releases

1 files changed, 16 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 934f5edb61de..5475b81b6ce1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=cruiser
 pkgver=1.2.23
-pkgrel=1
+pkgrel=2
 pkgdesc="Map and navigation application using offline vector maps"
 arch=('any')
 url="http://wiki.openstreetmap.org/wiki/Cruiser"
@@ -14,18 +14,30 @@ source=("http://www.talent.gr/public/cruiser/cruiser-desktop-${pkgver}.zip"
         "cruiser.sh")
 md5sums=('68d245a01f5d5a3f8f535900d8188b0b'
          '6c23697fc0421c752227dd1e1f29245f')
+noextract=("cruiser-desktop-$pkgver.zip")
+_extractname="${pkgname}_${pkgver}-${pkgrel}"
 
-build () {
+prepare() {
+    # Manually extract source to force "--cleanbuild"
+    # because all files from $srcdir/cruiser/lib are installed
+
+    mkdir "$srcdir/${_extractname}"
+    cd "$srcdir/${_extractname}"
+
+    bsdtar -xf "$srcdir/cruiser-desktop-$pkgver.zip" --strip-components 1
+}
+
+build() {
     sed 's/cruiser.jar/cruiser-gl.jar/' cruiser.sh > cruiser-gl.sh
 }
 
 package() {
     for _f in cruiser{,-gl}; do
-        install -Dm644 "cruiser/$_f.jar" "$pkgdir/usr/share/java/cruiser/$_f.jar"
+        install -Dm644 "${_extractname}/$_f.jar" "$pkgdir/usr/share/java/cruiser/$_f.jar"
         install -Dm755 "$_f.sh" "$pkgdir/usr/bin/$_f"
     done
 
-    cd cruiser/lib
+    cd "${_extractname}/lib"
     for _f in *.jar; do
         install -Dm644 "$_f" "$pkgdir/usr/share/java/cruiser/lib/$_f"
     done