MULTIMC: Update to 0.6.1

	* Fix bad urls from curseforge
	* "Build issues have been fixed" -- no, not really
	* Can now download necessary files without launching the game

2 files changed, 12 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 554de9d0c69e..3960c540cfd9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Jan  1 12:16:10 UTC 2018
+# Thu Feb  1 13:44:45 UTC 2018
 pkgbase = multimc5
 	pkgdesc = Minecraft launcher with ability to manage multiple instances.
-	pkgver = 0.6.0
+	pkgver = 0.6.1
 	pkgrel = 1
 	url = http://multimc.org/
 	arch = i686
@@ -23,10 +23,11 @@ pkgbase = multimc5
 	optdepends = mcedit: Allows editing of minecraft worlds
 	conflicts = multimc5-git
 	conflicts = multimc-git
-	source = https://github.com/MultiMC/MultiMC5/archive/0.6.0.tar.gz
+	conflicts = multimc
+	source = https://github.com/MultiMC/MultiMC5/archive/0.6.1.tar.gz
 	source = https://github.com/MultiMC/libnbtplusplus/archive/multimc-0.5.0.tar.gz
 	source = https://github.com/MultiMC/quazip/archive/multimc-2.tar.gz
-	sha512sums = f077e49a6cd76c150ea897518665d55eb160ed69891614f6ec5d510d6c4ac7f660b911438d6e50ee6e026a98ca4a2b65b5e7c4888bbefc125dd20680a3e5bc3a
+	sha512sums = 55adf34bcd4fb90ff6473902827fe16ad2e4546b32d65bc6dd9f49401ddb4a6d64ac751228346493491da9968ecf02ed9b5da81fa00db963a790bb2ef3a7bea1
 	sha512sums = 333aa110a399a5061aba306912b6e9af18f824920a778afeb6b5714d91af64cb6135e2801a6271a38896a36db733308cbfade79830ca08bfca8a9d79fef69e68
 	sha512sums = de5169e46018b61f9d1221e537785c19e62d7de57e9726f65668ee5c265b4db8464cc6f8ac48bd28c0166b186fff31115c11e05451259437f3358e3b2c5fc57f
 
diff --git a/PKGBUILD b/PKGBUILD
index fa4a0c3e5db4..c139e5a64b23 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: b.klettbach@gmail.com
 
 pkgname=multimc5
-pkgver=0.6.0
+pkgver=0.6.1
 pkgrel=1
 __pkgver_libnbtplusplus=multimc-0.5.0
 __pkgver_quazip=multimc-2
@@ -13,12 +13,12 @@ license=('Apache')
 depends=('zlib' 'libgl' 'qt5-base' 'qt5-x11extras' 'java-runtime' 'qt5-svg')
 makedepends=('git' 'patch' 'cmake' 'qt5-tools' 'qt5-x11extras' 'java-environment>=8')
 optdepends=('mcedit: Allows editing of minecraft worlds')
-conflicts=('multimc5-git' 'multimc-git')
+conflicts=('multimc5-git' 'multimc-git' 'multimc')
 source=("https://github.com/MultiMC/MultiMC5/archive/${pkgver}.tar.gz"
   "https://github.com/MultiMC/libnbtplusplus/archive/${__pkgver_libnbtplusplus}.tar.gz"
   "https://github.com/MultiMC/quazip/archive/${__pkgver_quazip}.tar.gz"
 )
-sha512sums=('f077e49a6cd76c150ea897518665d55eb160ed69891614f6ec5d510d6c4ac7f660b911438d6e50ee6e026a98ca4a2b65b5e7c4888bbefc125dd20680a3e5bc3a'
+sha512sums=('55adf34bcd4fb90ff6473902827fe16ad2e4546b32d65bc6dd9f49401ddb4a6d64ac751228346493491da9968ecf02ed9b5da81fa00db963a790bb2ef3a7bea1'
             '333aa110a399a5061aba306912b6e9af18f824920a778afeb6b5714d91af64cb6135e2801a6271a38896a36db733308cbfade79830ca08bfca8a9d79fef69e68'
             'de5169e46018b61f9d1221e537785c19e62d7de57e9726f65668ee5c265b4db8464cc6f8ac48bd28c0166b186fff31115c11e05451259437f3358e3b2c5fc57f')
 prepare() {
@@ -35,8 +35,8 @@ build() {
 
   cd build
   cmake -DCMAKE_BUILD_TYPE=Release \
-	  -DCMAKE_INSTALL_PREFIX="${pkgdir}" \
 	  -DMultiMC_UPDATER=OFF \
+	  -DCMAKE_INSTALL_PREFIX="/usr" \
 	  -DMultiMC_LAYOUT=lin-system \
 	  ..
   make
@@ -44,7 +44,9 @@ build() {
 
 package() {
   cd "$srcdir/MultiMC5-${pkgver}/build"
-  make install
+  make install DESTDIR="${pkgdir}"
   install -D "${srcdir}/MultiMC5-${pkgver}/application/resources/multimc/scalable/multimc.svg" "${pkgdir}/usr/share/pixmaps/multimc.svg"
   install -D "${srcdir}/MultiMC5-${pkgver}/application/package/linux/multimc.desktop" "${pkgdir}/usr/share/applications/multimc.desktop"
+  install -D "${srcdir}/MultiMC5-${pkgver}/build/libMultiMC_quazip.so" "${pkgdir}/usr/lib/libMultiMC_quazip.so"
+  install -D "${srcdir}/MultiMC5-${pkgver}/build/libMultiMC_nbt++.so" "${pkgdir}/usr/lib/libMultiMC_nbt++.so"
 }