clean-up PKGBUILD

5 files changed, 14 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2f72969db85c..0256da90ae51 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,19 @@
-# Generated by mksrcinfo v8
-# Thu Feb 28 23:46:15 UTC 2019
 pkgbase = bikexperience
 	pkgdesc = Software for outdoor training planning and gpx-track-management
 	pkgver = 5.7.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.bikexperience.de/
 	arch = any
 	license = GPL
-	depends = java-runtime
+	depends = java-runtime>=7
 	depends = unzip
 	optdepends = rxtx: for serial connection with bike computers
 	source = http://www.bikexperience.de/download/bXp-5.7.0-common-install.zip
 	source = bikeXperience.desktop
-	source = bxpicon.png
 	source = bikeXperience
 	md5sums = 22f3d5a0eb8ebe326a62413bae223c6e
-	md5sums = 28d05ae6d71f8cfb18e9cf8469281355
-	md5sums = 51830fb6b0fb7d5cd2e74ef7f697d222
-	md5sums = 70b9104796d1a645509395da4822b96b
+	md5sums = d56366efca3c206e2ba319bd7bd92b65
+	md5sums = 606fa88e3b6040d0eb6963203e5cff2b
 
 pkgname = bikexperience
 
diff --git a/PKGBUILD b/PKGBUILD
index 7fc974d2635d..f9cbccc3af7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,26 @@
 
 pkgname=bikexperience
 pkgver=5.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Software for outdoor training planning and gpx-track-management"
 arch=('any')
 url="http://www.bikexperience.de/"
 license=('GPL')
-depends=('java-runtime' 'unzip')
+depends=('java-runtime>=7' 'unzip')
 optdepends=('rxtx: for serial connection with bike computers')
 source=(
 "http://www.bikexperience.de/download/bXp-${pkgver}-common-install.zip"
 "bikeXperience.desktop"
-"bxpicon.png"
 "bikeXperience")
 
 md5sums=(
 '22f3d5a0eb8ebe326a62413bae223c6e'
-'28d05ae6d71f8cfb18e9cf8469281355'
-'51830fb6b0fb7d5cd2e74ef7f697d222'
-'70b9104796d1a645509395da4822b96b')
+'d56366efca3c206e2ba319bd7bd92b65'
+'606fa88e3b6040d0eb6963203e5cff2b')
                 
 package() {
- mkdir -p $pkgdir/opt/${pkgname} $pkgdir/usr/share/applications $pkgdir/usr/share/icons/hicolor/100x100/apps/ $pkgdir/usr/bin/
- install -D -m 755 $srcdir/bikeXperience.jar $pkgdir/opt/${pkgname}/
- install -D -m 644 $startdir/bikeXperience.desktop $pkgdir/usr/share/applications/
- install -D -m 644 $startdir/bxpicon.png $pkgdir/usr/share/icons/hicolor/100x100/apps/
- install -D -m 755 $startdir/bikeXperience $pkgdir/usr/bin/
+ install -D -m644 -t ${pkgdir}/usr/share/applications/               ${startdir}/bikeXperience.desktop
+ install -D -m755 -t ${pkgdir}/usr/bin/                              ${startdir}/bikeXperience 
+ install -D -m755 -t ${pkgdir}/usr/share/java/${pkgname}/            ${srcdir}/bikeXperience.jar 
+ install -D -m644 -t ${pkgdir}/usr/share/icons/hicolor/100x100/apps/ ${srcdir}/linux/bxpIcon.png 
 }
diff --git a/bikeXperience b/bikeXperience
index d207a51eea4f..0360d82e08b7 100755
--- a/bikeXperience
+++ b/bikeXperience
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -Duser.language=en -Duser.country=US -Xmn150M -Xms500M -Xmx500M -jar /opt/bikexperience/bikeXperience.jar
+java -Duser.language=en -Duser.country=US -Xmn150M -Xms500M -Xmx500M -jar /usr/share/java/bikexperience/bikeXperience.jar
diff --git a/bikeXperience.desktop b/bikeXperience.desktop
index fdb154a45e06..3b9f55bb330e 100644
--- a/bikeXperience.desktop
+++ b/bikeXperience.desktop
@@ -2,7 +2,7 @@
 Name=bikeXperience
 Comment=Software for outdoor training planning and gpx-track-management
 Exec=bikeXperience
-Icon=/usr/share/icons/hicolor/100x100/apps/bxpicon.png
+Icon=/usr/share/icons/hicolor/100x100/apps/bikeXperience.png
 Terminal=false
 Type=Application
 Categories=Utility;DataVisualization;Office;Geography;
diff --git a/bxpicon.png b/bxpicon.png
deleted file mode 100644
index da5046fb194e..000000000000
--- a/bxpicon.png
+++ /dev/null