summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSammysHP2017-10-15 18:16:40 +0200
committerSammysHP2017-10-15 18:16:40 +0200
commite1a62460731e1ab3775cee4f8ea382ce51e4c018 (patch)
tree8547e456be41ef5ba1e869109004d542b1cd3500
parent4e7fc241dfcd67ef2b237ad764eff8a0207888da (diff)
downloadaur-e1a62460731e1ab3775cee4f8ea382ce51e4c018.tar.gz
Prevent merging of sources from different releases
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD20
2 files changed, 19 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 19a0c642484..72da00c01aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Oct 7 12:21:26 UTC 2017
+# Sun Oct 15 16:16:02 UTC 2017
pkgbase = cruiser
pkgdesc = Map and navigation application using offline vector maps
pkgver = 1.2.23
- pkgrel = 1
+ pkgrel = 2
url = http://wiki.openstreetmap.org/wiki/Cruiser
arch = any
license = proprietary (free)
@@ -12,6 +12,7 @@ pkgbase = cruiser
replaces = atlas-maps
replaces = atlas-maps-bin
replaces = atlas-maps-beta-bin
+ noextract = cruiser-desktop-1.2.23.zip
source = http://www.talent.gr/public/cruiser/cruiser-desktop-1.2.23.zip
source = cruiser.sh
md5sums = 68d245a01f5d5a3f8f535900d8188b0b
diff --git a/PKGBUILD b/PKGBUILD
index 934f5edb61d..5475b81b6ce 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