4 files changed, 18 insertions, 23 deletions
diff --git a/games/jag/README b/games/jag/README
index ff76060cba..ff3cd6edd9 100644
--- a/games/jag/README
+++ b/games/jag/README
@@ -1,10 +1,5 @@
 JAG is an arcade-puzzle 2D game which runs on Linux and Windows.
 It is free and opensource.
 
-To use additional themes download them from
-http://jag.xlabsoft.com/themes.php
-and put them in the same directory as jag.SlackBuild. The
-slackbuild will pick them up and install them for you.
-
 There is also an optional level editor that can be installed.
 To install the editor pass JAG_EDITOR="yes" to the slackbuild.
diff --git a/games/jag/jag-editor.desktop b/games/jag/jag-editor.desktop
index 0fbdb27748..54add15131 100644
--- a/games/jag/jag-editor.desktop
+++ b/games/jag/jag-editor.desktop
@@ -2,7 +2,7 @@
 Name=Jag Level Editor
 Comment=JAG is an arcade-puzzle 2D game.
 Exec=jag-editor
-Icon=jag
+Icon=jag-editor
 StartupNotify=false
 Terminal=false
 Type=Application
diff --git a/games/jag/jag.SlackBuild b/games/jag/jag.SlackBuild
index 8589059c55..b9bafeb3e1 100644
--- a/games/jag/jag.SlackBuild
+++ b/games/jag/jag.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=jag
-VERSION=0.3.1
+VERSION=0.3.2
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,14 +43,12 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION-src
 unzip $CWD/$PRGNAM-$VERSION-src.zip
+unzip $CWD/$PRGNAM-$VERSION-data.zip
+mv $PRGNAM-$VERSION-data/data $PRGNAM-$VERSION-src
 cd $PRGNAM-$VERSION-src
-# Check to see if there are any themes in the source directory.
-for i in kde_crystal african animals chinese kde_nuvola creatures futurama toys
-do
-  [ -f $CWD/${PRGNAM}_${i}.zip ] && unzip $CWD/${PRGNAM}_${i}.zip -d data/schemes
-done
-# Remove executable flag from all files.
-find . -type f -exec chmod -x {} \;
+# Correct permissions on all files/folders.
+find . -type f -exec chmod 0644 '{}' \;
+find . -type d -exec chmod 0755 '{}' \;
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -58,14 +56,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix directory locations and library call.
+# Fix directory locations.
 sed -i \
-  -e 's|/usr/local/bin|/usr/bin|g' \
+  -e 's|/usr/local/bin|/usr/games|g' \
   -e 's|/usr/local/games|/usr/share|g' \
-  -e 's|-lSDLmain|-lSDL|' \
   Game.pro main.cpp editor/editor.pro
 
-qmake -unix -o Makefile Game.pro
+qmake -o Makefile Game.pro
 make \
   CFLAGS="-pipe $SLKCFLAGS -Wall -W -D_REENTRANT \$(DEFINES)" \
   CXXFLAGS="-pipe $SLKCFLAGS -Wall -W -D_REENTRANT \$(DEFINES)"
@@ -74,7 +71,7 @@ make install INSTALL_ROOT=$PKG
 # Install the optional level editor.
 if [ "${JAG_EDITOR:-no}" == "yes" ]; then
   cd editor
-    qmake -unix -o Makefile editor.pro
+    qmake -o Makefile editor.pro
     make \
       CFLAGS="-pipe $SLKCFLAGS -Wall -W -D_REENTRANT \$(DEFINES)" \
       CXXFLAGS="-pipe $SLKCFLAGS -Wall -W -D_REENTRANT \$(DEFINES)"
@@ -94,6 +91,7 @@ for i in 16 22 32 48 64 128; do
 done
 if [ "${JAG_EDITOR:-no}" == "yes" ]; then
   install -m 0644 $CWD/$PRGNAM-editor.desktop $PKG/usr/share/applications
+  install -D -m 0644 editor/editoricon.png $PKG/usr/share/pixmaps/$PRGNAM-editor.png
 fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/jag/jag.info b/games/jag/jag.info
index 79fe910c80..6f023472d2 100644
--- a/games/jag/jag.info
+++ b/games/jag/jag.info
@@ -1,10 +1,12 @@
 PRGNAM="jag"
-VERSION="0.3.1"
+VERSION="0.3.2"
 HOMEPAGE="http://jag.xlabsoft.com/index.php"
-DOWNLOAD="http://jag.xlabsoft.com/files/jag-0.3.1-src.zip"
-MD5SUM="78a408629ca9858dc8279d9c124386f7"
+DOWNLOAD="http://jag.xlabsoft.com/files/jag-0.3.2-src.zip \
+          http://jag.xlabsoft.com/files/jag-0.3.2-data.zip"
+MD5SUM="ed4313f2cf57cfc130700e8d91365faa \
+        21a1a36f348f866a0a43cb1a8adf4e2f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
 EMAIL="larryhaja[at]gmail[dot]com"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"