Author: krejzi
Date: 2012-04-17 04:32:34 -0600 (Tue, 17 Apr 2012)
New Revision: 9931

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/gnome/core/evolution-data-server.xml
   trunk/BOOK/gnome/core/gconf.xml
   trunk/BOOK/gnome/core/gnome-doc-utils.xml
   trunk/BOOK/gnome/core/gnome-keyring.xml
   trunk/BOOK/gnome/core/gnome-online-accounts.xml
   trunk/BOOK/gnome/core/libgweather.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/networking/netlibs/libgdata.xml
   trunk/BOOK/networking/netlibs/librest.xml
Log:
gnome-online-accounts 3.4.0, gnome-keyring 3.4.1, libgweather 3.4.1, 
gnome-doc-utils 0.20.10, libgdata 0.12.0 and gconf instructions tweaks

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2012-04-17 03:49:58 UTC (rev 9930)
+++ trunk/BOOK/general.ent      2012-04-17 10:32:34 UTC (rev 9931)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "16">                   <!-- Always 2 digits -->
+<!ENTITY day          "17">                   <!-- Always 2 digits -->
 <!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "April 16th, &year;">
+<!ENTITY releasedate  "April 17th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -508,7 +508,7 @@
 <!-- Chapter 16 -->
 <!ENTITY curl-version                 "7.25.0">
 <!ENTITY geoclue-version              "0.12.0">
-<!ENTITY libgdata-version             "0.10.1">
+<!ENTITY libgdata-version             "0.12.0">
 <!ENTITY libnice-version              "0.1.1">
 <!ENTITY libnl-version                "3.2.3">
 <!ENTITY libpcap-version              "1.1.1">
@@ -701,12 +701,12 @@
 <!ENTITY GConf-version                "3.2.5">
 <!ENTITY gjs-version                  "1.30.0">
 <!ENTITY gnome-desktop-version        "3.2.1">
-<!ENTITY gnome-doc-utils-version      "0.20.6">
+<!ENTITY gnome-doc-utils-version      "0.20.10">
 <!ENTITY gnome-js-common-version      "0.1.2">
 <!ENTITY libgnomekbd-version          "3.2.0">
 <!ENTITY libgnome-keyring-version     "3.4.1">
 <!ENTITY libgtop-version              "2.28.4">
-<!ENTITY libgweather-version          "3.2.1">
+<!ENTITY libgweather-version          "3.4.1">
 <!ENTITY libpeas-version              "1.2.0">
 <!ENTITY seed-version                 "3.2.0">
 <!ENTITY totem-pl-parser-version      "2.32.6">
@@ -716,7 +716,7 @@
 
 <!-- Shell -->
 <!ENTITY dconf-version                "0.10.0">
-<!ENTITY evolution-data-server-version "3.2.2">
+<!ENTITY evolution-data-server-version "3.4.1">
 <!ENTITY glib-networking-version      "2.32.1">
 <!ENTITY gnome-bluetooth-version      "3.2.1">
 <!ENTITY gnome-control-center-version "3.2.2">
@@ -724,9 +724,9 @@
 <!ENTITY gnome-icon-theme-extras-version "3.0.0">
 <!ENTITY gnome-icon-theme-symbolic-version "3.2.1">
 <!ENTITY gcr-version                  "3.4.1">
-<!ENTITY gnome-keyring-version        "3.2.2">
+<!ENTITY gnome-keyring-version        "3.4.1">
 <!ENTITY gnome-menus-version          "3.2.0.1">
-<!ENTITY gnome-online-accounts-version "3.2.1">
+<!ENTITY gnome-online-accounts-version "3.4.0">
 <!-- <!ENTITY gnome-packagekit-version     "3.2.1"> -->
 <!ENTITY gnome-session-version        "3.2.1">
 <!ENTITY gnome-settings-daemon-version "3.2.2">

Modified: trunk/BOOK/gnome/core/evolution-data-server.xml
===================================================================
--- trunk/BOOK/gnome/core/evolution-data-server.xml     2012-04-17 03:49:58 UTC 
(rev 9930)
+++ trunk/BOOK/gnome/core/evolution-data-server.xml     2012-04-17 10:32:34 UTC 
(rev 9931)
@@ -4,11 +4,13 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY evolution-data-server-download-http 
"&gnome-download-http;/evolution-data-server/&gnome-version;/evolution-data-server-&evolution-data-server-version;.tar.xz">
-  <!ENTITY evolution-data-server-download-ftp  
"&gnome-download-ftp;/evolution-data-server/&gnome-version;/evolution-data-server-&evolution-data-server-version;.tar.xz">
-  <!ENTITY evolution-data-server-md5sum        
"c126e3d2ad64ca0b4fdf2e7e89b01dde">
-  <!ENTITY evolution-data-server-size          "3.6 MB">
-  <!ENTITY evolution-data-server-buildsize     "85 MB">
+  <!ENTITY evolution-data-server-download-http 
+           
"&gnome-download-http;/evolution-data-server/3.4/evolution-data-server-&evolution-data-server-version;.tar.xz">
+  <!ENTITY evolution-data-server-download-ftp
+           
"&gnome-download-ftp;/evolution-data-server/3.4/evolution-data-server-&evolution-data-server-version;.tar.xz">
+  <!ENTITY evolution-data-server-md5sum        
"c1362b0176e9eb8ec810813692dcf3fc">
+  <!ENTITY evolution-data-server-size          "3.7 MB">
+  <!ENTITY evolution-data-server-buildsize     "160 MB">
   <!ENTITY evolution-data-server-time          "2.5 SBU">
 ]>
 
