1 files changed, 23 insertions, 24 deletions
diff --git a/games/UrbanTerror/UrbanTerror.SlackBuild b/games/UrbanTerror/UrbanTerror.SlackBuild
index 5551340c71..2cd35795c4 100644
--- a/games/UrbanTerror/UrbanTerror.SlackBuild
+++ b/games/UrbanTerror/UrbanTerror.SlackBuild
@@ -28,10 +28,10 @@
 #  GPL license - ioUrbanTerror uses the GPL license and its source code
 #   is openly available
 #
-# Full copies of all licenses will be installed in /usr/doc/urbanterror-4.1
+# Full copies of all licenses will be installed in /usr/doc/urbanterror-$VERSION
 
 PRGNAM=UrbanTerror
-VERSION=${VERSION:-4.1.1}
+VERSION=${VERSION:-4.2.015}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,62 +48,61 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-ZIP_VERS=$(echo $VERSION|tr -d ".")
+ZIP_VERS=$(echo $VERSION|cut -d '.' -f -2|tr -d ".")
+MIN_VERS=$(echo $VERSION|cut -d '.' -f 3-)
 
+LIBDIRSUFFIX=
 if [ "$ARCH" = "i486" ]; then
   EXEC="i386"
-  LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
 elif [ "$ARCH" = "i686" ]; then
   EXEC="i386"
-  LIBDIRSUFFIX=${LIBDIRSUFFIX:-""}
 elif [ "$ARCH" = "x86_64" ]; then
   EXEC="x86_64"
-  LIBDIRSUFFIX=${LIBDIRSUFFIX:-"64"}
+  LIBDIRSUFFIX=64
 else
   echo "Unrecognized architecture type! Check the script: $0"
   exit 1
 fi
 
-CLIENT_EXEC=${CLIENT_EXEC:-ioUrbanTerror.${EXEC}}
-SERVER_EXEC=${SERVER_EXEC:-ioUrTded.${EXEC}}
+CLIENT_EXEC=${CLIENT_EXEC:-Quake3-UrT.$EXEC}
+SERVER_EXEC=${SERVER_EXEC:-Quake3-UrT-Ded.$EXEC}
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
-unzip $CWD/${PRGNAM}${ZIP_VERS}.zip -d $PKG/usr/lib${LIBDIRSUFFIX}
+mkdir -p $PKG/usr/share
+unzip $CWD/${PRGNAM}${ZIP_VERS}_full${MIN_VERS}.zip -d $PKG/usr/share
+mv $PKG/usr/share/${PRGNAM}${ZIP_VERS} $PKG/usr/share/$PRGNAM
 
 # Make the current arch execs executable
-chmod 0755 $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/{${CLIENT_EXEC},${SERVER_EXEC}}
+chmod 0755 $PKG/usr/share/$PRGNAM/$CLIENT_EXEC \
+  $PKG/usr/share/$PRGNAM/$SERVER_EXEC
 
 # Create symlinks in /usr/games
 mkdir -p $PKG/usr/games
 cd $PKG/usr/games
-  ln -s ../lib${LIBDIRSUFFIX}/$PRGNAM/${CLIENT_EXEC} urbanterror
-  ln -s ../lib${LIBDIRSUFFIX}/$PRGNAM/${SERVER_EXEC} .
+  ln -sf /usr/share/$PRGNAM/$CLIENT_EXEC urbanterror
+  ln -sf /usr/share/$PRGNAM/$SERVER_EXEC urbanterror_server
 cd -
 
-# Correct the curl dependancy
-echo -e "seta cl_cURLLib \"libcurl.so.4.1.1\"" >> \
-  $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/q3ut4/autoexec.cfg
-
 # Add a menu entry and icon
-mkdir -p $PKG/usr/share/{applications,pixmaps}
+mkdir -p $PKG/usr/share/applications $PKG/usr/share/pixmaps
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 cat $CWD/q3ut.png > $PKG/usr/share/pixmaps/q3ut.png
 
 # Remove unused files from the package
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/{,q3ut4/}*.{doc,exe,url}
-rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/ioUrbanTerror.app/Contents/MacOS
-[ "$EXEC" != "i386" ] && rm -f $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/*.i386
-[ "$EXEC" != "x86_64" ] && rm -f $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/*.x86_64
+( cd $PKG/usr/share/$PRGNAM
+  rm -f *.doc *.exe *.url *.dll *.reg \
+    q3ut4/*.doc q3ut4/*.exe q3ut4/*.url q3ut4/*.dll q3ut4/*.reg
+  rm -rf Quake3-UrT.app* UrTUpdater* )
+[ "$EXEC" != "i386" ] && rm -f $PKG/usr/share/$PRGNAM/*.i386
+[ "$EXEC" != "x86_64" ] && rm -f $PKG/usr/share/$PRGNAM/*.x86_64
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/ioUrbanTerror_* $PKG/usr/doc/$PRGNAM-$VERSION
+install -m 644 $CWD/docs/* $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cp $CWD/docs/*.txt $PKG/usr/doc/$PRGNAM-$VERSION/
 
 mkdir $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc