development/geany: Updated for version 0.14

5 files changed, 16 insertions, 21 deletions

diff --git a/development/geany/README b/development/geany/README
index 7d941053e4..f92e77aa9e 100644
--- a/development/geany/README
+++ b/development/geany/README
@@ -1,10 +1,4 @@
-geany 0.13 Small Fast GTK2 IDE
-
 Geany is a text editor using the GTK2 toolkit with basic features of an
 integrated development environment. It was developed to provide a
 small and fast IDE, which has only a few dependencies from other
 packages. It supports many filetypes and has some nice features. 
-
-
-
-
diff --git a/development/geany/doinst.sh b/development/geany/doinst.sh
index 5dc6bb58c0..140e332222 100644
--- a/development/geany/doinst.sh
+++ b/development/geany/doinst.sh
@@ -1,3 +1,3 @@
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database -q usr/share/applications
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
 fi
diff --git a/development/geany/geany.SlackBuild b/development/geany/geany.SlackBuild
index acbc105f79..fed8e1b920 100644
--- a/development/geany/geany.SlackBuild
+++ b/development/geany/geany.SlackBuild
@@ -4,15 +4,14 @@
 
 # Written by  Evan Hisey <ehisey@gmail.com>
 # Modified by Robby Workman <rworkman@slackbuilds.org>
-
-# Exit on most errors
-set -e
+# Modified by Michiel v. Wessem <michiel@slackbuilds.org>
 
 PRGNAM=geany
-VERSION=0.13
+VERSION=0.14
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -22,13 +21,17 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e # Exit on most errors
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $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 .
@@ -57,10 +60,8 @@ make install DESTDIR=$PKG
   for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/{geany/GPL-2,doc/geany/*} $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
+mv $PKG/usr/share/geany/GPL-2 $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a INSTALL THANKS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/development/geany/geany.info b/development/geany/geany.info
index 7dd0e46653..89549c065d 100644
--- a/development/geany/geany.info
+++ b/development/geany/geany.info
@@ -1,8 +1,8 @@
 PRGNAM="geany"
-VERSION="0.13"
+VERSION="0.14"
 HOMEPAGE="http://geany.uvena.de/Main/HomePage"
-DOWNLOAD="http://downloads.sourceforge.net/geany/geany-0.13.tar.bz2"
-MD5SUM="0dc4f30b5ee9132f136fd3e7e4f02e0c"
+DOWNLOAD="http://downloads.sourceforge.net/geany/geany-0.14.tar.bz2"
+MD5SUM="c6c22c7f9feff81a15f5c8ece03b87c1"
 MAINTAINER="Evan Hisey"
 EMAIL="ehisey@gmail.com"
-APPROVED="Michiel"
+APPROVED="rworkman"
diff --git a/development/geany/slack-desc b/development/geany/slack-desc
index 94973e4d5a..b010dd7afc 100644
--- a/development/geany/slack-desc
+++ b/development/geany/slack-desc
@@ -6,7 +6,7 @@
 # leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
-geany: Geany (A small and lightweight Integrated Development Environment)
+geany: Geany (small and lightweight Integrated Development Environment)
 geany:
 geany: Geany is a text editor using the GTK2 toolkit with basic features of
 geany: an integrated development environment. It was developed to provide a