minor corrections, omitting version bump

2 files changed, 40 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85e2c740a2d4..be95765c68f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 pkgbase = jameica
-	pkgdesc = Jameica is a JAVA GUI framework basing on SWT
+	pkgdesc = free runtime environment for java applications
 	pkgver = 2.6.4
 	pkgrel = 1
-	url = https://www.willuhn.de/projects/jameica/
+	url = https://www.willuhn.de/products/jameica/
 	arch = i686
 	arch = x86_64
-	license = GPL
+	license = GPL2
 	makedepends = unzip
 	depends = java-runtime>=1.5
 	depends = java-environment
 	depends = swt
+	source = jameica-2.6.4::https://www.willuhn.de/projects/jameica/releases/2.6/jameica/jameica-linux64.zip
+	sha1sums = 7d3d6104b75d41b0baebdf7cbbdf3fca64012e13
 
 pkgname = jameica
 
diff --git a/PKGBUILD b/PKGBUILD
index 26db70ecd121..1e85a31247d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,50 @@
-# Maintainer: Bjoern Franke <bjo@nord-west.org>
+# former Maintainer: Bjoern Franke <bjo@nord-west.org>
 pkgname=jameica
 pkgver=2.6.4
 _pkgver=2.6
 pkgrel=1
-pkgdesc="Jameica is a JAVA GUI framework basing on SWT"
+pkgdesc="free runtime environment for java applications"
 arch=('i686' 'x86_64')
-url="https://www.willuhn.de/projects/jameica/"
-license=("GPL")
+url="https://www.willuhn.de/products/jameica/"
+license=("GPL2")
 depends=('java-runtime>=1.5' 'java-environment' 'swt')
 makedepends=('unzip')
 # See https://willuhn.de/products/jameica/download.php for checksums
 if [ "$CARCH" = "i686" ]; then
-  source=("${pkgname}-${pkgver}::https://www.willuhn.de/projects/jameica/releases/$_pkgver/jameica/$pkgname-linux.zip")
-  sha1sums=('f659abd95ac062846f14c067fea5061bd5c4cd54')
+    source=("${pkgname}-${pkgver}::https://www.willuhn.de/projects/jameica/releases/$_pkgver/jameica/$pkgname-linux.zip")
+    sha1sums=('f659abd95ac062846f14c067fea5061bd5c4cd54')
 elif [ "$CARCH" = "x86_64" ]; then
-  source=("${pkgname}-${pkgver}::https://www.willuhn.de/projects/jameica/releases/$_pkgver/jameica/$pkgname-linux64.zip")
-  sha1sums=('7d3d6104b75d41b0baebdf7cbbdf3fca64012e13')
+    source=("${pkgname}-${pkgver}::https://www.willuhn.de/projects/jameica/releases/$_pkgver/jameica/$pkgname-linux64.zip")
+    sha1sums=('7d3d6104b75d41b0baebdf7cbbdf3fca64012e13')
 fi
 
-build() {
-  cd $srcdir/jameica
-  sed -i '6c cd /opt/jameica' jameica.sh jameicaserver.sh
-  sed -i '10 s/lib\/swt\/linux/\/usr\/lib/' jameica.sh jameicaserver.sh
-  sed -i '10 s/$@/& \&> \/dev\/null \&/' jameica.sh jameicaserver.sh
-  sed -i '/^dir/d' jameica.sh jameicaserver.sh
-  sed -i '/^link/d' jameica.sh jameicaserver.sh
-  sed -i '/^cd "$dir"/d' jameica.sh jameicaserver.sh
+prepare() {
+    cd "$srcdir/jameica"
+    sed -i '6c cd /opt/jameica' jameica.sh jameicaserver.sh
+    sed -i '10 s/lib\/swt\/linux/\/usr\/lib/' jameica.sh jameicaserver.sh
+    sed -i '10 s/$@/& \&> \/dev\/null \&/' jameica.sh jameicaserver.sh
+    sed -i '/^dir/d' jameica.sh jameicaserver.sh
+    sed -i '/^link/d' jameica.sh jameicaserver.sh
+    sed -i '/^cd "$dir"/d' jameica.sh jameicaserver.sh
 }
+
 package() {
-  cd $srcdir/jameica
-  mkdir -p $pkgdir/{usr/bin,opt}
-  install -m755 jameica.sh $pkgdir/usr/bin/jameica
-  install -m755 jameicaserver.sh $pkgdir/usr/bin/jameicaserver
-  cd $srcdir
-  cp -r jameica $pkgdir/opt/
-  rm $pkgdir/opt/jameica/jameica{,server}.sh
-  rm $pkgdir/opt/jameica/rcjameica
-  if [ "$CARCH" =  "x86_64" ]; then
-    rm -rf $pkgdir/opt/jameica/lib/swt/linux64
-    mkdir $pkgdir/opt/jameica/lib/swt/linux64
-    ln -s /usr/share/java/swt.jar $pkgdir/opt/jameica/lib/swt/linux64/swt.jar
-  else
-    rm -rf $pkgdir/opt/jameica/lib/swt/linux
-    mkdir $pkgdir/opt/jameica/lib/swt/linux
-    ln -s /usr/share/java/swt.jar $pkgdir/opt/jameica/lib/swt/linux/swt.jar
-  fi
-  find $pkgdir/opt/jameica -type f -exec chmod 644 {} +
+    cd "$srcdir/jameica"
+    mkdir -p "$pkgdir/{usr/bin,opt}"
+    install -m755 jameica.sh "$pkgdir/usr/bin/jameica"
+    install -m755 jameicaserver.sh "$pkgdir/usr/bin/jameicaserver"
+    cd ..
+    cp -r jameica "$pkgdir/opt/"
+    rm "$pkgdir/opt/jameica/jameica{,server}.sh"
+    rm "$pkgdir/opt/jameica/rcjameica"
+    if [ "$CARCH" =  "x86_64" ]; then
+        rm -rf "$pkgdir/opt/jameica/lib/swt/linux64"
+        mkdir "$pkgdir/opt/jameica/lib/swt/linux64"
+        ln -s /usr/share/java/swt.jar "$pkgdir/opt/jameica/lib/swt/linux64/swt.jar"
+    else
+        rm -rf "$pkgdir/opt/jameica/lib/swt/linux"
+        mkdir "$pkgdir/opt/jameica/lib/swt/linux"
+        ln -s /usr/share/java/swt.jar "$pkgdir/opt/jameica/lib/swt/linux/swt.jar"
+    fi
+    find "$pkgdir/opt/jameica" -type f -exec chmod 644 {} +
 }