@@ -36,7 +38,7 @@
     <application>Evolution</application> (hence the name), but is now used by
     other packages as well.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -63,34 +65,29 @@
     <bridgehead renderas="sect3">Evolution Data Server 
Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><!--<xref linkend="db"/>, pulled in by libical -->
-    <xref linkend="GConf"/>,
-    <xref linkend="gnome-online-accounts"/>
-    <xref linkend="gperf"/>,
-    <!--<xref linkend="intltool"/>, pulled in by gconf -->
-    <xref linkend="libgdata"/>, <!-- this pulls in libsoup -->
-    <!--<xref linkend="libgnome-keyring"/>, pulled in by libsoup -->
-    <xref linkend="libical"/>, and
-    <xref linkend="nss"/>,</para>
-    <!--<xref linkend="sqlite"/> pulled in by libsoup -->
+    <para role="required">
+      <xref linkend="GConf"/>,
+      <xref linkend="gnome-online-accounts"/>,
+      <xref linkend="gperf"/>,
+      <xref linkend="libgdata"/>,
+      <xref linkend="libical"/> and
+      <xref linkend="nss"/>
+    </para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="libgweather"/>, and
-    <xref linkend="openssl"/></para>
+    <bridgehead renderas="sect4">Recommended (Required if building 
GNOME)</bridgehead>
+    <para role="recommended">
+      <xref linkend="libgweather"/> and
+      <xref linkend="gobject-introspection"/>
+    </para>
 
-    <para>The <application>NSS</application> package is not required if you 
have
-    <xref linkend="firefox"/>, <xref linkend="thunderbird"/>, or <xref
-    linkend="seamonkey"/> installed. These packages contain internal copies of
-    <application>NSS</application> (or they used a system-installed copy).  If
-    any of the three packages are installed, one way or another you will 
already
-    have NSS/NSPR libraries on your system.</para>
-
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/>,
-    <xref linkend="mitkrb"/>,
-    a <xref linkend="server-mail"/> (that provides a 
<command>sendmail</command> command),
-    <xref linkend="openldap"/>, and
-    <xref linkend="vala"/></para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="mitkrb"/>,
+      a <xref linkend="server-mail"/> (that provides a 
<command>sendmail</command> command),
+      <xref linkend="openldap"/> and
+      <xref linkend="vala"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/evolution-data-server"/></para>
@@ -103,10 +100,8 @@
     <para>Install <application>Evolution Data Server</application> by running
     the following commands:</para>
 
-<!-- the install creates $GNOME_PREFIX/lib/evolution-data-server, so
-also use that directory, rahter than a versioned directory, for libexec -->
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --libexecdir=$GNOME_PREFIX/lib/evolution-data-server &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/evolution-data-server &amp;&amp;
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>. Two
@@ -128,57 +123,28 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-    href="../../xincludes/gnome-prefix.xml"/>
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/> -->
 
-    
<para><parameter>--libexecdir=$GNOME_PREFIX/lib/evolution-data-server</parameter>:
+    <para><parameter>--libexecdir=/usr/lib/evolution-data-server</parameter>:
     This parameter causes the libexec files to be installed in the preferred
     location of <filename
-    class="directory">$GNOME_PREFIX/lib/evolution-data-server</filename>
+    class="directory">/usr/lib/evolution-data-server</filename>
     instead of <filename
-    class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+    class="directory">/usr/libexec</filename>.</para>
 
-    <!-- enabled by default
-    <para><parameter>\-\-enable-nntp</parameter>: This parameter is used to 
build
-    the Usenet news (NNTP) backend.</para>-->
-
-    <!-- gnome-keyring is now *required*
-    <para><parameter>\-\-enable-gnome-keyring</parameter>: This parameter is 
used
-    so that passwords are stored using the
-    <application>gnome-keyring</application> storage manager.</para>-->
-
-    <!--- again, enabled by default
-    <para><parameter>\-\-enable-smime</parameter>: This parameter is used to 
pull
-    in the Mozilla Network Security Services libraries for S/MIME
-    support.</para>-->
-
-    <para><option>--with-nspr-includes=/path/to/include/nspr</option>: This
-    parameter specifies the location of the <application>NSPR</application>
-    header files, not needed if <application>nspr</application> was installed
-    in <filename class="directory">/usr</filename>.</para>
-
-    <para><option>--with-nss-includes=/path/to/include/nss</option>: This
-    parameter specifies the location of the <application>NSS</application>
-    header files, not needed if <application>nss</application> was installed
-    in <filename class="directory">/usr</filename>.</para>
-
     <para><option>--without-weather</option>: Use this option to disable the
     weather calendar backend and is required if
     <application>libgweather</application> is not installed.</para>
 
+    <para><parameter>--with-krb5=/usr</parameter>: Enables Kerberos5 support.
+    </para>
+
+    <para><option>--with-openldap</option>: Enables LDAP support.</para>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
-    <!--
-    <para><parameter>-with-{nspr,nss}-includes</parameter>: This parameter is
-    used to identify where the Mozilla Network Security Services interface
-    headers are located. By default,
-    <application>Evolution Data Server</application> uses
-    <filename>mozilla-{nss,nspr}.pc</filename> files to locate the headers
-    and chances are you will not have <application>Mozilla</application>
-    installed.</para>
-    -->
-
     <note>
       <para>To enable many of the optional dependencies, review the information
       from <command>./configure --help</command> for the necessary parameters
@@ -191,31 +157,24 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>camel-index-control-1.2, camel-lock-helper-1.2,
-        e-addressbook-factory, and e-calendar-factory</seg>
-        <seg>libcamel-1.2.so, libcamel-provider-1.2.so, libcamelgroupwise.so,
-        libcamelimap.so, libcamelimapx.so, libcamellocal.so, libcamelnntp.so,
-        libcamelpop3.so, libcamelsendmail.so, libcamelsmtp.so,
-        libebackend-1.2.so, libebook-1.2.so, libebookbackendfile.so,
-        libebookbackendgoogle.so, libebookbackendgroupwise.so,
-        libebookbackendvcf.so, libebookbackendwebdav.so, libecal-1.2.so,
-        libecalbackendcaldav.so, libecalbackendcontacts.so,
-        libecalbackendfile.so, libecalbackendgroupwise.so,
-        libecalbackendhttp.so, libecalbackendweather.so, libedata-book-1.2.so,
-        libedata-cal-1.2.so, libedataserver-1.2.so, libedataserverui-3.0.so,
-        and libegroupwise-1.2.so</seg>
-        
<seg><envar>$GNOME_PREFIX</envar>/{include/evolution-data-server-&gnome-version;/{camel,
-        groupwise,libebackend,libebook,libecal,libedata-book,libedata-cal,
-        libedataserverui},lib/evolution-data-server/{addressbook-backends,
-        calendar-backends,camel-providers},share/{gtk-doc/html/{camel,
-        libebackend,libebook,libecal,libedata-book,libedata-cal,
-        libedataserverui},locale/en_AU/LC_MESSAGES,
-        pixmaps/evolution-data-server}}</seg>
+        <seg>
+          libcamel-1.2.so, libebackend-1.2.so, libebook-1.2.so, 
+          libecal-1.2.so, libedata-book-1.2.so, libedata-cal-1.2.so, 
+          libedataserver-1.2.so and libedataserverui-3.0.so
+        </seg>
+        <seg>
+          /usr/include/evolution-data-server-3.4,
+          /usr/lib/evolution-data-server,
+          /usr/share/evolution-data-server-3.4,
+          /usr/share/gtk-doc/html/{camel,libebackend,libebook},
+          /usr/share/gtk-doc/html/{libecal,libedata-book,libedata-cal},
+          /usr/share/gtk-doc/html/{libedataserver,libedataserverui} and
+          /usr/share/pixmaps/evolution-data-server
+        </seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/gnome/core/gconf.xml
===================================================================
--- trunk/BOOK/gnome/core/gconf.xml     2012-04-17 03:49:58 UTC (rev 9930)
+++ trunk/BOOK/gnome/core/gconf.xml     2012-04-17 10:32:34 UTC (rev 9931)
@@ -5,9 +5,9 @@
   %general-entities;
 
   <!ENTITY GConf-download-http
