From 318a515e5186d92e92ae7cc9cc4a93345148deb9 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Fri, 25 Mar 2011 23:11:31 -0500
Subject: misc/gnome-keyring: Updated for version 2.32.1.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 misc/gnome-keyring/README                   |  2 +-
 misc/gnome-keyring/doinst.sh                |  6 +-----
 misc/gnome-keyring/gnome-keyring.SlackBuild | 13 +++----------
 misc/gnome-keyring/gnome-keyring.info       |  6 +++---
 misc/gnome-keyring/slack-desc               | 14 +++++++-------
 5 files changed, 15 insertions(+), 26 deletions(-)

(limited to 'misc')

diff --git a/misc/gnome-keyring/README b/misc/gnome-keyring/README
index 6065ed76c1e8..9c9b397ce99c 100644
--- a/misc/gnome-keyring/README
+++ b/misc/gnome-keyring/README
@@ -3,4 +3,4 @@ security credentials, such as user names and passwords, in an
 easy to access manner. The keyring is implemented as a daemon
 and uses the process name gnome-keyring-daemon.
 
-This requires libtasn1 and GConf.
+This requires libgnome-keyring.
diff --git a/misc/gnome-keyring/doinst.sh b/misc/gnome-keyring/doinst.sh
index 4f2c24e742d4..96d7857fb5b9 100644
--- a/misc/gnome-keyring/doinst.sh
+++ b/misc/gnome-keyring/doinst.sh
@@ -1,5 +1 @@
-GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
-chroot . gconftool-2 --makefile-install-rule \
-    /etc/gconf/schemas/gnome-keyring.schemas \
-    1>/dev/null 
-
+chroot . /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/
diff --git a/misc/gnome-keyring/gnome-keyring.SlackBuild b/misc/gnome-keyring/gnome-keyring.SlackBuild
index 1cc544502035..1f1dba952055 100644
--- a/misc/gnome-keyring/gnome-keyring.SlackBuild
+++ b/misc/gnome-keyring/gnome-keyring.SlackBuild
@@ -24,7 +24,7 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=gnome-keyring
-VERSION=${VERSION:-2.28.2}
+VERSION=${VERSION:-2.32.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -81,30 +81,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-static \
   --enable-shared \
   --enable-nls \
-  --disable-gtk-doc \
-  --disable-schemas-install \
   --disable-debug \
   --enable-acl-prompts \
   --enable-ssh-agent \
+  --with-root-certs=/etc/ssl/certs \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
-mkdir -p $PKG/etc/gconf/gconf.xml.defaults
-
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS ChangeLog README *.txt COPYING* HACKING TODO INSTALL NEWS \
+  AUTHORS ChangeLog README COPYING* HACKING INSTALL NEWS \
   $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/gnome-keyring html-gnome-keyring
-  ln -s /usr/share/gtk-doc/html/gp11 html-gp11
-)
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/misc/gnome-keyring/gnome-keyring.info b/misc/gnome-keyring/gnome-keyring.info
index b42df083c41b..c2acb14f03a2 100644
--- a/misc/gnome-keyring/gnome-keyring.info
+++ b/misc/gnome-keyring/gnome-keyring.info
@@ -1,8 +1,8 @@
 PRGNAM="gnome-keyring"
-VERSION="2.28.2"
+VERSION="2.32.1"
 HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-DOWNLOAD="http://ftp.gnome.org/Public/GNOME/sources/gnome-keyring/2.28/gnome-keyring-2.28.2.tar.bz2"
-MD5SUM="97ea6823e88b39284187764c1ca95a59"
+DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/gnome-keyring/2.32/gnome-keyring-2.32.1.tar.bz2"
+MD5SUM="9a8aa74e03361676f29d6e73155786fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Stylianos Tsampas"
diff --git a/misc/gnome-keyring/slack-desc b/misc/gnome-keyring/slack-desc
index c353830c6b12..f30acea17560 100644
--- a/misc/gnome-keyring/slack-desc
+++ b/misc/gnome-keyring/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+             |-----handy-ruler------------------------------------------------------|
 gnome-keyring: GNOME Keyring (a tool to handle security credentials)
-gnome-keyring: 
+gnome-keyring:
 gnome-keyring: GNOME Keyring is a program designed to take care of the user's
 gnome-keyring: security credentials, such as user names and passwords, in an
 gnome-keyring: easy to access manner. The keyring is implemented as a daemon
 gnome-keyring: and uses the process name gnome-keyring-daemon.
-gnome-keyring: 
-gnome-keyring: 
-gnome-keyring: 
-gnome-keyring: 
-gnome-keyring: 
+gnome-keyring:
+gnome-keyring:
+gnome-keyring:
+gnome-keyring:
+gnome-keyring:
-- 
cgit v1.2.3