network/psi: Updated for version 0.15.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

4 files changed, 22 insertions, 33 deletions

diff --git a/network/psi/README b/network/psi/README
index ded41a041e373..291061cf535f1 100644
--- a/network/psi/README
+++ b/network/psi/README
@@ -1,8 +1,8 @@
-Psi is a capable Jabber client aimed at experienced users.  Its design
-goals are simplicity and stability.  Psi is highly portable and runs on
-Windows, Unix/X11, and Mac OS X.
+Psi is a free instant messaging application designed for the XMPP network
+(including Google Talk). Fast and lightweight, Psi is fully open-source
+and compatible with Windows, Linux, and Mac OS X.
 
-Psi is minimal but powerful.  There are keybindings for just about
-everything, Unicode is supported throughout, and contacts are cached
-offline.  Security is also a major consideration, and Psi provides it for
-both client-to-server (SSL) and client-to-client (GnuPG).
+With Psi's full Unicode support and localizations, easy file transfers,
+customizable iconsets, and many other great features, you'll learn why
+users around the world are making the switch to free, open instant
+messaging.
diff --git a/network/psi/psi.SlackBuild b/network/psi/psi.SlackBuild
index 2043ea4c63711..957ed7402cf21 100644
--- a/network/psi/psi.SlackBuild
+++ b/network/psi/psi.SlackBuild
@@ -26,14 +26,11 @@ PRGNAM=psi
 VERSION=${VERSION:-0.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-RC=${RC:-rc2}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -58,17 +55,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-
-if [ -n "$RC" ]; then
-	rm -rf $PRGNAM-$VERSION-$RC
-	tar xvf $CWD/$PRGNAM-$VERSION-$RC.tar.bz2
-	cd $PRGNAM-$VERSION-$RC
-else
-	rm -rf $PRGNAM-$VERSION
-	tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-	cd $PRGNAM-$VERSION
-fi
-
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -102,4 +91,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION$RC-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/psi/psi.info b/network/psi/psi.info
index 8a9177bd22caa..b1089e063f2b0 100644
--- a/network/psi/psi.info
+++ b/network/psi/psi.info
@@ -1,8 +1,8 @@
 PRGNAM="psi"
-VERSION="0.15rc2"
+VERSION="0.15"
 HOMEPAGE="http://psi-im.org/"
-DOWNLOAD="http://downloads.sourceforge.net/psi/psi-0.15-rc2.tar.bz2"
-MD5SUM="610101ee91698eaef7bfe795a2b3e84e"
+DOWNLOAD="http://downloads.sourceforge.net/psi/psi-0.15.tar.bz2"
+MD5SUM="aea15f17cf93e7cea52f305523f761be"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/psi/slack-desc b/network/psi/slack-desc
index 14bbe6d3af76a..ffd97c13fe2a4 100644
--- a/network/psi/slack-desc
+++ b/network/psi/slack-desc
@@ -8,12 +8,12 @@
    |-----handy-ruler------------------------------------------------------|
 psi: Psi (Qt Jabber client)
 psi:
-psi: Psi is a capable Jabber client aimed at experienced users. Its design
-psi: goals are simplicity and stability. Psi is highly portable and runs
-psi: on Windows, Unix/X11, and Mac OS X.
-psi: Psi is minimal but powerful.  There are keybindings for just about
-psi: everything, Unicode is supported throughout, and contacts are cached
-psi: offline. Security is also a major consideration, and Psi provides it
-psi: for both client-to-server (SSL) and client-to-client (GnuPG).
+psi: Psi is a free instant messaging application designed for the XMPP
+psi: network (including Google Talk). Fast and lightweight, Psi is fully
+psi: open-source and compatible with Windows, Linux, and Mac OS X.
+psi:
+psi: With Psi's full Unicode support and localizations, easy file
+psi: transfers, customizable iconsets, and many other great features,
+psi: you'll learn why users around the world are making the switch to free,
+psi: open instant messaging.
 psi:
-psi: Homepage: http://psi-im.org/