-  "&gnome-download-http;/GConf/&gnome-version;/GConf-&GConf-version;.tar.xz">
+           "&gnome-download-http;/GConf/3.2/GConf-&GConf-version;.tar.xz">
   <!ENTITY GConf-download-ftp
-  "&gnome-download-ftp;/GConf/&gnome-version;/GConf-&GConf-version;.tar.xz">
+           "&gnome-download-ftp;/GConf/3.2/GConf-&GConf-version;.tar.xz">
   <!ENTITY GConf-md5sum        "1b803eb4f8576c572d072692cf40c9d8">
   <!ENTITY GConf-size          "1.5 MB">
   <!ENTITY GConf-buildsize     "42 MB">
@@ -34,7 +34,7 @@
     <para>The <application>GConf</application> package contains a
     configuration database system.</para>
 
-    &lfs71_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -61,21 +61,24 @@
     <bridgehead renderas="sect3">GConf Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus-glib"/>,
-    <xref linkend="intltool"/>, and
-    <xref linkend="libxml2"/><!--, and
-    <xref linkend="ORBit2"/>--></para>
+    <para role="required">
+      <xref linkend="dbus-glib"/>,
+      <xref linkend="intltool"/> and
+      <xref linkend="libxml2"/>
+    </para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="gtk3"/> (Required if building a
-    <application>GNOME</application> desktop.
-    <command>gconf-sanity-check-2</command> will not build otherwise.) and
-    <xref linkend="polkit"/></para>
+    <bridgehead renderas="sect4">Recommended (Required if building 
GNOME)</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk3"/> and
+      <xref linkend="polkit"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="openldap"/>,
-    <xref linkend="gobject-introspection"/> and
-    <xref linkend="gtk-doc"/></para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/> and
+      <xref linkend="openldap"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gconf"/></para>
@@ -88,12 +91,9 @@
     <para>Install <application>GConf</application> by running the following
     commands:</para>
 
-    <!-- with-gtk=3.0 is the default, and mandir goes to prefix/share/man -->
-
-<screen><userinput>sed -i '/INTROSPECTION_SCANNER_ARGS/s#$# -lgmodule-2.0#' 
gconf/Makefile.in &amp;&amp;
-./configure --prefix=$GNOME_PREFIX \
-            --sysconfdir=$GNOME_SYSCONFDIR \
-            --libexecdir=$GNOME_PREFIX/lib/GConf \
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/GConf \
             --disable-orbit \
             --disable-static &amp;&amp;
 make</userinput></screen>
@@ -104,100 +104,37 @@
     user:</para>
 
 <screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d 
$GNOME_SYSCONFDIR/gconf/gconf.xml.system</userinput></screen>
+install -v -m755 -d /etc/gconf/gconf.xml.system</userinput></screen>
 
-    <para>Still as the <systemitem class="username">root</systemitem> user,
-    configure <application>D-Bus</application> so that it can search for
-    <application>GNOME</application> installed
-    <filename class='extension'>.conf</filename> files (This is assuming
-    that <filename>/etc/dbus-1/system-local.conf</filename> does not exist yet.
-    If it does, then you will need to merge in the changes). If
-    <envar>$GNOME_PREFIX</envar> is not
-    <filename class='directory'>/usr</filename>, you should uncomment the
-    <quote>servicedir</quote> line:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/dbus-1/system-local.conf &lt;&lt; 
"EOF"
-<literal>&lt;!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"&gt;
-&lt;busconfig&gt;
-
-  &lt;!-- Search for .conf files in $GNOME_SYSCONFDIR/dbus-1/system.d --&gt;
-  &lt;includedir&gt;$GNOME_SYSCONFDIR/dbus-1/system.d&lt;/includedir&gt;
-
-  &lt;!-- Search for .service files in 
$GNOME_PREFIX/share/dbus-1/system-services --&gt;
-  &lt;!-- 
&lt;servicedir&gt;$GNOME_PREFIX/share/dbus-1/system-services&lt;/servicedir&gt; 
--&gt;
-
-&lt;/busconfig&gt;
-EOF</literal>
-</userinput></screen>
-
-    <para>If <envar>$GNOME_PREFIX</envar> is not
-    <filename class='directory'>/usr</filename>, you also need to configure
-    <application>D-Bus</application> so that it can search for
-    <application>GNOME</application> installed <quote>session</quote>
-    <filename class='extension'>.service</filename> files (This is assuming
-    that <filename>/etc/dbus-1/session-local.conf</filename> does not exist
-    yet. If it does, then you will need to merge in the changes). Additionally,
-    if <application>polkit</application> is installed, create a symbolic link
-    in <filename class='directory'>/usr/share/polkit-1/actions</filename> to
-    the <quote>action</quote> file installed by
-    <application>GConf</application>. Issue the following commands as the
-    <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>cat &gt; /etc/dbus-1/session-local.conf 
&lt;&lt; "EOF"
-<literal>&lt;!DOCTYPE busconfig PUBLIC
- "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"&gt;
-&lt;busconfig&gt;
-
-  &lt;!-- Search for .service files in 
$GNOME_PREFIX/share/dbus-1/session-services --&gt;
-  
&lt;servicedir&gt;$GNOME_PREFIX/share/dbus-1/session-services&lt;/servicedir&gt;
-
-&lt;/busconfig&gt;
-EOF</literal>
-
-ln -s -v 
<envar>$GNOME_PREFIX</envar>/share/polkit-1/actions/org.gnome.gconf.defaults.policy
 \
