rtcwcoop-git: revamped and reorganized

2 files changed, 24 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 857beb3fe0aa..3127f8831f73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Sep 10 17:28:10 UTC 2017
+# Mon Sep 11 15:45:28 UTC 2017
 pkgbase = rtcwcoop-git
 	pkgdesc = A Return to Castle Wolfenstein modification which enables cooperative gameplay, based on iortcw
 	pkgver = 1.0.2.r3.g8695325f
@@ -21,17 +21,13 @@ pkgbase = rtcwcoop-git
 	depends = zlib
 	noextract = patch-data-141.zip
 	source = rtcwcoop::git+https://github.com/rtcwcoop/rtcwcoop.git
-	source = https://github.com/rtcwcoop/rtcwcoop/releases/download/1.0.2/patch-data-141.zip
 	source = rtcwcoop.launcher
 	source = rtcwcoopded.launcher
-	source = create_pk3.sh
 	source = rtcwcoop.png
 	source = rtcwcoop.desktop
 	md5sums = SKIP
-	md5sums = 291a37caa9d65d0b81f767918b76fa56
 	md5sums = 301306637434f08f4958f1ed4734f68f
 	md5sums = c4b7030bb2739c46eef479fd1f3d1b63
-	md5sums = 32223e6aec5bb6f425d0f7b5a5c41416
 	md5sums = bf26dc4c10d4bbfbd0c7a052a00c3cdf
 	md5sums = d09a95bbf34f3a37a77247c267e4a51b
 
diff --git a/PKGBUILD b/PKGBUILD
index 9b3b13091064..1b5c9fed2759 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,10 +12,8 @@ makedepends=('cmake' 'git')
 noextract=('patch-data-141.zip')
 install='rtcwcoop-git.install'
 source=("rtcwcoop::git+https://github.com/rtcwcoop/rtcwcoop.git"
-	"https://github.com/rtcwcoop/rtcwcoop/releases/download/1.0.2/patch-data-141.zip"
 	'rtcwcoop.launcher'
 	'rtcwcoopded.launcher'
-	'create_pk3.sh'
 	'rtcwcoop.png'
 	'rtcwcoop.desktop')
 
@@ -33,17 +31,10 @@ build() {
 }
 
 package() {
-  
+  cd "$srcdir/rtcwcoop"
+
   mkdir -p $pkgdir/opt/rtcwcoop/{coopmain,main}
-  unzip -o patch-data-141.zip -d $srcdir/patch-data
-  cd $srcdir/patch-data/main
-  cp -r *.pk3 $pkgdir/opt/rtcwcoop/main
-  cp -r scripts $pkgdir/opt/rtcwcoop/main
-  cp -r rotate.cfg $pkgdir/opt/rtcwcoop/main
-  cp -r ../pb $pkgdir/opt/rtcwcoop/main
- 
-  rm $pkgdir/opt/rtcwcoop/main/pb/{*.dll,*.mac,*.exe}
-  
+   
   cd $srcdir/rtcwcoop
   
   make USE_INTERNAL_LIBS=0 COPYDIR=$pkgdir/opt/rtcwcoop/ copyfiles
@@ -51,28 +42,41 @@ package() {
   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/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/sp_pak4.pk3   $pkgdir/opt/rtcwcoop/main
+  ln -s -r /opt/wolf-data/scripts	$pkgdir/opt/rtcwcoop/main 
+  ln -s -r /opt/wolf-data/rotate.cfg	$pkgdir/opt/rtcwcoop/main       
   
  # Create Coop PK3
-  cp $srcdir/create_pk3.sh .
-  ./create_pk3.sh
-  cp media/*.pk3 $pkgdir/opt/rtcwcoop/coopmain
+    if [ "$CARCH" = "x86_64" ]; then
+
+        # x86_64 Systems
+	./create_pk3_64.sh release
+    else
+
+        # i686 Systems
+        ./create_pk3.sh release
+    fi
+
+  cp media/{bin,sp_pak_coop1}.pk3 $pkgdir/opt/rtcwcoop/coopmain
   
  # Modify Launcher Scripts
     if [ "$CARCH" = "x86_64" ]; then
-        #
         # x86_64 Systems
-        #
+
         sed -i "s:ARCH:x86_64:" \
             $srcdir/rtcwcoop.launcher
         sed -i "s:ARCH:x86_64:" \
             $srcdir/rtcwcoopded.launcher
     else
-        #
         # i686 Systems
-        #
+
         sed -i "s:ARCH:i386:" \
             $srcdir/rtcwcoop.launcher
         sed -i "s:ARCH:i386:" \
@@ -91,9 +95,7 @@ package() {
 }
 
 md5sums=('SKIP'
-         '291a37caa9d65d0b81f767918b76fa56'
          '301306637434f08f4958f1ed4734f68f'
          'c4b7030bb2739c46eef479fd1f3d1b63'
-         '32223e6aec5bb6f425d0f7b5a5c41416'
          'bf26dc4c10d4bbfbd0c7a052a00c3cdf'
          'd09a95bbf34f3a37a77247c267e4a51b')