Update checksum

2 files changed, 14 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7accf25fdf50..fe318639a16a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openmw-tes3mp
 	pkgdesc = TES3MP is a project aiming to add multiplayer functionality to OpenMW, a free and open source recreation of the popular Bethesda Softworks game "The Elder Scrolls III: Morrowind".
 	pkgver = 0.7.0
-	pkgrel = 1
+	pkgrel = 3
 	url = http://tes3mp.com
 	arch = x86_64
 	license = GPL3
@@ -11,8 +11,8 @@ pkgbase = openmw-tes3mp
 	optdepends = openmw: create initial engine configuration files
 	provides = openmw-tes3mp
 	conflicts = openmw-tes3mp
-	source = openmw-tes3mp.tar.gz::https://github.com/TES3MP/openmw-tes3mp/releases/download/0.7.0-alpha/tes3mp-GNU+Linux-x86_64-release-$pkgver-alpha-abc4090a0f-01d297f5c6.tar.gz
-	source = https://raw.githubusercontent.com/TES3MP/openmw-tes3mp/master/files/tes3mp/tes3mp_logo.png
+	source = openmw-tes3mp.tar.gz::https://github.com/TES3MP/openmw-tes3mp/releases/download/0.7.0-alpha/tes3mp-GNU+Linux-x86_64-release-0.7.0-alpha-abc4090a0f-01d297f5c6.tar.gz
+	source = tes3mp.png::https://raw.githubusercontent.com/TES3MP/openmw-tes3mp/$pkgver/files/tes3mp/tes3mp_logo.png
 	source = tes3mp-browser.desktop
 	sha256sums = bfb942414e6b187f9da9365cd7b9ae959b9ff1e511e2c3a5682662dea3725ba8
 	sha256sums = 861e5e8cc7ddec2dbfb842d68cdd45e7cc564079b9cb37ad113ff140bf424fd9
diff --git a/PKGBUILD b/PKGBUILD
index 39c99bd15f23..f5f02b5a6855 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=openmw-tes3mp
 pkgver=0.7.0
-pkgrel=1
+pkgrel=3
 pkgdesc="TES3MP is a project aiming to add multiplayer functionality to OpenMW, a free and open source recreation of the popular Bethesda Softworks game \"The Elder Scrolls III: Morrowind\"."
 arch=('x86_64')
 url="http://tes3mp.com"
@@ -15,12 +15,21 @@ optdepends=('openmw: create initial engine configuration files')
 conflicts=("${pkgname%-git}")
 provides=("${pkgname%-git}")
 
+<<<<<<< HEAD
 source=("$pkgname.tar.gz"::'https://github.com/TES3MP/openmw-tes3mp/releases/download/0.7.0-alpha/tes3mp-GNU+Linux-x86_64-release-$pkgver-alpha-abc4090a0f-01d297f5c6.tar.gz'
         'https://raw.githubusercontent.com/TES3MP/openmw-tes3mp/master/files/tes3mp/tes3mp_logo.png'
         'tes3mp-browser.desktop')
 sha256sums=('c6a7a98fb8fe87f8d049a1f40b6474d4e92b7cc6d5119ac4b66e667c4e8b1820'
           '861e5e8cc7ddec2dbfb842d68cdd45e7cc564079b9cb37ad113ff140bf424fd9'
           'ddccf2f35e41c2cbb35816f3bbfc53a9dd5809cd2830e8e324f45550852f6408')
+=======
+source=("$pkgname.tar.gz"::"https://github.com/TES3MP/openmw-tes3mp/releases/download/0.7.0-alpha/tes3mp-GNU+Linux-x86_64-release-0.7.0-alpha-abc4090a0f-01d297f5c6.tar.gz"
+        "https://raw.githubusercontent.com/TES3MP/openmw-tes3mp/$pkgver/files/tes3mp/tes3mp_logo.png"
+        "tes3mp-browser.desktop")
+sha256sums=("c6a7a98fb8fe87f8d049a1f40b6474d4e92b7cc6d5119ac4b66e667c4e8b1820"
+          "861e5e8cc7ddec2dbfb842d68cdd45e7cc564079b9cb37ad113ff140bf424fd9"
+          "ddccf2f35e41c2cbb35816f3bbfc53a9dd5809cd2830e8e324f45550852f6408")
+>>>>>>> c3cea102f472dfa6d4ff8808231ff7f5e83e25c7
 
 prepare() {
   cd "$srcdir/TES3MP"
@@ -33,7 +42,7 @@ prepare() {
 
   # Remove junk files
   rm CoreScripts/README.md
-  rm CoreScripts/Turtorial.md
+  rm CoreScripts/Tutorial.md
   rm tes3mp-package-info.txt
 
   # Remove OpenMW junk files
@@ -45,8 +54,6 @@ prepare() {
 package() {
   
   # Install .desktop files
-  install -Dm644 tes3mp.desktop "$pkgdir/usr/share/applications/tes3mp.desktop"
-  install -Dm644 tes3mp-server.desktop "$pkgdir/usr/share/applications/tes3mp-server.desktop"
   install -Dm644 tes3mp-browser.desktop "$pkgdir/usr/share/applications/tes3mp-browser.desktop"
   
   # Icon for .desktop files