-         /usr/share/polkit-1/actions
-</userinput></screen>
-
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
     href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-    href="../../xincludes/gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/> -->
 
-    <para><command>sed -i '/INTROSPECTION_SCANNER_ARGS/s#$# -lgmodule-2.0#'
-    gconf/Makefile.in</command>: This sed fixes compiling with both
-    <application>Glib-2.32</application> and
-    <xref linkend="gobject-introspection"/> installed.</para>
-
-    
<para><parameter>--libexecdir=<envar>$GNOME_PREFIX</envar>/lib/GConf</parameter>:
+    <para><parameter>--libexecdir=/usr/lib/GConf</parameter>:
     This parameter causes the libexec files to be installed in the preferred
-    location of <filename class="directory">$GNOME_PREFIX/lib/GConf</filename>
+    location of <filename class="directory">/usr/lib/GConf</filename>
     instead of <filename
-    class="directory">$GNOME_PREFIX/libexec</filename>.</para>
+    class="directory">/usr/libexec</filename>.</para>
 
     <para><parameter>--disable-orbit</parameter>: This parameter is required if
     <application>ORBit2</application> is not installed.
     <application>ORBit2</application> is a deprecated package.</para>
 
-    <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-    href="../../xincludes/gnome-mandir.xml"/>-->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+    href="../../xincludes/static-libraries.xml"/>
 
-    <para><option>--disable-static</option>: This switch prevents the static
-    libraries being installed.</para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
     <para><command>install -v -m755 -d
-    $GNOME_SYSCONFDIR/gconf/gconf.xml.system</command>: Creates a missing
+    /etc/gconf/gconf.xml.system</command>: Creates a missing
     directory. Without this directory, <command>gconf-sanity-check-2</command>
     will fail during <application>GDM</application> startup and login.</para>
 
@@ -212,14 +149,17 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>gconf-defaults-mechanism, gconf-merge-tree, gconf-sanity-check-2,
-        gconfd-2, gconftool-2, and gsettings-data-convert</seg>
-        <seg>libgconf-2.{so,a}, libgconfbackend-oldxml.{so,a},
-        libgconfbackend-xml.{so,a}, and libgsettingsgconfbackend.{so,a}</seg>
-        <seg><envar>$GNOME_SYSCONFDIR</envar>/{gconf/{2,gconf.xml.defaults,
-        gconf.xml.mandatory,gconf.xml.system},xdg/autostart}
-        <envar>$GNOME_PREFIX</envar>/{include/gconf/2/gconf,lib/GConf/2,
-        share/{gtk-doc/html/gconf,sgml/gconf}}</seg>
+        <seg>
+          gconf-merge-tree, gconftool-2, gsettings-data-convert and
+          gsettings-schema-convert
+        </seg>
+        <seg>
+          libgconf-2.so
+        </seg>
+        <seg>
+          /etc/gconf, /usr/include/gconf, /usr/lib/GConf, /usr/share/GConf,
+          /usr/share/gtk-doc/html/gconf and /usr/share/sgml/gconf
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -260,13 +200,23 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="gsettings-schemas-convert">
+        <term><command>gsettings-schemas-convert</command></term>
+        <listitem>
+          <para>converts between GConf and GSettings schema file 
formats.</para>
+          <indexterm zone="GConf gsettings-schemas-convert">
+            <primary 
sortas="b-gsettings-schemas-convert">gsettings-schemas-convert</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libgconf-2">
-        <term><filename class='libraryfile'>libgconf-2.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libgconf-2.so</filename></term>
         <listitem>
           <para>provide the functions necessary to maintain the
           configuration database.</para>
           <indexterm zone="GConf libgconf-2">
-            <primary sortas="c-libgconf-2">libgconf-2.{so,a}</primary>
+            <primary sortas="c-libgconf-2">libgconf-2.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/gnome/core/gnome-doc-utils.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-doc-utils.xml   2012-04-17 03:49:58 UTC (rev 
9930)
+++ trunk/BOOK/gnome/core/gnome-doc-utils.xml   2012-04-17 10:32:34 UTC (rev 
9931)
@@ -4,11 +4,13 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY gnome-doc-utils-download-http 
"&gnome-download-http;/gnome-doc-utils/0.20/gnome-doc-utils-&gnome-doc-utils-version;.tar.bz2">
-  <!ENTITY gnome-doc-utils-download-ftp  
"&gnome-download-ftp;/gnome-doc-utils/0.20/gnome-doc-utils-&gnome-doc-utils-version;.tar.bz2">
-  <!ENTITY gnome-doc-utils-md5sum        "8f6e05071599bc073007830ea0a68391">
-  <!ENTITY gnome-doc-utils-size          "700 KB">
-  <!ENTITY gnome-doc-utils-buildsize     "19 MB">
+  <!ENTITY gnome-doc-utils-download-http 
+           
"&gnome-download-http;/gnome-doc-utils/0.20/gnome-doc-utils-&gnome-doc-utils-version;.tar.xz">
+  <!ENTITY gnome-doc-utils-download-ftp  
+           
"&gnome-download-ftp;/gnome-doc-utils/0.20/gnome-doc-utils-&gnome-doc-utils-version;.tar.xz">
+  <!ENTITY gnome-doc-utils-md5sum        "3c64ad7bacd617b04999e4a168afaac5">
+  <!ENTITY gnome-doc-utils-size          "516 KB">
+  <!ENTITY gnome-doc-utils-buildsize     "17 MB">
   <!ENTITY gnome-doc-utils-time          "0.2 SBU">
 ]>
 
@@ -33,14 +35,9 @@
     of documentation utilities for the <application>GNOME</application> 
project.
     Notably, it contains utilities for building documentation and all auxiliary
     files in your source tree, and it contains the DocBook XSLT stylesheets 
