From 13f7898d940099843af3e7875e25629655b21c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Juhl-Johansen=20Z=C3=B6lde-Fej=C3=A9r?=
 <mjjzf@syntaktisk.dk>
Date: Wed, 12 May 2010 17:43:22 +0200
Subject: network/gajim: Updated for version 0.12.1

---
 network/gajim/README           |  2 --
 network/gajim/doinst.sh        |  3 +--
 network/gajim/gajim.SlackBuild | 15 ++++++++-------
 network/gajim/gajim.info       | 12 ++++++------
 network/gajim/slack-desc       | 20 ++++++++++----------
 5 files changed, 25 insertions(+), 27 deletions(-)

(limited to 'network')

diff --git a/network/gajim/README b/network/gajim/README
index 82b4cbbf15..f30f75834b 100644
--- a/network/gajim/README
+++ b/network/gajim/README
@@ -1,3 +1 @@
 Gajim is a GTK+ jabber client written in Python.
-
-This requires pysqlite2 (available at SlackBuilds.org).
diff --git a/network/gajim/doinst.sh b/network/gajim/doinst.sh
index e02f3710f7..4e8ba7071d 100644
--- a/network/gajim/doinst.sh
+++ b/network/gajim/doinst.sh
@@ -1,5 +1,4 @@
-
 if [ -x /usr/bin/update-desktop-database ]; then
-   /usr/bin/update-desktop-database -q usr/share/applications
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
diff --git a/network/gajim/gajim.SlackBuild b/network/gajim/gajim.SlackBuild
index 5d5016a34f..fdab5dd621 100644
--- a/network/gajim/gajim.SlackBuild
+++ b/network/gajim/gajim.SlackBuild
@@ -2,12 +2,11 @@
 
 # Slackware build script for gajim
 # Written by Martin Lefebvre (dadexter@sekurity.com)
-
 # Slightly modified by the SlackBuild Project
-set -e
+# - and once again by Morten Juhl-Johansen Zölde-Fejér <mjjzf@syntaktisk.dk>
 
 PRGNAM=gajim
-VERSION=0.11.4
+VERSION=0.12.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -25,11 +24,13 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -42,10 +43,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  || exit 1
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
diff --git a/network/gajim/gajim.info b/network/gajim/gajim.info
index a00e24951a..49d6565ae9 100644
--- a/network/gajim/gajim.info
+++ b/network/gajim/gajim.info
@@ -1,8 +1,8 @@
 PRGNAM="gajim"
-VERSION="0.11.4"
+VERSION="0.12.1"
 HOMEPAGE="http://gajim.org"
-DOWNLOAD="http://gajim.org/downloads/gajim-0.11.4.tar.bz2"
-MD5SUM="53eb80b280674678f6615eae4a552374"
-MAINTAINER="NO MAINTAINER"
-EMAIL="NO MAINTAINER EMAIL"
-APPROVED="David Somero"
\ No newline at end of file
+DOWNLOAD="http://gajim.org/downloads/gajim-0.12.1.tar.bz2"
+MD5SUM="6e8b2ed004377071f2da3a9f6542f89b"
+MAINTAINER="Morten Juhl-Johansen Zölde-Fejér"
+EMAIL="mjjzf@syntaktisk.dk"
+APPROVED="rworkman"
diff --git a/network/gajim/slack-desc b/network/gajim/slack-desc
index cf6e12adf4..7ba1a418da 100644
--- a/network/gajim/slack-desc
+++ b/network/gajim/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+     |-----handy-ruler-------------------------------------------------------|
 gajim: gajim (GTK+ jabber client)
-gajim: 
+gajim:
 gajim: Gajim is a GTK+ jabber client written in Python.
-gajim: 
-gajim: 
-gajim: 
-gajim: 
-gajim: 
-gajim: 
-gajim: 
-gajim: 
+gajim:
+gajim:
+gajim:
+gajim:
+gajim:
+gajim:
+gajim:
+gajim:
-- 
cgit v1.2.3