updated to 3.4.6

3 files changed, 17 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 277587e3c8a2..fb93069b20af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = vesta
 	pkgdesc = 3D visualization program for structural models, volumetric data such as electron/nuclear densities, and crystal morphologies.
-	pkgver = 3.4.5
+	pkgver = 3.4.6
 	pkgrel = 1
 	url = http://jp-minerals.org/vesta
 	install = vesta.install
-	arch = i686
 	arch = x86_64
 	license = custom
 	depends = gtk2
@@ -13,16 +12,12 @@ pkgbase = vesta
 	depends = desktop-file-utils
 	depends = libxtst
 	depends = java-environment
-	source = VESTA
 	source = VESTA.desktop
 	source = vesta.install
-	md5sums = 25d5c67b4180e227aa3fe2727119a68a
-	md5sums = fdd7040720e4b58a26caa7db09669acf
+	md5sums = 0dc025818c9c723e988e7c3460f1844a
 	md5sums = caabe467168af9e44cf380af1abfe280
-	source_i686 = http://jp-minerals.org/vesta/archives//3.4.5/VESTA-i686.tar.bz2
-	md5sums_i686 = 57be5d5d22bcbb77c9b7f10fe2fedfe1
-	source_x86_64 = http://jp-minerals.org/vesta/archives//3.4.5/VESTA-x86_64.tar.bz2
-	md5sums_x86_64 = ed14e6a80273c9c3d90473afc2f59e42
+	source_x86_64 = http://jp-minerals.org/vesta/archives/3.4.6/VESTA-x86_64.tar.bz2
+	md5sums_x86_64 = 1d4651e86193f305831aa5db3dcfe789
 
 pkgname = vesta
 
diff --git a/PKGBUILD b/PKGBUILD
index bd228b6272d5..19d1c98d00f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,22 @@
 # Maintainer: b00rt00s <b00rt00s.aur@gmail.com>
 
 pkgname=vesta
-pkgver=3.4.5
+pkgver=3.4.6
 pkgrel=1
 pkgdesc="3D visualization program for structural models, volumetric data such as electron/nuclear densities, and crystal morphologies."
 url="http://jp-minerals.org/vesta"
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('x86_64')
 depends=('gtk2' 'libpng12' 'glu' 'desktop-file-utils' 'libxtst' 'java-environment')
 
-_url="http://jp-minerals.org/vesta/archives/"
-source_i686=("${_url}/${pkgver}/VESTA-i686.tar.bz2")
+_url="http://jp-minerals.org/vesta/archives"
 source_x86_64=("${_url}/${pkgver}/VESTA-x86_64.tar.bz2")
-source=('VESTA' 'VESTA.desktop' 'vesta.install')
+source=('VESTA.desktop' 'vesta.install')
 install="vesta.install"
 
-md5sums=('25d5c67b4180e227aa3fe2727119a68a'
-         'fdd7040720e4b58a26caa7db09669acf'
+md5sums=('0dc025818c9c723e988e7c3460f1844a'
          'caabe467168af9e44cf380af1abfe280')
-md5sums_i686=('57be5d5d22bcbb77c9b7f10fe2fedfe1')
-md5sums_x86_64=('ed14e6a80273c9c3d90473afc2f59e42')
+md5sums_x86_64=('1d4651e86193f305831aa5db3dcfe789')
 
 
 package() {
@@ -33,14 +30,17 @@ package() {
 	cp -a ${srcdir}/VESTA-${CARCH} ${pkgdir}/opt/VESTA
 	chmod 755 ${pkgdir}/opt/VESTA
 	
-	#install executable
-		install -m 755 ${srcdir}/VESTA ${pkgdir}/usr/bin
-		
 	#install desktop file
 	install -m 644 ${srcdir}/VESTA.desktop ${pkgdir}/usr/share/applications/
 
 	#link licence
 	(	cd ${pkgdir}/usr/share/licenses
-		ln -sf ../../../../opt/VESTA/Library_License vesta
+		ln -sf /opt/VESTA/Library_License vesta
+	)
+
+	#link executable
+	(
+		cd ${pkgdir}/usr/bin
+		ln -sf /opt/VESTA/VESTA VESTA
 	)
 }
diff --git a/VESTA b/VESTA
deleted file mode 100755
index 105dd5070cc1..000000000000
--- a/VESTA
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-/opt/VESTA/VESTA "${*}"