realrtcw: rend2 as default renderer, hdpack as splitted package

5 files changed, 18 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6e2beec998e8..25d6e38e9627 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Dec 28 19:17:01 UTC 2017
+# Thu Dec 28 20:38:03 UTC 2017
 pkgbase = realrtcw
-	pkgdesc = RealRTCW brings some realism to the classic Wolfenstein game. You can expect ruthless AI, new weapons and rebalanced gameplay
+	pkgdesc = A mod that brings some realism to the classic Wolfenstein game. You can expect ruthless AI, new weapons and rebalanced gameplay
 	pkgver = 2.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.moddb.com/mods/realrtcw-realism-mod
 	install = realrtcw.install
 	arch = i686
@@ -25,19 +25,15 @@ pkgbase = realrtcw
 	source = http://www.wolfenstein-files.de/rtcw/mods/realrtcw2.2.zip
 	source = http://www.wolfenstein-files.de/rtcw/mods/hdpack2.2.zip
 	source = realrtcw-sp.launcher
-	source = realrtcw-sp-rend2.launcher
 	source = realrtcw-sp.desktop
-	source = realrtcw-sp-rend2.desktop
 	md5sums = 784c0978eba01201d8cab96b949b3a61
 	md5sums = a24763c9d08a87e64c567f6f53296dff
 	md5sums = 800b2b4f9166a46198c093f9c6365bf3
-	md5sums = 9e4b9473a017a92a97d71a5a6429fa8c
 	md5sums = 7e3991e5f331662419ad1ed04e49366c
 	md5sums = 33f08bc165906164461420e1cc6dd86a
-	md5sums = f164bb4457675fd05897e2945e2d8c9d
 
 pkgname = realrtcw
 
-pkgname = realrtcw-rend2
-	pkgdesc = Experimental render for RealRTCW
+pkgname = realrtcw-hdpack
+	pkgdesc = HD Textures for RealRTCW Mod
 
diff --git a/PKGBUILD b/PKGBUILD
index 545604278580..9f34791e2037 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: robertfoster
 
 pkgbase=realrtcw
-pkgname=('realrtcw' 'realrtcw-rend2')
+pkgname=('realrtcw' 'realrtcw-hdpack')
 pkgver=2.2
-pkgrel=1
-pkgdesc="RealRTCW brings some realism to the classic Wolfenstein game. You can expect ruthless AI, new weapons and rebalanced gameplay"
+pkgrel=2
+pkgdesc="A mod that brings some realism to the classic Wolfenstein game. You can expect ruthless AI, new weapons and rebalanced gameplay"
 arch=('i686' 'x86_64')
 url="http://www.moddb.com/mods/realrtcw-realism-mod"
 license=('GPL')