that
-    were once distributed with <application>Yelp</application>. Starting with
-    <application>GNOME</application> 2.8, <application>Yelp</application>
-    requires <application>GNOME Doc Utils</application> for the XSLT. Starting
-    with <application>GNOME</application> 2.12, many of the core
-    <application>GNOME</application> packages require
-    <application>GNOME Doc Utils</application>.</para>
+    were once distributed with <application>Yelp</application>.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -67,12 +64,16 @@
     <bridgehead renderas="sect3">GNOME Doc Utils Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="intltool"/>,
-    <xref linkend="libxslt"/>, and
-    <xref linkend="python2"/> ( Required to be installed prior to <xref 
linkend="libxml2"/>)</para>
+    <para role="required">
+      <xref linkend="intltool"/>,
+      <xref linkend="libxslt"/>, and
+      <xref linkend="python2"/> (Required to be installed prior to <xref 
linkend="libxml2"/>)
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="rarian"/></para>
+    <para role="recommended">
+      <xref linkend="rarian"/>
+    </para>
 
     <para>The packages are listed as recommended even though
     <application>GNOME Doc Utils</application> will build fine without them.
@@ -89,13 +90,13 @@
   <sect2 role="installation">
     <title>Installation of GNOME Doc Utils</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-    href="../../xincludes/without-gnome.xml"/>
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+    href="../../xincludes/without-gnome.xml"/> -->
 
     <para>Install <application>GNOME Doc Utils</application>
     by running the following commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -106,33 +107,35 @@
 
   </sect2>
 
-  <sect2 role="commands">
+<!--  <sect2 role="commands">
     <title>Command Explanations</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
     href="../../xincludes/gnome-prefix.xml"/>
 
-  </sect2>
+  </sect2> -->
 
   <sect2 role="content">
     <title>Contents</title>
 
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
       <segtitle>Installed Stylesheets</segtitle>
 
       <seglistitem>
-        <seg>gnome-doc-prepare, gnome-doc-tool and xml2po</seg>
-        <seg>None</seg>
-        
<seg><envar>$GNOME_PREFIX</envar>/share/{gnome-doc-utils/{icons/hicolor/{48x48/status,
-        scalable/status},templates,watermarks},gnome/help/{gnome-doc-make/{C,
-        de},gnome-doc-xslt/{C,de}},omf/{gnome-doc-make,gnome-doc-xslt},
-        xml/{gnome/xslt/{common,docbook/{common,html,omf,utils},gettext,
-        mallard/{cache,common,html}},mallard/1.0}}
-        and /usr/lib/python2.7/site-packages/xml2po/</seg>
-        <seg>Custom DocBook XSLT stylesheets</seg>
+        <seg>
+          gnome-doc-prepare, gnome-doc-tool and xml2po
+        </seg>
+        <seg>
+          /usr/lib/python2.7/site-packages/xml2po,
+          /usr/share/gnome-doc-utils, /usr/share/xml/gnome,
+          /usr/share/xml/mallard, /usr/share/gnome/help/gnome-doc-make
+          and /usr/share/gnome/help/gnome-doc-xslt
+        </seg>
+        <seg>
+          Custom DocBook XSLT stylesheets
+        </seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/gnome/core/gnome-keyring.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-keyring.xml     2012-04-17 03:49:58 UTC (rev 
9930)
+++ trunk/BOOK/gnome/core/gnome-keyring.xml     2012-04-17 10:32:34 UTC (rev 
9931)
@@ -4,12 +4,14 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY gnome-keyring-download-http 
"&gnome-download-http;/gnome-keyring/&gnome-version;/gnome-keyring-&gnome-keyring-version;.tar.xz">
-  <!ENTITY gnome-keyring-download-ftp  
"&gnome-download-ftp;/gnome-keyring/&gnome-version;/gnome-keyring-&gnome-keyring-version;.tar.xz">
-  <!ENTITY gnome-keyring-md5sum        "0269f897bf6bc71df8b8cecd5f8e2f6c">
-  <!ENTITY gnome-keyring-size          "1.6 MB">
-  <!ENTITY gnome-keyring-buildsize     "165 MB">
-  <!ENTITY gnome-keyring-time          "1.3 SBU">
+  <!ENTITY gnome-keyring-download-http 
+           
"&gnome-download-http;/gnome-keyring/3.4/gnome-keyring-&gnome-keyring-version;.tar.xz">
+  <!ENTITY gnome-keyring-download-ftp  
+           
"&gnome-download-ftp;/gnome-keyring/3.4/gnome-keyring-&gnome-keyring-version;.tar.xz">
+  <!ENTITY gnome-keyring-md5sum        "607b334b43300465d18676dbc4d97de9">
+  <!ENTITY gnome-keyring-size          "1.1 MB">
+  <!ENTITY gnome-keyring-buildsize     "100 MB">
+  <!ENTITY gnome-keyring-time          "1.0 SBU">
 ]>
 
 <sect1 id="gnome-keyring" xreflabel="gnome-keyring-&gnome-keyring-version;">
@@ -32,7 +34,7 @@
     <para>The <application>gnome-keyring</application> package contains a
     daemon that keeps passwords and other secrets for users.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -56,28 +58,24 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required Patch: <ulink
-        
url="&patch-root;/gnome-keyring-&gnome-keyring-version;-work_without_daemon-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
 
     <bridgehead renderas="sect3">gnome-keyring Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="dbus"/>,
-    <xref linkend="gtk3"/>,
-    <xref linkend="intltool"/>,
-    <xref linkend="libgcrypt"/>,
-    <xref linkend="libtasn1"/>, and
-    <xref linkend="p11-kit"/></para>
+    <para role="required">
+      <xref linkend="dbus"/> and
+      <xref linkend="gcr"/>
+    </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="linux-pam"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/>,
-    <xref linkend="linux-pam"/>, and
-    <ulink url="http://www.valgrind.org";>Valgrind</ulink></para>
+    <para role="optional">
+      <ulink url="http://www.valgrind.org";>Valgrind</ulink>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gnome-keyring"/></para>
@@ -87,16 +85,11 @@
   <sect2 role="installation">
     <title>Installation of gnome-keyring</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-    href="../../xincludes/without-gnome.xml"/>
-
     <para>Install <application>gnome-keyring</application> by running the
     following commands:</para>
 
