summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose17112016-08-10 23:57:26 +0200
committerjose17112016-08-10 23:57:26 +0200
commit493e97bce5251f663dbc3c0d16e8796a46415ec7 (patch)
treedf0323fa5adb952179d0386257342f29e0655c85
parent0280d5df97d60761cf1691fa60347bfb6a4436e7 (diff)
downloadaur-493e97bce5251f663dbc3c0d16e8796a46415ec7.tar.gz
Update
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD20
-rw-r--r--routeconverter3
3 files changed, 16 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9aee7f163baa..b7257a49d5dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Thu Jan 28 16:03:11 UTC 2016
+# Wed Aug 10 21:57:15 UTC 2016
pkgbase = routeconverter
pkgdesc = A free tool to edit and convert routes, tracks and waypoints.
- pkgver = 2.17
+ pkgver = 2.18.5
pkgrel = 1
url = http://www.routeconverter.de/en
changelog = ChangeLog
@@ -15,14 +15,14 @@ pkgbase = routeconverter
noextract = RouteConverterCmdLine.jar
noextract = RouteConverterLinux.jar
noextract = RouteConverterLinux64.jar
- source_i686 = routeconverter
- source_i686 = routeconverter-cli
- source_i686 = http://www.routeconverter.de/download/RouteConverterCmdLine.jar
- source_i686 = http://www.routeconverter.de/download/RouteConverterLinux.jar
- md5sums_i686 = 4bc45e6a1a93656a0deb8956f71b6af8
- md5sums_i686 = fdf570309917df1c1536b7e3c7740b33
- md5sums_i686 = f2b6d764bfb8687705a04641207b37ae
- md5sums_i686 = a8bee928224cf37c05d034b70a8d7d8e
+ source = routeconverter
+ source = routeconverter-cli
+ source = http://www.routeconverter.de/download/RouteConverterCmdLine.jar
+ source = http://www.routeconverter.de/download/RouteConverterLinux.jar
+ md5sums = e4cdc9db82a9f8c550afb44f851d897f
+ md5sums = fdf570309917df1c1536b7e3c7740b33
+ md5sums = fcd5ba246148aaf589c5dec2431aeb20
+ md5sums = 6179b82a7d0f53912b6fb107384fa83f
pkgname = routeconverter
diff --git a/PKGBUILD b/PKGBUILD
index 98032aaba624..0f634297c084 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,9 @@
# Maintainer: Jose Riha <jose1711 gmail com>
# Contributor: Alexander 'hatred' Drozdov <adrozdoff@gmail.com>
pkgname=routeconverter
-pkgver=2.17
+pkgver=2.18.5
pkgrel=1
pkgdesc="A free tool to edit and convert routes, tracks and waypoints."
-# not sure if 64bit version works - on http://static.routeconverter.com/download/previous-releases/2.16/ there is no 64bit version any more
-#arch=(i686)
arch=(i686 x86_64)
url="http://www.routeconverter.de/en"
license=('GPL')
@@ -15,16 +13,17 @@ changelog=ChangeLog
sourcecommon=(routeconverter
routeconverter-cli
http://www.routeconverter.de/download/RouteConverterCmdLine.jar)
-source_i686=(${sourcecommon[@]} http://www.routeconverter.de/download/RouteConverterLinux.jar)
-#source_x86_64=(${sourcecommon[@]} http://www.routeconverter.de/download/RouteConverterLinux64.jar)
+source=(${sourcecommon[@]} http://www.routeconverter.de/download/RouteConverterLinux.jar)
md5sumscommon=('4bc45e6a1a93656a0deb8956f71b6af8'
'fdf570309917df1c1536b7e3c7740b33'
'f2b6d764bfb8687705a04641207b37ae'
)
-md5sums_i686=(${md5sumscommon[@]} 'a8bee928224cf37c05d034b70a8d7d8e')
-#md5sums_x86_64=(${md5sumscommon[@]} '')
+md5sums=('e4cdc9db82a9f8c550afb44f851d897f'
+ 'fdf570309917df1c1536b7e3c7740b33'
+ 'fcd5ba246148aaf589c5dec2431aeb20'
+ '6179b82a7d0f53912b6fb107384fa83f')
noextract=(RouteConverterCmdLine.jar
RouteConverterLinux.jar
@@ -49,17 +48,10 @@ package()
${srcdir}/RouteConverterCmdLine.jar \
${pkgdir}/usr/lib/${pkgname}/
- [ "$CARCH" == "i686" ] && \
install -m 644 -o root -g root \
${srcdir}/RouteConverterLinux.jar \
${pkgdir}/usr/lib/${pkgname}/ || true
- #[ "$CARCH" == "x86_64" ] && \
- #install -m 644 -o root -g root \
- #${srcdir}/RouteConverterLinux64.jar \
- #${pkgdir}/usr/lib/${pkgname}/ || true
-
ln -s /usr/lib/libwebkitgtk-1.0.so.0 ${pkgdir}/usr/lib/${pkgname}/libwebkit-1.0.so.2
ln -s libwebkit-1.0.so.2 ${pkgdir}/usr/lib/${pkgname}/libwebkit-1.0.so
}
-
diff --git a/routeconverter b/routeconverter
index 6759f4acdab0..402b3a18be1b 100644
--- a/routeconverter
+++ b/routeconverter
@@ -5,9 +5,6 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/routeconverter
java=`which java`
java_opts=""
-cpu=`uname -m`
-
jar="/usr/lib/routeconverter/RouteConverterLinux.jar"
-[ "$cpu" == "x86_64" ] && jar="/usr/lib/routeconverter/RouteConverterLinux64.jar"
"$java" $java_opts -jar "$jar" $@