4.2.2.41800-1: Upstream update

2 files changed, 21 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f33a373e79c..439b59185e30 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Oct 21 14:53:04 UTC 2017
+# Sat May 19 14:19:45 UTC 2018
 pkgbase = kokua-opensim
 	pkgdesc = An Open Source third party viewer for Open Simulator (opensim) grids, only.
-	pkgver = 4.2.2.417777
+	pkgver = 4.2.2.41800
 	pkgrel = 1
 	url = http://www.kokuaviewer.org
 	arch = i686
@@ -25,18 +25,14 @@ pkgbase = kokua-opensim
 	optdepends = gstreamer0.10: for video support, may need good, bad and ugly plugins
 	optdepends = lib32-freealut: for OpenAL support
 	conflicts = kokua-secondlife
-	source_i686 = https://downloads.sourceforge.net/project/kokua.team-purple.p/Kokua-OS/Linux32Bit/KokuaOS_Test_RLV_4_2_2_41777_i686.tar.txz
-	source_i686 = kokua-opensim.desktop
-	source_i686 = kokua-opensim.launcher
-	md5sums_i686 = 680ab9a635c7a202489d07a9ecc78d90
-	md5sums_i686 = a5b15ff4dd93dbfc01ee6d7c799728d0
-	md5sums_i686 = dd2d31fddb0b67846c1dfd3bfed88859
-	source_x86_64 = https://downloads.sourceforge.net/project/kokua.team-purple.p/Kokua-OS/Linux64Bit/KokuaOS_Test_RLV_64_4_2_2_41721_x86_64.tar.txz
-	source_x86_64 = kokua-opensim.desktop
-	source_x86_64 = kokua-opensim.launcher
-	md5sums_x86_64 = c730fcf0a661b58018ade316dc6da91c
-	md5sums_x86_64 = a5b15ff4dd93dbfc01ee6d7c799728d0
-	md5sums_x86_64 = dd2d31fddb0b67846c1dfd3bfed88859
+	source = https://netix.dl.sourceforge.net/project/kokua.team-purple.p/Kokua-OS/Linux64Bit/KokuaOS_RLV_64_4_2_2_41800_x86_64.tar.txz
+	source = https://www.dropbox.com/s/5p6io8zqc33idwh/kokua_icon.png
+	source = kokua-opensim.desktop
+	source = kokua-opensim.launcher
+	md5sums = 75407ffe38350644138dd36c9930af04
+	md5sums = 58ffa08dac5f50fb6ffefa79ce369653
+	md5sums = a5b15ff4dd93dbfc01ee6d7c799728d0
+	md5sums = dd2d31fddb0b67846c1dfd3bfed88859
 
 pkgname = kokua-opensim
 
diff --git a/PKGBUILD b/PKGBUILD
index 7bdf22547da3..10c018a07b3b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,9 @@
 # Contributor: Splex
 
 pkgname=kokua-opensim
-pkgver=4.2.2.417777
-_pkgver=4_2_2_41777
+pkgver=4.2.2.41800
+_pkgver=4_2_2_41800
 _pkgprever=4.2.2
-_pkgver64=4_2_2_41721
 pkgrel=1
 pkgdesc="An Open Source third party viewer for Open Simulator (opensim) grids, only."
 url="http://www.kokuaviewer.org"
@@ -16,35 +15,27 @@ depends=('apr-util' 'gtk2' 'libgl' 'libidn' 'libjpeg-turbo' 'mesa' 'nss' 'sdl' '
 optdepends=('libpulse: for PulseAudio support' 'alsa-lib: for ALSA support' 'nvidia-utils: for NVIDIA support' 'pepper-flash: for inworld Flash support' 'gstreamer0.10: for video support, may need good, bad and ugly plugins' 'lib32-freealut: for OpenAL support')
 conflicts=('kokua-secondlife')
 
-source_i686=("https://downloads.sourceforge.net/project/kokua.team-purple.p/Kokua-OS/Linux32Bit/KokuaOS_Test_RLV_${_pkgver}_i686.tar.txz"
-             'kokua-opensim.desktop'
-             'kokua-opensim.launcher')
-source_x86_64=("https://downloads.sourceforge.net/project/kokua.team-purple.p/Kokua-OS/Linux64Bit/KokuaOS_Test_RLV_64_${_pkgver64}_x86_64.tar.txz"
+source=("https://netix.dl.sourceforge.net/project/kokua.team-purple.p/Kokua-OS/Linux64Bit/KokuaOS_RLV_64_${_pkgver}_x86_64.tar.txz"
+		"https://www.dropbox.com/s/5p6io8zqc33idwh/kokua_icon.png"
 		'kokua-opensim.desktop'
 		'kokua-opensim.launcher')
-md5sums_i686=('680ab9a635c7a202489d07a9ecc78d90'
-              'a5b15ff4dd93dbfc01ee6d7c799728d0'
-              'dd2d31fddb0b67846c1dfd3bfed88859')
-md5sums_x86_64=('c730fcf0a661b58018ade316dc6da91c'
-                'a5b15ff4dd93dbfc01ee6d7c799728d0'
-                'dd2d31fddb0b67846c1dfd3bfed88859')
-
+md5sums=('75407ffe38350644138dd36c9930af04'
+         '58ffa08dac5f50fb6ffefa79ce369653'
+         'a5b15ff4dd93dbfc01ee6d7c799728d0'
+         'dd2d31fddb0b67846c1dfd3bfed88859')
+         
 package() {
 cd $srcdir
   
 # Rename Data Directory
-if [ "$CARCH" = "i686" ]; then
-mv KokuaOS_Test_RLV_${_pkgver}_$CARCH kokua-opensim
-elif [ "$CARCH" = "x86_64" ]; then
-mv KokuaOS_Test_RLV_64_${_pkgver64}_$CARCH kokua-opensim
-fi
+mv KokuaOS_RLV_64_${_pkgver}_$CARCH kokua-opensim
 
 # Install Desktop File
 install -D -m644 $srcdir/kokua-opensim.desktop \
   $pkgdir/usr/share/applications/kokua-opensim.desktop
 
 # Install Icon File
-install -D -m644 $srcdir/kokua-opensim/kokua_icon.png \
+install -D -m644 $srcdir/kokua_icon.png \
   $pkgdir/usr/share/pixmaps/kokua-opensim.png
 
 # Install Launcher