-<screen><userinput>patch -Np1 -i 
../gnome-keyring-&gnome-keyring-version;-work_without_daemon-1.patch &amp;&amp;
-./configure --prefix=$GNOME_PREFIX \
-            --libexecdir=$GNOME_PREFIX/lib/gnome-keyring \
-            --sysconfdir=$GNOME_SYSCONFDIR \
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
             --with-pam-dir=/lib/security \
             --with-dbus-services=/usr/share/dbus-1/services \
             --with-root-certs=/etc/ssl/certs &amp;&amp;
@@ -113,25 +106,12 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>patch -Np1 -i ...</command>: The patch allows testsuites 
from
-    other packages which invoke <application>gnome-keyring</application>, such 
as
-    <application>NetworkManager,</application> to run even if this 
package&apos;s
-    daemon is not running, for example when you are building a
-    <application>GNOME</application> desktop.</para>
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+    href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-    href="../../xincludes/gnome-prefix.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/> -->
 
-    <para><parameter>--libexecdir=$GNOME_PREFIX/lib/gnome-keyring</parameter>:
-    This parameter causes the libexec files to be installed in the preferred
-    location of <filename
-    class="directory">$GNOME_PREFIX/lib/gnome-keyring</filename> instead of
-    <filename class="directory">$GNOME_PREFIX/libexec</filename>.</para>
-
-    <para><parameter>--sysconfdir=$GNOME_SYSCONFDIR</parameter>: This parameter
-    ensures that the xdg autostart files are installed in a suitable location.
-    </para>
-
     <para><parameter>--with-pam-dir=/lib/security</parameter>: This parameter
     specifies where the pam modules will be installed: you can omit this if you
     have not installed <application>Linux-PAM</application>.</para>
@@ -152,17 +132,18 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>gnome-keyring, gnome-keyring-daemon, and 
gnome-keyring-prompt</seg>
-        <seg>gck-ssh-store-standalone.so, gck-user-store-standalone.so,
-        gnome-keyring-pkcs11.so, gck-roots-store-standalone.so,
-        gck-secret-store-standalone.so, libgcr.so, libgp11.so, and
-        pam_gnome_keyring.so (if Linux-PAM was installed)</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/{gcr,gp11},
-        lib/gnome-keyring/{devel,standalone},share/{gcr/ui,
-        gnome-keyring/{introspect,ui},gtk-doc/html/{gcr,gp11}}}</seg>
+        <seg>
+          gnome-keyring, gnome-keyring-3 and gnome-keyring-daemon
+        </seg>
+        <seg>
+          gnome-keyring-pkcs11.so and pam_gnome_keyring.so
+        </seg>
+        <seg>
+          /usr/lib/gnome-keyring/devel
+        </seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/gnome/core/gnome-online-accounts.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-online-accounts.xml     2012-04-17 03:49:58 UTC 
(rev 9930)
+++ trunk/BOOK/gnome/core/gnome-online-accounts.xml     2012-04-17 10:32:34 UTC 
(rev 9931)
@@ -4,10 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY gnome-online-accounts-download-http 
"&gnome-download-http;/gnome-online-accounts/3.2/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
-  <!ENTITY gnome-online-accounts-download-ftp  
"&gnome-download-ftp;/gnome-online-accounts/3.2/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
-  <!ENTITY gnome-online-accounts-md5sum        
"54ca322afd4c899238460baba4fad7db">
-  <!ENTITY gnome-online-accounts-size          "448 KB">
+  <!ENTITY gnome-online-accounts-download-http 
+           
"&gnome-download-http;/gnome-online-accounts/3.4/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
+  <!ENTITY gnome-online-accounts-download-ftp  
+           
"&gnome-download-ftp;/gnome-online-accounts/3.4/gnome-online-accounts-&gnome-online-accounts-version;.tar.xz">
+  <!ENTITY gnome-online-accounts-md5sum        
"dd1632ab23dc1af5ece70444d486ba84">
+  <!ENTITY gnome-online-accounts-size          "476 KB">
   <!ENTITY gnome-online-accounts-buildsize     "17 MB">
   <!ENTITY gnome-online-accounts-time          "0.3 SBU">
 ]>
@@ -32,7 +34,7 @@
     <para>The <application>gnome-online-accounts</application> package 
contains a
     framework used to access the user&apos;s online accounts.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -59,13 +61,25 @@
     <bridgehead renderas="sect3">gnome-online-accounts 
Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="gtk3"/>,
-    <xref linkend="webkitgtk"/>,
-    <xref linkend="gnome-keyring"/>,
-    <xref linkend="libnotify"/>,
-    <xref linkend="librest"/>, and
-    <xref linkend="json-glib"/></para>
+    <para role="required">
+      <xref linkend="libgnome-keyring"/>,
+      <xref linkend="libnotify"/>,
+      <xref linkend="librest"/>,
+      <xref linkend="json-glib"/> and
+      <xref linkend="webkitgtk"/>
+    </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+      (Required if building GNOME)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gnome-online-accounts"/></para>
 
@@ -77,8 +91,9 @@
     <para>Install <application>gnome-online-accounts</application> by running 
the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --libexecdir=$GNOME_PREFIX/lib/gnome-online-accounts &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/gnome-online-accounts \
+            --disable-static &amp;&amp;
 make</userinput></screen>
 
     <para>This package's testsuite is only intended to be used by the
@@ -93,14 +108,17 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    
<para><parameter>--libexecdir=$GNOME_PREFIX/lib/gnome-online-accounts</parameter>:
+    <para><parameter>--libexecdir=/usr/lib/gnome-online-accounts</parameter>:
     This parameter ensures the <command>goa-demon</command> program is 
installed in
     <filename class="directory">/usr/lib/gnome-online-accounts</filename> for
     conformance with the FHS.</para>
 
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+    href="../../xincludes/static-libraries.xml"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
   <sect2 role="content">