@@ -15,13 +15,8 @@ install='realrtcw.install'
 source=("https://github.com/wolfetplayer/RealRTCW/archive/$pkgver.tar.gz"
 	"http://www.wolfenstein-files.de/rtcw/mods/$pkgname$pkgver.zip"
 	"http://www.wolfenstein-files.de/rtcw/mods/hdpack$pkgver.zip"
-# Classic renderer
 	realrtcw-sp.launcher
-# Alternative renderer launchers
-	realrtcw-sp-rend2.launcher
-# Desktop entries
 	realrtcw-sp.desktop
-	realrtcw-sp-rend2.desktop
 )
 
 build() {
@@ -33,8 +28,6 @@ build() {
 }
 
 package_realrtcw() {
-  
-  mkdir -p $pkgdir/opt/realrtcw/main
   cd "$srcdir/RealRTCW-$pkgver"
   
   make USE_INTERNAL_LIBS=0 COPYDIR=$pkgdir/opt/realrtcw/ copyfiles
@@ -50,16 +43,11 @@ package_realrtcw() {
 
 # Unzipping with flattened paths
   unzip -jo $srcdir/realrtcw$pkgver.zip -d $srcdir
-  unzip -jo $srcdir/hdpack$pkgver.zip -d $srcdir
 
 # Installing RealRTCW pk3
   install -m 755 $srcdir/z_realrtcw.pk3 \
         $pkgdir/opt/realrtcw/main
 
-# Installing RealRTCW HD pack pk3
-  install -m 755 $srcdir/z_hdpack.pk3 \
-        $pkgdir/opt/realrtcw/main
-
 # Modify Launcher Scripts
     if [ "$CARCH" = "x86_64" ]; then
         #
@@ -84,41 +72,22 @@ package_realrtcw() {
         $pkgdir/usr/share/applications/realrtcw-sp.desktop
 
   # Install Icon File (Single Player)
-    install -D -m 644 misc/iortcw.svg \
+    install -Dm 644 misc/iortcw.svg \
         $pkgdir/usr/share/pixmaps/realrtcw.svg
 }
 
-package_realrtcw-rend2() {
-	pkgdesc="Experimental render for RealRTCW"
-	
-# Modify Launcher Scripts
-    if [ "$CARCH" = "x86_64" ]; then
-        #
-        # x86_64 Systems
-        #
-        sed -i "s:ARCH:x86_64:" \
-            $srcdir/realrtcw-sp-rend2.launcher
-    else
-        #
-        # i686 Systems
-        #
-        sed -i "s:ARCH:x86:" \
-            $srcdir/realrtcw-sp-rend2.launcher
-    fi
+package_realrtcw-hdpack() {
+	pkgdesc="HD Textures for RealRTCW Mod"
 
-  # Install Launcher Script (Single Player Client Rend2)
-    install -D -m 755 $srcdir/realrtcw-sp-rend2.launcher \
-        $pkgdir/usr/bin/realrtcw-sp-rend2
+# Unzipping with flattened paths
+  unzip -jo $srcdir/hdpack$pkgver.zip -d $srcdir
 
-  # Install Desktop File (Single Player Rend2)
-    install -D -m 644 $srcdir/realrtcw-sp-rend2.desktop \
-        $pkgdir/usr/share/applications/realrtcw-sp-rend2.desktop
+# Installing RealRTCW HD pack pk3
+  install -D -m 755 $srcdir/z_hdpack.pk3 \
+        $pkgdir/opt/realrtcw/main/z_hdpack.pk3
 }
-
 md5sums=('784c0978eba01201d8cab96b949b3a61'
          'a24763c9d08a87e64c567f6f53296dff'
          '800b2b4f9166a46198c093f9c6365bf3'
-         '9e4b9473a017a92a97d71a5a6429fa8c'
          '7e3991e5f331662419ad1ed04e49366c'
-         '33f08bc165906164461420e1cc6dd86a'
-         'f164bb4457675fd05897e2945e2d8c9d')
+         '33f08bc165906164461420e1cc6dd86a')
diff --git a/realrtcw-sp-rend2.desktop b/realrtcw-sp-rend2.desktop
deleted file mode 100755
index f15988c49189..000000000000
--- a/realrtcw-sp-rend2.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=RealRTCW SP Rend2
-Comment=RealRTCW with Rend2 (Single Player)
-Exec=/usr/bin/realrtcw-sp-rend2
-Icon=/usr/share/pixmaps/realrtcw.svg
-Terminal=false
-Categories=Game
-
diff --git a/realrtcw-sp-rend2.launcher b/realrtcw-sp-rend2.launcher
deleted file mode 100644
index 6a68db7c9214..000000000000
--- a/realrtcw-sp-rend2.launcher
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-cd "/opt/realrtcw"
-exec ./RealRTCW.ARCH +set cl_renderer rend2 +set com_homepath ".realrtcw" "$@"
- 
diff --git a/realrtcw-sp.launcher b/realrtcw-sp.launcher
index 3b9b936f4eb5..6a68db7c9214 100644
--- a/realrtcw-sp.launcher
+++ b/realrtcw-sp.launcher
@@ -1,4 +1,4 @@
 #!/bin/sh
 cd "/opt/realrtcw"
-exec ./RealRTCW.ARCH +set com_homepath ".realrtcw" "$@"
+exec ./RealRTCW.ARCH +set cl_renderer rend2 +set com_homepath ".realrtcw" "$@"