4 files changed, 19 insertions, 21 deletions
diff --git a/desktop/cairo-dock/README b/desktop/cairo-dock/README
index 9d5a9cf82e1c0..5e1c64d38f544 100644
--- a/desktop/cairo-dock/README
+++ b/desktop/cairo-dock/README
@@ -6,4 +6,4 @@ It uses Cairo/OpenGL to render nice graphics with hardware acceleration,
 which makes it very smooth and low on CPU. It's highly customisable and 
 comes with a lot of ready-to-use themes.
 
-This requires gtkglext
+This requires gtkglext.
diff --git a/desktop/cairo-dock/cairo-dock.SlackBuild b/desktop/cairo-dock/cairo-dock.SlackBuild
index 3fd341ff3ff87..7f89fcbfd3ca2 100644
--- a/desktop/cairo-dock/cairo-dock.SlackBuild
+++ b/desktop/cairo-dock/cairo-dock.SlackBuild
@@ -4,7 +4,6 @@
 # Written by Robert Goodall (cmd.line.geek@gmail.com)
 # Official Site: http://www.glx-dock.org/
 
-
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -22,13 +21,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Set variables
 PRGNAM=cairo-dock
-VERSION=${VERSION:-2.2.0_4}
+VERSION=${VERSION:-2.3.0~2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRC_VERSION=$(printf $VERSION | tr _ -)
+SRCBUILD=1
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -57,38 +55,37 @@ else
     LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUPUT
-cd $TMP || exit 1
-rm -rf $PRGNAM-$SRC_VERSION
-tar -xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz || exit 1
-cd $PRGNAM-$SRC_VERSION
+cd $TMP
+rm -rf $PRGNAM-$VERSION
+tar -xvf $CWD/$PRGNAM-$VERSION.$SRCBUILD.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 cmake \
-  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
   -DLIB_SUFFIX=${LIBDIRSUFFIX} \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DMAN_INSTALL_DIR=/usr/man \
   -DCMAKE_BUILD_TYPE=Release .
 
-make VERBOSE=1 || exit 1
-make install DESTDIR=$PKG || exit
+make VERBOSE=1
+make install DESTDIR=$PKG
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 # Move manpages in the right place
 mv $PKG/usr/share/man $PKG/usr
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ChangeLog INSTALL LGPL-2 LICENSE copyright $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.Slackbuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/cairo-dock/cairo-dock.info b/desktop/cairo-dock/cairo-dock.info
index dad84e8b96262..fb8e432d349e1 100644
--- a/desktop/cairo-dock/cairo-dock.info
+++ b/desktop/cairo-dock/cairo-dock.info
@@ -1,10 +1,10 @@
 PRGNAM="cairo-dock"
-VERSION="2.2.0_4"
+VERSION="2.3.0~2.1"
 HOMEPAGE="http://www.glx-dock.org"
-DOWNLOAD="http://launchpad.net/cairo-dock-core/2.2/2.2.0/+download/cairo-dock-2.2.0-4.tar.gz"
-MD5SUM="5905fed8aaee9b6056a8e2f83a8c4f3f"
+DOWNLOAD="http://launchpad.net/cairo-dock-core/2.3/2.3.0/+download/cairo-dock-2.3.0~2.1.tar.gz"
+MD5SUM="8b0f016affc1dd5b3d2272ff99db4507"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Robert Goodall"
 EMAIL="cmd.line.geek@gmail.com"
-APPROVED="Michiel van Wessem"
+APPROVED="rworkman"
diff --git a/desktop/cairo-dock/doinst.sh b/desktop/cairo-dock/doinst.sh
index 5fb28930db0b9..4e8ba7071dea7 100644
--- a/desktop/cairo-dock/doinst.sh
+++ b/desktop/cairo-dock/doinst.sh
@@ -1,3 +1,4 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+