@@ -112,9 +130,16 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>goa-daemon</seg>
-        <seg>libgoa-1.0.{so,a} and libgoa-backend-1.0.{so,a}</seg>
-        
<seg><envar>$GNOME_PREFIX</envar>/{include/goa-1.0/goabackend,lib/gnome-online-accounts,share/icons/hicolor/256x256/apps}</seg>
+        <seg>
+          goa-daemon
+        </seg>
+        <seg>
+          libgoa-1.0.so and libgoa-backend-1.0.so
+        </seg>
+        <seg>
+          /usr/include/goa-1.0, /usr/lib/gnome-online-accounts and
+          /usr/share/gtk-doc/html/goa
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -126,7 +151,7 @@
       <varlistentry id="goa-daemon">
         <term><command>goa-daemon</command></term>
         <listitem>
-          <para>does this .....</para>
+          <para>is gnome-online-accounts daemon.</para>
           <indexterm zone="gnome-online-accounts goa-daemon">
             <primary sortas="b-goa-daemon">goa-daemon</primary>
           </indexterm>
@@ -134,21 +159,21 @@
       </varlistentry>
 
       <varlistentry id="libgoa-1">
-        <term><filename class='libraryfile'>libgoa-1.0.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libgoa-1.0.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>contains gnome-online-accounts API functions.</para>
           <indexterm zone="gnome-online-accounts libgoa-1">
-            <primary sortas="c-libgoa-1">libgoa-1.0.{so,a}</primary>
+            <primary sortas="c-libgoa-1">libgoa-1.0.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
       <varlistentry id="libgoa-backend-1">
-        <term><filename 
class='libraryfile'>libgoa-backend-1.0.{so,a}</filename></term>
+        <term><filename 
class='libraryfile'>libgoa-backend-1.0.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>contains functions used by gnome-online-accounts 
backends.</para>
           <indexterm zone="gnome-online-accounts libgoa-backend-1">
-            <primary 
sortas="c-libgoa-backend-1">libgoa-backend-1.0.{so,a}</primary>
+            <primary 
sortas="c-libgoa-backend-1">libgoa-backend-1.0.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/gnome/core/libgweather.xml
===================================================================
--- trunk/BOOK/gnome/core/libgweather.xml       2012-04-17 03:49:58 UTC (rev 
9930)
+++ trunk/BOOK/gnome/core/libgweather.xml       2012-04-17 10:32:34 UTC (rev 
9931)
@@ -4,12 +4,14 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libgweather-download-http 
"&gnome-download-http;/libgweather/&gnome-version;/libgweather-&libgweather-version;.tar.xz">
-  <!ENTITY libgweather-download-ftp 
"&gnome-download-ftp;/libgweather/&gnome-version;/libgweather-&libgweather-version;.tar.xz">
-  <!ENTITY libgweather-md5sum        "de91f7ed59508d2b96c319e19e27fda5">
-  <!ENTITY libgweather-size          "4.1 MB">
-  <!ENTITY libgweather-buildsize     "253 MB">
-  <!ENTITY libgweather-time          "1.6 SBU">
+  <!ENTITY libgweather-download-http 
+           
"&gnome-download-http;/libgweather/3.4/libgweather-&libgweather-version;.tar.xz">
+  <!ENTITY libgweather-download-ftp  
+           
"&gnome-download-ftp;/libgweather/3.4/libgweather-&libgweather-version;.tar.xz">
+  <!ENTITY libgweather-md5sum        "58ddea04842bd7ff122c7eae29a65815">
+  <!ENTITY libgweather-size          "4.0 MB">
+  <!ENTITY libgweather-buildsize     "120 MB">
+  <!ENTITY libgweather-time          "2.0 SBU">
 ]>
 
 <sect1 id="libgweather" xreflabel="libgweather-&libgweather-version;">
@@ -33,7 +35,7 @@
     access weather information from online services for numerous
     locations.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -60,13 +62,22 @@
     <bridgehead renderas="sect3">libgweather Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
-    <xref linkend="gtk3"/>,
-    <xref linkend="intltool"/>, and
-    <xref linkend="libsoup"/></para>
+    <para role="required">
+      <xref linkend="GConf"/>,
+      <xref linkend="gtk3"/> and
+      <xref linkend="libsoup"/>
+    </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+      (Required if building GNOME)
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gtk-doc"/></para>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libgweather"/></para>
@@ -79,8 +90,9 @@
     <para>Install <application>libgweather</application> by running the 
following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$GNOME_PREFIX \
-            --sysconfdir=$GNOME_SYSCONFDIR &amp;&amp;
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --enable-locations-compression &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -94,47 +106,36 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
     href="../../xincludes/gnome-prefix.xml"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
-    href="../../xincludes/gnome-sysconfdir.xml"/>
+    href="../../xincludes/gnome-sysconfdir.xml"/> -->
 
-    <para><option>--disable-glibtest</option>: Use this parameter if you do
-    <emphasis role="strong">NOT</emphasis> want to compile and run a test GLIB
-    program.</para>
+    <para><option>--enable-locations-compression</option>: 
+    Compress Locations.xml files.</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
-    <para><option>--enable-gtk-doc-html</option>: Use this parameter if you 
want
-    to build documentation in html format.</para>
-
-    <para><option>--enable-gtk-doc-pdf</option>: Use this parameter if you want
-    to build documentation in pdf format.</para>
-
   </sect2>
 
   <sect2 role="content">
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libgweather-3.so</seg>
-        <seg><envar>$GNOME_SYSCONFDIR</envar>/gconf/schemas,
-        <envar>$GNOME_PREFIX</envar>/{include/libgweather-3.0/libgweather,
-        share/{gtk-doc/html/libgweather-3.0,icons/gnome/{16x16/status,
-        22x22/status,24x24/status,32x32/status,scalable/status},libgweather,
-        locale/{es_AR/LC_MESSAGES,es_CL/LC_MESSAGES,es_CO/LC_MESSAGES,
-        
es_CR/LC_MESSAGES,es_DO/LC_MESSAGES,es_EC/LC_MESSAGES,es_ES/LC_MESSAGES,
-        
es_GT/LC_MESSAGES,es_HN/LC_MESSAGES,es_MX/LC_MESSAGES,es_NI/LC_MESSAGES,
-        
es_PA/LC_MESSAGES,es_PE/LC_MESSAGES,es_PR/LC_MESSAGES,es_SV/LC_MESSAGES,
-        es_UY/LC_MESSAGES,es_VE/LC_MESSAGES}}}</seg>
+        <seg>
+          libgweather-3.so
+        </seg>
+        <seg>
+          /usr/include/libgweather-3.0,
+          /usr/share/gtk-doc/html/libgweather-3.0 and
+          /usr/share/libgweather
+        </seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2012-04-17 03:49:58 UTC 
(rev 9930)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2012-04-17 10:32:34 UTC 
(rev 9931)
@@ -42,6 +42,30 @@
 
 -->
     <listitem>
