[arch-commits] Commit in geogebra/trunk (ChangeLog PKGBUILD geogebra)

[Evgeniy Alekseev]

    Date: Friday, September 19, 2014 @ 21:22:48
  Author: arcanis
Revision: 119256

upgpkg: geogebra 5.0.4.0-1

Added:
  geogebra/trunk/geogebra
Modified:
  geogebra/trunk/ChangeLog
  geogebra/trunk/PKGBUILD

-----------+
 ChangeLog |    3 +++
 PKGBUILD  |   28 +++++++++++++++++-----------
 geogebra  |    7 +++++++
 3 files changed, 27 insertions(+), 11 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2014-09-19 19:15:51 UTC (rev 119255)
+++ ChangeLog	2014-09-19 19:22:48 UTC (rev 119256)
@@ -1,3 +1,6 @@
+5.0.4.0-1:
+upstream update
+
 4.4.45.0-1:
 upstream update
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-19 19:15:51 UTC (rev 119255)
+++ PKGBUILD	2014-09-19 19:22:48 UTC (rev 119256)
@@ -5,7 +5,7 @@
 # Contributor: moostik <mooostik at gmail dot com>
 
 pkgname=geogebra
-pkgver=4.4.45.0
+pkgver=5.0.4.0
 pkgrel=1
 pkgdesc="Dynamic mathematics software with interactive graphics, algebra and spreadsheet"
 arch=('any')
@@ -13,22 +13,28 @@
 license=('GPL3' 'CCPL:by-sa' 'CCPL:by-nc')
 depends=('desktop-file-utils' 'gsl' 'hicolor-icon-theme' 'java-runtime'
          'shared-mime-info' 'xdg-utils')
-source=(http://download.geogebra.org/installers/4.4/GeoGebra-Linux-Installer-${pkgver}.tar.gz)
+makedepends=('gendesk')
+source=(http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${pkgver}.tar.bz2
+        geogebra)
 install=geogebra.install
-md5sums=('d5639effe2e995d9803e403f47c5e51c')
+md5sums=('d1992ef7adfae9ec768f23bf04412382'
+         '167a8f9368eb4e27b1f339796f0c091a')
 changelog=ChangeLog
 
 prepare() {
-  cd "${pkgname}-${pkgver}"
-  sed -i 's|/usr|${pkgdir}/usr|g' install.sh
+  gendesk -f -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" \
+          --name="GeoGebra" \
+          --categories="Education;Science;Math" \
+          --mimetypes="application/vnd.geogebra.file;application/vnd.geogebra.tool"
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
-  install -dm755 "${pkgdir}/usr/bin" \
-                 "${pkgdir}/usr/share/"{applications,geogebra}
-  source install.sh
-  install -Dm644 "_license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd "GeoGebra-Linux-Portable-${pkgver}"
 
-  rm -rf "${pkgdir}/usr/share/mime/"
+  install -Dm755 "${srcdir}/geogebra" "${pkgdir}/usr/bin/geogebra"
+  install -dm755 "${pkgdir}/usr/share/geogebra"
+  install "geogebra/"* -t "${pkgdir}/usr/share/geogebra/"
+
+  install -Dm644 "${srcdir}/geogebra.desktop" "${pkgdir}/usr/share/applications/geogebra.desktop"
+  install -Dm644 "geogebra.png" "${pkgdir}/usr/share/pixmaps/geogebra.png"
 }

Added: geogebra
===================================================================
--- geogebra	                        (rev 0)
+++ geogebra	2014-09-19 19:22:48 UTC (rev 119256)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+GG_PATH="/usr/share"
+export GG_CONFIG_PATH="$GG_PATH"
+export JAVACMD="/usr/bin/java"
+
+exec "$GG_PATH/geogebra/geogebra" "$@"