From e7d92ea90c627c96d79b45a8ec6088c14619a310 Mon Sep 17 00:00:00 2001
From: Larry Lawrence <larry@linuxfromscratch.org>
Date: Wed, 12 Nov 2003 03:22:47 +0000
Subject: [PATCH] update to GConf-2.4.0.1

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@1494 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 gnome/lib/gconf/gconf-exp.xml         |  6 +-----
 gnome/lib/gconf/gconf-inst.xml        |  4 ++--
 gnome/lib/gconf/gconf.ent             |  6 +++---
 gnome/lib/libbonobo/libbonobo-exp.xml | 13 +++++++++++++
 introduction/welcome/changelog.xml    |  3 +++
 5 files changed, 22 insertions(+), 10 deletions(-)
 create mode 100644 gnome/lib/libbonobo/libbonobo-exp.xml

diff --git a/gnome/lib/gconf/gconf-exp.xml b/gnome/lib/gconf/gconf-exp.xml
index 22538e77a2..68e06aefdf 100644
--- a/gnome/lib/gconf/gconf-exp.xml
+++ b/gnome/lib/gconf/gconf-exp.xml
@@ -1,7 +1,7 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><parameter>--libexecdir=$GNOME_PREFIX/sbin</parameter>: This switch puts
+<para><parameter>--libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin</parameter>: This switch puts
 libexec files in <filename class="directory">$GNOME_PREFIX/sbin</filename> instead of
 <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
 
@@ -11,9 +11,5 @@ puts configuration files in <filename class="directory">/etc/gnome</filename> in
 future installations of schemas, changes in location, including
 eliminating this command <emphasis>must</emphasis> be consistent.</para>
 
-<para><option>--disable-gtk-doc</option>: This switch will
-prevent the rebuilding of documentation during the
-<command>make</command> command.</para>
-
 </sect2>
 
diff --git a/gnome/lib/gconf/gconf-inst.xml b/gnome/lib/gconf/gconf-inst.xml
index 13ab5eacfa..d1ab68eef8 100644
--- a/gnome/lib/gconf/gconf-inst.xml
+++ b/gnome/lib/gconf/gconf-inst.xml
@@ -3,8 +3,8 @@
 
 <para>Install <application>GConf</application> by running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=$GNOME_PREFIX --libexecdir=$GNOME_PREFIX/sbin \
---sysconfdir=/etc/gnome --disable-gtk-doc &amp;&amp;
+<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+--libexecdir=`pkg-config --variable=prefix ORBit-2.0`/sbin --sysconfdir=/etc/gnome &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
 
diff --git a/gnome/lib/gconf/gconf.ent b/gnome/lib/gconf/gconf.ent
index ec36af7cfb..4cea6cdd3e 100644
--- a/gnome/lib/gconf/gconf.ent
+++ b/gnome/lib/gconf/gconf.ent
@@ -3,9 +3,9 @@
 <!ENTITY GConf-inst SYSTEM "gconf-inst.xml">
 <!ENTITY GConf-exp SYSTEM "gconf-exp.xml">
 <!ENTITY GConf-desc SYSTEM "gconf-desc.xml">
-<!ENTITY GConf-version "2.2.1">
+<!ENTITY GConf-version "2.4.0.1">
 <!ENTITY GConf-download-http "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.2/GConf-&GConf-version;.tar.bz2">
 <!ENTITY GConf-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/GConf/2.2/GConf-&GConf-version;.tar.bz2">
-<!ENTITY GConf-size "1.1 MB">
-<!ENTITY GConf-buildsize "25.4 MB">
+<!ENTITY GConf-size "1.3 MB">
+<!ENTITY GConf-buildsize "24.7 MB">
 <!ENTITY GConf-time "0.56 SBU">
diff --git a/gnome/lib/libbonobo/libbonobo-exp.xml b/gnome/lib/libbonobo/libbonobo-exp.xml
new file mode 100644
index 0000000000..36264cf125
--- /dev/null
+++ b/gnome/lib/libbonobo/libbonobo-exp.xml
@@ -0,0 +1,13 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--prefix=`pkg-config --variable=prefix
+ORBit=2.0`</parameter>: Setting the prefix with this command instead of
+with <envar>GNOME_PREFIX</envar> will insure that the prefix is
+consistent with the installation environment.</para>
+
+<para><option>--enable-gtk-doc</option>: This switch rebuilds the
+documentation during the <command>make</command> command.</para>
+
+</sect2>
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index d07a9455cf..5fbf333e24 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -11,6 +11,9 @@ who wrote what.</para>
 
 <itemizedlist>
 
+<listitem><para>November 11th, 2003 [larry]: updated to
+GConf-2.4.0.1.</para></listitem>
+
 <listitem><para>November 11th, 2003 [igor]: Updated to
 libmng-1.0.6.</para></listitem>