+      <para>April 17th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - libgweather 3.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - gnome-online-accounts 3.4.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - libgdata 0.12.0.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - gnome-doc-utils 0.20.10.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - gnome-keyring 3.4.1.</para>
+        </listitem>
+        <listitem>
+          <para>[krejzi] - evolution-data-server 3.4.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 16th, 2012</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/networking/netlibs/libgdata.xml
===================================================================
--- trunk/BOOK/networking/netlibs/libgdata.xml  2012-04-17 03:49:58 UTC (rev 
9930)
+++ trunk/BOOK/networking/netlibs/libgdata.xml  2012-04-17 10:32:34 UTC (rev 
9931)
@@ -4,11 +4,11 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY libgdata-download-http 
"&gnome-download-http;/libgdata/0.10/libgdata-&libgdata-version;.tar.xz">
-  <!ENTITY libgdata-download-ftp  
"&gnome-download-ftp;/libgdata/0.10/libgdata-&libgdata-version;.tar.xz">
-  <!ENTITY libgdata-md5sum        "f01492964aec95215f7c7ab45c763ae4">
-  <!ENTITY libgdata-size          "1.1 MB">
-  <!ENTITY libgdata-buildsize     "62 MB">
+  <!ENTITY libgdata-download-http 
"&gnome-download-http;/libgdata/0.12/libgdata-&libgdata-version;.tar.xz">
+  <!ENTITY libgdata-download-ftp  
"&gnome-download-ftp;/libgdata/0.12/libgdata-&libgdata-version;.tar.xz">
+  <!ENTITY libgdata-md5sum        "ccf0bd3da08a9e86acf704ef71fb73d6">
+  <!ENTITY libgdata-size          "1.2 MB">
+  <!ENTITY libgdata-buildsize     "45 MB">
   <!ENTITY libgdata-time          "0.8 SBU">
 ]>
 
@@ -34,7 +34,7 @@
     notably, Google's services. It provides APIs to access the common Google
     services, and has full asynchronous support.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -61,12 +61,22 @@
     <bridgehead renderas="sect3">libgdata Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="liboauth"/> and
-    <xref linkend="libsoup"/></para>
+    <para role="required">
+      <xref linkend="liboauth"/> and
+      <xref linkend="libsoup"/> (built with GNOME support).
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="gobject-introspection"/></para>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+      (Required if building GNOME)
+    </para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/libgdata"/></para>
 
@@ -78,7 +88,7 @@
     <para>Install <application>libgdata</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command> Note that
@@ -95,25 +105,28 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>--enable-static=no</option>: This switch prevents the static
-    libraries being installed.</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+    href="../../xincludes/static-libraries.xml"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
   </sect2>
 
   <sect2 role="content">
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Library</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>libgdata.{so,a}</seg>
-        <seg>/usr/{include/libgdata/gdata/{app,atom,gcontact,gd,media,
-        services/{calendar,contacts,documents,picasaweb,youtube}},
-        share/gtk-doc/html/gdata}</seg>
+        <seg>
+          libgdata.so
+        </seg>
+        <seg>
+          /usr/include/libgdata and /usr/share/gtk-doc/html/gdata
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -123,12 +136,12 @@
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="libgdata-lib">
-        <term><filename class='libraryfile'>libgdata.{so,a}</filename></term>
+        <term><filename class='libraryfile'>libgdata.so</filename></term>
         <listitem>
           <para>contains the <application>libgdata</application> API
           functions.</para>
           <indexterm zone="libgdata libgdata-lib">
-            <primary sortas="c-libgdata">libgdata.{so,a}</primary>
+            <primary sortas="c-libgdata">libgdata.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/networking/netlibs/librest.xml
===================================================================
--- trunk/BOOK/networking/netlibs/librest.xml   2012-04-17 03:49:58 UTC (rev 
9930)
+++ trunk/BOOK/networking/netlibs/librest.xml   2012-04-17 10:32:34 UTC (rev 
9931)
@@ -33,7 +33,7 @@
     access web services that claim to be "RESTful". It includes convenience 
wrappers
     for libsoup and libxml to ease remote use of the RESTful API.</para>
 
-    &lfs70_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -60,11 +60,22 @@
     <bridgehead renderas="sect3">librest Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="cacerts"/>,
-    <!--<xref linkend="glib2"/>, pulled in by glib-networking via libsoup -->
-    <xref linkend="libsoup"/></para>
-    <!--<xref linkend="libxml2"/></para> pulled in byglib-networking via 
libsoup -->
+    <para role="required">
+      <xref linkend="cacerts"/> and
+      <xref linkend="libsoup"/>
+    </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+      (Required if building GNOME)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/librest"/></para>
 
@@ -100,14 +111,16 @@
     <title>Contents</title>
 
     <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>None</seg>
-        <seg>librest-0.7.so and librest-extras-0.7.so</seg>
-        
<seg>/usr/{include/rest-0.7/rest-extras,share/gtk-doc/html/rest-0.7}</seg>
+        <seg>
+          librest-0.7.so and librest-extras-0.7.so
+        </seg>
+        <seg>
+          /usr/include/rest-0.7 and /usr/share/gtk-doc/html/rest-0.7
+        </seg>
       </seglistitem>
     </segmentedlist>
 
@@ -119,7 +132,7 @@
       <varlistentry id="librest-0">
         <term><filename class='libraryfile'>librest-0.7.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>contains RESTful web api query functions.</para>
           <indexterm zone="librest librest-0">
             <primary sortas="c-librest-0">librest-0.7.so</primary>
           </indexterm>
@@ -129,7 +142,7 @@
       <varlistentry id="librest-extras-0">
         <term><filename 
class='libraryfile'>librest-extras-0.7.so</filename></term>
         <listitem>
-          <para>contains functions that .....</para>
+          <para>contains extra RESTful web api query functions.</para>
           <indexterm zone="librest librest-extras-0">
             <primary 
sortas="c-librest-extras-0">librest-extras-0.7.so</primary>
           </indexterm>

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to