rtcwcoop-git: updated and some cleanups

2 files changed, 30 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38e1df259250..8b6d16c3882e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Sep 10 16:00:47 UTC 2017
+# Sun Sep 10 16:16:03 UTC 2017
 pkgbase = rtcwcoop-git
 	pkgdesc = A Return to Castle Wolfenstein modification which enables cooperative gameplay, based on iortcw
-	pkgver = 1634
+	pkgver = 1.0.2.r3.g8695325f
 	pkgrel = 1
 	url = http://www.rtcwcoop.com
 	install = rtcwcoop-git.install
@@ -11,7 +11,7 @@ pkgbase = rtcwcoop-git
 	license = GPL
 	makedepends = cmake
 	makedepends = git
-	depends = wolf-data
+	depends = iortcw-data
 	depends = sdl2
 	depends = opus
 	depends = opusfile
@@ -26,7 +26,7 @@ pkgbase = rtcwcoop-git
 	md5sums = SKIP
 	md5sums = e08aab38a8574877258986038f043f89
 	md5sums = 6630b979c5f9b4ea6e7ff0e2927fa1e1
-	md5sums = cbdfd0fcc3b6ca0bec6cc28c0ec66aa8
+	md5sums = 32223e6aec5bb6f425d0f7b5a5c41416
 	md5sums = bf26dc4c10d4bbfbd0c7a052a00c3cdf
 	md5sums = f24dc703585569ba11ba0b94625ee8e0
 
diff --git a/PKGBUILD b/PKGBUILD
index 18703a295037..8f8db81f90b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: M0Rf30
 pkgname=rtcwcoop-git
-pkgver=1634 
+pkgver=1.0.2.r3.g8695325f 
 pkgrel=1
 pkgdesc="A Return to Castle Wolfenstein modification which enables cooperative gameplay, based on iortcw"
 arch=('i686' 'x86_64')
 url="http://www.rtcwcoop.com"
 license=('GPL')
