From 473af4135036eaa9054425ab86c4a70e94b07fdf Mon Sep 17 00:00:00 2001
From: alkos333 <me@alkos333.net>
Date: Tue, 11 May 2010 22:23:42 +0200
Subject: [PATCH] libraries/goffice: Updated for version 0.7.0

---
 libraries/goffice/README             |  2 ++
 libraries/goffice/goffice.SlackBuild | 16 +++++++++-------
 libraries/goffice/goffice.info       |  8 ++++----
 libraries/goffice/slack-desc         | 11 ++---------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/libraries/goffice/README b/libraries/goffice/README
index 1678137a54..27b12e9375 100644
--- a/libraries/goffice/README
+++ b/libraries/goffice/README
@@ -1 +1,3 @@
 GOffice -- A glib/gtk set of document centric objects and utilities
+
+In order to compile (not to run), intltool is required.
diff --git a/libraries/goffice/goffice.SlackBuild b/libraries/goffice/goffice.SlackBuild
index ccde43f7d1..908332d2fc 100644
--- a/libraries/goffice/goffice.SlackBuild
+++ b/libraries/goffice/goffice.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for goffice
 
-# Copyright (c) 2007-2008  Alex Lysenka <me@alkos333.net>
+# Copyright (c) 2007 alkos333 <me@alkos333.net>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=goffice
-VERSION=0.6.1
+VERSION=${VERSION:-0.7.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -36,9 +36,11 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+	SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
-    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+	SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+	SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -52,7 +54,7 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=506506#c2
+# patch --gtkdoc-rebase flag evaluation
 patch -p1 < $CWD/gtkdoc-rebase.patch
 
 CFLAGS="$SLKCFLAGS" \
@@ -60,12 +62,12 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
-  --localstatedir=/var
+  --localstatedir=/var \
 
 make
 make install-strip DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS BUGS COPYING ChangeLog INSTALL MAINTAINERS NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/libraries/goffice/goffice.info b/libraries/goffice/goffice.info
index 1af04e8fc8..cdb13c6ffe 100644
--- a/libraries/goffice/goffice.info
+++ b/libraries/goffice/goffice.info
@@ -1,8 +1,8 @@
 PRGNAM="goffice"
-VERSION="0.6.1"
+VERSION="0.7.0"
 HOMEPAGE="http://ftp.gnome.org/pub/GNOME/sources/goffice/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/goffice/0.6/goffice-0.6.1.tar.bz2"
-MD5SUM="faa72fc615f34b4da8c72d06420f5260"
+DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/goffice/0.7/goffice-0.7.0.tar.bz2"
+MD5SUM="835a7d2d57bc406a44ae11e1be6f04ca"
 MAINTAINER="alkos333"
 EMAIL="me@alkos333.net"
-APPROVED="rworkman"
+APPROVED="David Somero"
diff --git a/libraries/goffice/slack-desc b/libraries/goffice/slack-desc
index 229762b8e3..93eb606271 100644
--- a/libraries/goffice/slack-desc
+++ b/libraries/goffice/slack-desc
@@ -1,12 +1,5 @@
-# HOW TO EDIT THIS FILE:
-# 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
-# customary to leave one space after the ':'.
-
-       |-----handy-ruler------------------------------------------------------|
-goffice: GOffice (gtk office programs)
+       |-----handy-ruler----------------------------------------------------|
+goffice: GOffice (document utilities)
 goffice:
 goffice: GOffice is a glib/gtk set of document centric 
 goffice: objects and utilities.