From 9732fa8c34afeaa0486af4a69b6cda9226172c40 Mon Sep 17 00:00:00 2001
From: grey <ginolovesyou@gmail.com>
Date: Wed, 12 May 2010 17:40:12 +0200
Subject: [PATCH] libraries/GConf: Updated for version 2.26.0

---
 libraries/GConf/GConf.SlackBuild | 18 ++++++++++--------
 libraries/GConf/GConf.info       | 12 ++++++------
 libraries/GConf/README           |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/libraries/GConf/GConf.SlackBuild b/libraries/GConf/GConf.SlackBuild
index bd65c1ed46..e59619cdf0 100644
--- a/libraries/GConf/GConf.SlackBuild
+++ b/libraries/GConf/GConf.SlackBuild
@@ -24,9 +24,9 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=GConf
-VERSION=2.9.91
+VERSION=2.26.0
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -36,10 +36,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -48,7 +51,7 @@ 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.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -61,12 +64,13 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --mandir=/usr/man \
   --disable-static \
   --enable-debug=no \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -78,9 +82,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-( cd $PKG/usr/doc/$PRGNAM-$VERSION
-  ln -s /usr/share/gtk-doc/html/gconf html
-)
+( cd $PKG/usr/doc/$PRGNAM-$VERSION ; ln -s /usr/share/gtk-doc/html/gconf html )
 
 find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
 
diff --git a/libraries/GConf/GConf.info b/libraries/GConf/GConf.info
index fc1ccd104f..a8d0a9718b 100644
--- a/libraries/GConf/GConf.info
+++ b/libraries/GConf/GConf.info
@@ -1,8 +1,8 @@
 PRGNAM="GConf"
-VERSION="2.9.91"
+VERSION="2.26.0"
 HOMEPAGE="http://www.gnome.org/projects/gconf/"
-DOWNLOAD="ftp://ftp.gnome.org/pub/GNOME/sources/GConf/2.9/GConf-2.9.91.tar.gz"
-MD5SUM="39ba344cfdba395429bafec9bf3e505d"
-MAINTAINER="koolniczka"
-EMAIL="koolniczka@szm.com"
-APPROVED="alien"
+DOWNLOAD="ftp://ftp.gnome.org/pub/GNOME/sources/GConf/2.26/GConf-2.26.0.tar.bz2"
+MD5SUM="b010f0de356ea093c6a73778b13de956"
+MAINTAINER="grey"
+EMAIL="ginolovesyou@gmail.com"
+APPROVED="rworkman"
diff --git a/libraries/GConf/README b/libraries/GConf/README
index 48c2e67368..f8939c60fd 100644
--- a/libraries/GConf/README
+++ b/libraries/GConf/README
@@ -3,6 +3,6 @@ Windows registry and annoying in the same manner.  It's being written
 for the GNOME desktop but does not require GNOME; configure should 
 notice if GNOME is not installed and compile the basic GConf library anyway.
 
-Compilation on a clean Slackware 12.1 system additionally requires ORBit2
+Compilation on a clean Slackware 12.2 system additionally requires ORBit2
 to be installed first.  A SlackBuild for ORBit2 is available from the
 SlackBuilds.org repository.