remove old patch, use pkgname in source file

3 files changed, 6 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9a217c8a46d8..26895f748708 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Dec 26 22:42:54 UTC 2016
+# Mon Dec 26 22:50:02 UTC 2016
 pkgbase = openspades
 	pkgdesc = A clone of Voxlap Ace of Spades 0.75
 	pkgver = 0.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://openspades.yvt.jp/
 	install = openspades.install
 	arch = i686
@@ -20,7 +20,7 @@ pkgbase = openspades
 	depends = openal
 	depends = sdl2
 	depends = sdl2_image
-	source = https://github.com/yvt/openspades/archive/v0.1.0.tar.gz
+	source = openspades-v0.1.0.tar.gz::https://github.com/yvt/openspades/archive/v0.1.0.tar.gz
 	md5sums = a13cc11f0903c26e95df16370781e4c8
 
 pkgname = openspades
diff --git a/PKGBUILD b/PKGBUILD
index beec6ea05d9f..7f9423fc82d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=openspades
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A clone of Voxlap Ace of Spades 0.75"
 arch=('i686' 'x86_64')
 url="http://openspades.yvt.jp/"
@@ -11,7 +11,7 @@ license=('GPL3')
 depends=('curl' 'desktop-file-utils' 'glew' 'hicolor-icon-theme' 'mesa' 'openal' 'sdl2' 'sdl2_image')
 makedepends=('cmake' 'wget' 'unzip')
 install=openspades.install
-source=("https://github.com/yvt/openspades/archive/v${pkgver}.tar.gz")
+source=("${pkgname}-v${pkgver}.tar.gz"::"https://github.com/yvt/openspades/archive/v${pkgver}.tar.gz")
 md5sums=('a13cc11f0903c26e95df16370781e4c8')
 
 
@@ -22,7 +22,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/openspades-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   rm -rf "${pkgdir}/usr/share/menu"
 }
diff --git a/openspades.patch b/openspades.patch
deleted file mode 100644
index 7923b0ac9828..000000000000
--- a/openspades.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -aur openspades-0.0.12.pristine/Sources/Client/Client_Input.cpp openspades-0.0.12.new/Sources/Client/Client_Input.cpp
---- openspades-0.0.12.pristine/Sources/Client/Client_Input.cpp	2016-03-07 10:11:47.126752964 +1030
-+++ openspades-0.0.12.new/Sources/Client/Client_Input.cpp	2016-03-07 10:13:31.009665382 +1030
-@@ -38,6 +38,7 @@
- 
- #include "NetClient.h"
- 
-+using namespace std;
- 
- SPADES_SETTING(cg_mouseSensitivity, "1");
- SPADES_SETTING(cg_zoomedMouseSensScale, "0.6");
-diff -aur openspades-0.0.12.pristine/Sources/Client/Corpse.cpp openspades-0.0.12.new/Sources/Client/Corpse.cpp
---- openspades-0.0.12.pristine/Sources/Client/Corpse.cpp	2016-03-07 10:11:47.126752964 +1030
-+++ openspades-0.0.12.new/Sources/Client/Corpse.cpp	2016-03-07 10:13:31.049663957 +1030
-@@ -27,6 +27,8 @@
- #include "../Core/Debug.h"
- #include "../Core/Settings.h"
- 
-+using namespace std;
-+
- SPADES_SETTING(r_corpseLineCollision, "1");
- 
- namespace spades {
-diff -aur openspades-0.0.12.pristine/Sources/Draw/SWMapRenderer.cpp openspades-0.0.12.new/Sources/Draw/SWMapRenderer.cpp
---- openspades-0.0.12.pristine/Sources/Draw/SWMapRenderer.cpp	2016-03-07 10:11:47.133419386 +1030
-+++ openspades-0.0.12.new/Sources/Draw/SWMapRenderer.cpp	2016-03-07 10:13:31.092995748 +1030
-@@ -31,6 +31,8 @@
- #include "SWUtils.h"
- #include <cstdint>
- 
-+using namespace std;
-+
- SPADES_SETTING(r_swUndersampling, "0");
- 
- namespace spades {