-depends=('wolf-data' 'sdl2' 'opus' 'opusfile' 'libogg' 'zlib')
+depends=('iortcw-data' 'sdl2' 'opus' 'opusfile' 'libogg' 'zlib')
 makedepends=('cmake' 'git')
 install='rtcwcoop-git.install'
 source=("rtcwcoop::git+https://github.com/rtcwcoop/rtcwcoop.git"
@@ -23,9 +23,9 @@ pkgver() {
 
 
 build() {
-  if [ ! -f /opt/wolf-data/pak0.pk3 ]; then
+  if [ ! -f /opt/iortcw-data/pak0.pk3 ]; then
    echo "pak0.pk3 doesn't exist. The game will not start"
-   echo "Follow the wolf-data package instructions!"
+   echo "Follow the iortcw-data package instructions!"
    sleep 5
   fi
 }
@@ -35,31 +35,29 @@ package() {
   mkdir -p $pkgdir/opt/rtcwcoop/{coopmain,main}
   cd rtcwcoop
   
-  cd SP
-  make USE_INTERNAL_LIBS=0 COPYDIR=$pkgdir/opt/rtcwcoop/ copyfiles
-  cd ../MP
   make USE_INTERNAL_LIBS=0 COPYDIR=$pkgdir/opt/rtcwcoop/ copyfiles
   
-  ln -s -r /opt/wolf-data/mp_bin.pk3	$pkgdir/opt/rtcwcoop/main
-  ln -s -r /opt/wolf-data/mp_pak0.pk3   $pkgdir/opt/rtcwcoop/main
-  ln -s -r /opt/wolf-data/mp_pak1.pk3	$pkgdir/opt/rtcwcoop/main
-  ln -s -r /opt/wolf-data/mp_pak2.pk3	$pkgdir/opt/rtcwcoop/main  
-  ln -s -r /opt/wolf-data/mp_pak3.pk3	$pkgdir/opt/rtcwcoop/main
-  ln -s -r /opt/wolf-data/mp_pak4.pk3	$pkgdir/opt/rtcwcoop/main
-  ln -s -r /opt/wolf-data/mp_pak5.pk3	$pkgdir/opt/rtcwcoop/main
-  ln -s -r /opt/wolf-data/mp_pakmaps0.pk3	$pkgdir/opt/rtcwcoop/main  
-  ln -s -r /opt/wolf-data/mp_pakmaps1.pk3	$pkgdir/opt/rtcwcoop/main
-  ln -s -r /opt/wolf-data/mp_pakmaps2.pk3	$pkgdir/opt/rtcwcoop/main  
-  ln -s -r /opt/wolf-data/mp_pakmaps3.pk3	$pkgdir/opt/rtcwcoop/main
-  ln -s -r /opt/wolf-data/mp_pakmaps4.pk3	$pkgdir/opt/rtcwcoop/main  
-  ln -s -r /opt/wolf-data/mp_pakmaps5.pk3	$pkgdir/opt/rtcwcoop/main
-  ln -s -r /opt/wolf-data/mp_pakmaps6.pk3	$pkgdir/opt/rtcwcoop/main  
-  ln -s -r /opt/wolf-data/scripts	$pkgdir/opt/rtcwcoop/main 
-  ln -s -r /opt/wolf-data/pak0.pk3	$pkgdir/opt/rtcwcoop/main
-  ln -s -r /opt/wolf-data/sp_pak1.pk3	$pkgdir/opt/rtcwcoop/main
-  ln -s -r /opt/wolf-data/sp_pak2.pk3	$pkgdir/opt/rtcwcoop/main
-  ln -s -r /opt/wolf-data/sp_pak3.pk3	$pkgdir/opt/rtcwcoop/main
-  ln -s -r /opt/wolf-data/rotate.cfg	$pkgdir/opt/rtcwcoop/main     
+  ln -s -r /opt/iortcw-data/mp_bin.pk3	$pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/mp_pak0.pk3   $pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/mp_pak1.pk3	$pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/mp_pak2.pk3	$pkgdir/opt/rtcwcoop/main  
+  ln -s -r /opt/iortcw-data/mp_pak3.pk3	$pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/mp_pak4.pk3	$pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/mp_pak5.pk3	$pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/mp_pakmaps0.pk3	$pkgdir/opt/rtcwcoop/main  
+  ln -s -r /opt/iortcw-data/mp_pakmaps1.pk3	$pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/mp_pakmaps2.pk3	$pkgdir/opt/rtcwcoop/main  
+  ln -s -r /opt/iortcw-data/mp_pakmaps3.pk3	$pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/mp_pakmaps4.pk3	$pkgdir/opt/rtcwcoop/main  
+  ln -s -r /opt/iortcw-data/mp_pakmaps5.pk3	$pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/mp_pakmaps6.pk3	$pkgdir/opt/rtcwcoop/main  
+  ln -s -r /opt/iortcw-data/scripts	$pkgdir/opt/rtcwcoop/main 
+  ln -s -r /opt/iortcw-data/pak0.pk3	$pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/sp_pak1.pk3	$pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/sp_pak2.pk3	$pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/sp_pak3.pk3	$pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/sp_pak4.pk3	$pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/iortcw-data/rotate.cfg	$pkgdir/opt/rtcwcoop/main    
   
  # Create Coop PK3
   cp $srcdir/create_pk3.sh .
@@ -100,6 +98,6 @@ package() {
 md5sums=('SKIP'
          'e08aab38a8574877258986038f043f89'
          '6630b979c5f9b4ea6e7ff0e2927fa1e1'
-         'cbdfd0fcc3b6ca0bec6cc28c0ec66aa8'
+         '32223e6aec5bb6f425d0f7b5a5c41416'
          'bf26dc4c10d4bbfbd0c7a052a00c3cdf'
          'f24dc703585569ba11ba0b94625ee8e0')