5 files changed, 47 insertions, 55 deletions
diff --git a/development/gazpacho/README b/development/gazpacho/README
index 24a9c39afd3fc..1eab361cfdccb 100644
--- a/development/gazpacho/README
+++ b/development/gazpacho/README
@@ -1,10 +1,9 @@
-gazpacho (next generation GUI Design)
+gazpacho (Next Generation GUI Design)
 
-gazpacho allows you to create the Graphical User Interface (GUI) of 
-your GTK+ program in a visual way. It started as a Glade-3 clone but 
-now it is more complete and featured than its ancestor. It tries to 
-be compatible with libglade but it can handle some widgets that still
-lack support in libglade.
+This program allows you to create the Graphical User Interface (GUI)
+of your GTK+ program in a visual way. It started as a Glade-3 clone 
+but now it is more complete and featured than its ancestor. It tries
+to be compatible with libglade but it can handle some widgets that 
+still lack support in libglade.
 
-gazpacho depends on PyGTK and kiwi, both of which are available from
-SlackBuilds.org.
+NOTE: Requires kiwi (>= 1.9.6).
diff --git a/development/gazpacho/doinst.sh b/development/gazpacho/doinst.sh
index 7ebfa3ab4d6a2..ff5dd6d54791c 100644
--- a/development/gazpacho/doinst.sh
+++ b/development/gazpacho/doinst.sh
@@ -1,3 +1,4 @@
-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/gazpacho/gazpacho.SlackBuild b/development/gazpacho/gazpacho.SlackBuild
index 85ee4d58d1857..ec56bf499a40a 100644
--- a/development/gazpacho/gazpacho.SlackBuild
+++ b/development/gazpacho/gazpacho.SlackBuild
@@ -1,30 +1,14 @@
 #!/bin/sh
-#
-# Slackware Build Script for gazpacho 
-# (C) 2008 Michael Wagner <lapinours@web.de> 
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Slackware build script for gazpacho
+
+# Written by Mikko Varri (vmj@linuxbox.fi)
+# Public domain.
 
 PRGNAM=gazpacho
-VERSION=0.7.2
+VERSION=${VERSION:-0.7.2}
 ARCH=noarch
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -38,16 +22,23 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz 
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
-# Adjust docdir
-sed -i "s,share/doc/$PRGNAM,doc/$PRGNAM-$VERSION,g" setup.py
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 python setup.py install --root=$PKG
 
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+rmdir $PKG/usr/share/doc
+
+# Gazpacho refuses to start unless /usr/share/doc/gazpacho exists
+( cd $PKG/usr/doc; ln -s $PRGNAM-$VERSION $PRGNAM )
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -55,4 +46,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+
diff --git a/development/gazpacho/gazpacho.info b/development/gazpacho/gazpacho.info
index 25f43cc338794..37bde4b664b5e 100644
--- a/development/gazpacho/gazpacho.info
+++ b/development/gazpacho/gazpacho.info
@@ -3,6 +3,6 @@ VERSION="0.7.2"
 HOMEPAGE="http://gazpacho.sicem.biz/"
 DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gazpacho/0.7/gazpacho-0.7.2.tar.gz"
 MD5SUM="42d180f2570f2f5d6c0fa69ed9897d9b"
-MAINTAINER="Michael Wagner"
-EMAIL="lapinours@web.de"
+MAINTAINER="Mikko Varri"
+EMAIL="vmj@linuxbox.fi"
 APPROVED="rworkman"
diff --git a/development/gazpacho/slack-desc b/development/gazpacho/slack-desc
index e09e71218942a..13c8ea88c714e 100644
--- a/development/gazpacho/slack-desc
+++ b/development/gazpacho/slack-desc
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description.  Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-gazpacho: gazpacho (next generation GUI Design)
-gazpacho:
-gazpacho: gazpacho allows you to create the Graphical User Interface (GUI) of 
-gazpacho: your GTK+ program in a visual way. It started as a Glade-3 clone but 
-gazpacho: now it is more complete and featured than its ancestor. It tries to 
-gazpacho: be compatible with libglade but it can handle some widgets that still
-gazpacho: lack support in libglade.
-gazpacho:
-gazpacho: Homepage: http://gazpacho.sicem.biz/
-gazpacho:
-gazpacho:
+gazpacho: gazpacho (Next Generation GUI Design)
+gazpacho: 
+gazpacho: This program allows you to create the Graphical User Interface (GUI)
+gazpacho: of your GTK+ program in a visual way. It started as a Glade-3 clone 
+gazpacho: but now it is more complete and featured than its ancestor. It tries
+gazpacho: to be compatible with libglade but it can handle some widgets that 
+gazpacho: still lack support in libglade.
+gazpacho: 
+gazpacho: http://gazpacho.sicem.biz
+gazpacho: 
+gazpacho: