6 files changed, 50 insertions, 11 deletions
diff --git a/development/gazpacho/README b/development/gazpacho/README
index 1eab361cfd..d23a62d353 100644
--- a/development/gazpacho/README
+++ b/development/gazpacho/README
@@ -6,4 +6,4 @@ 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.
 
-NOTE: Requires kiwi (>= 1.9.6).
+This requires kiwi.
diff --git a/development/gazpacho/bin_gazpacho.patch b/development/gazpacho/bin_gazpacho.patch
new file mode 100644
index 0000000000..0c59bd8c7b
--- /dev/null
+++ b/development/gazpacho/bin_gazpacho.patch
@@ -0,0 +1,33 @@
+--- bin/gazpacho.orig	2009-08-17 00:15:26.000000000 +0300
++++ bin/gazpacho	2009-08-17 00:15:44.000000000 +0300
+@@ -40,30 +40,6 @@
+                                    appname,
+                                    string.split(sys.version)[0]))
+ 
+-# Figure out the directy which is the prefix
+-# path-of-current-file/..
+-currentdir = os.path.dirname(os.path.abspath(sys.argv[0]))
+-basedir = os.path.abspath(os.path.join(currentdir, '..'))
+-
+-# Add the base directory where the application is installed in to sys.path
+-if os.path.exists(os.path.join(basedir, 'lib')):
+-    if sys.platform == 'win32':
+-        pythondir = os.path.join(basedir, 'Lib', 'site-packages')
+-    else:
+-        pythondir = os.path.join(basedir, 'lib',
+-                                 'python%d.%d' % sys.version_info[:2],
+-                                 'site-packages')
+-    if not os.path.exists(pythondir):
+-        raise SystemExit("ERROR: Could not find required directory: %s" %
+-                         pythondir)
+-elif not os.path.exists(os.path.join(basedir, dirname)):
+-    raise SystemExit("ERROR: Could not find required directory: %s" %
+-                     os.path.join(basedir, dirname))
+-else:
+-    pythondir = basedir
+-
+-sys.path.insert(0, pythondir)
+-
+ from gazpacho import main
+ 
+ try:
diff --git a/development/gazpacho/doinst.sh b/development/gazpacho/doinst.sh
index ff5dd6d547..4e8ba7071d 100644
--- a/development/gazpacho/doinst.sh
+++ b/development/gazpacho/doinst.sh
@@ -1,4 +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/development/gazpacho/gazpacho.SlackBuild b/development/gazpacho/gazpacho.SlackBuild
index ec56bf499a..9fa983c6b2 100644
--- a/development/gazpacho/gazpacho.SlackBuild
+++ b/development/gazpacho/gazpacho.SlackBuild
@@ -7,8 +7,8 @@
 
 PRGNAM=gazpacho
 VERSION=${VERSION:-0.7.2}
-ARCH=noarch
-BUILD=${BUILD:-2}
+ARCH=${ARCH:-i486}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -31,6 +31,11 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Remove sys.path manipulation which is only needed for the developers who
+# don't want to install the development version (and the manipulation assumes
+# %prefix%/lib/ as the python path).
+patch -p0 < $CWD/bin_gazpacho.patch
+
 python setup.py install --root=$PKG
 
 mkdir -p $PKG/usr/doc
@@ -46,5 +51,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-$ARCH-$BUILD$TAG.tgz
-
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/gazpacho/gazpacho.info b/development/gazpacho/gazpacho.info
index 37bde4b664..c5c3927a8a 100644
--- a/development/gazpacho/gazpacho.info
+++ b/development/gazpacho/gazpacho.info
@@ -3,6 +3,8 @@ 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"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Mikko Varri"
 EMAIL="vmj@linuxbox.fi"
 APPROVED="rworkman"
diff --git a/development/gazpacho/slack-desc b/development/gazpacho/slack-desc
index 13c8ea88c7..085f21c8af 100644
--- a/development/gazpacho/slack-desc
+++ b/development/gazpacho/slack-desc
@@ -7,13 +7,13 @@
 
         |-----handy-ruler------------------------------------------------------|
 gazpacho: gazpacho (Next Generation GUI Design)
-gazpacho: 
+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: 
+gazpacho:
+gazpacho: Homepage: http://gazpacho.sicem.biz
+gazpacho:
+gazpacho: