From a457e122aaa377caa78472609a63d083885e708a Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Tue, 28 Feb 2012 20:40:56 +0000
Subject: [PATCH] seahorse-3.2.2

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9547 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 gnome/add/seahorse.xml             | 45 ++++++++++++++----------------
 introduction/welcome/changelog.xml |  3 ++
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/general.ent b/general.ent
index 17b92a7216..ff523e8247 100644
--- a/general.ent
+++ b/general.ent
@@ -800,7 +800,7 @@ program you invoke.  Development restarted Feb 12, so commented until a new rele
 <!ENTITY nautilus-sendto-version      "3.0.1">
 <!ENTITY nemiver-version              "0.9.0">
 <!ENTITY rygel-version                "0.12.5">
-<!ENTITY seahorse-version             "2.30.1">
+<!ENTITY seahorse-version             "3.2.2">
 <!ENTITY totem-version                "2.30.2">
 <!ENTITY vinagre-version              "2.30.2">
 
diff --git a/gnome/add/seahorse.xml b/gnome/add/seahorse.xml
index 7fc28b7099..6ccd1229de 100644
--- a/gnome/add/seahorse.xml
+++ b/gnome/add/seahorse.xml
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY seahorse-download-http "&gnome-download-http;/seahorse/&gnome-version;/seahorse-&seahorse-version;.tar.bz2">
-  <!ENTITY seahorse-download-ftp  "&gnome-download-ftp;/seahorse/&gnome-version;/seahorse-&seahorse-version;.tar.bz2">
-  <!ENTITY seahorse-md5sum        "b332279b34acca952807e31534fec592">
-  <!ENTITY seahorse-size          "2.3 MB">
-  <!ENTITY seahorse-buildsize     "66 MB">
-  <!ENTITY seahorse-time          "1.1 SBU">
+  <!ENTITY seahorse-download-http "&gnome-download-http;/seahorse/&gnome-version;/seahorse-&seahorse-version;.tar.xz">
+  <!ENTITY seahorse-download-ftp  "&gnome-download-ftp;/seahorse/&gnome-version;/seahorse-&seahorse-version;.tar.xz">
+  <!ENTITY seahorse-md5sum        "87f34a292f54e01a974695696e5dc842">
+  <!ENTITY seahorse-size          "1.9 MB">
+  <!ENTITY seahorse-buildsize     "51 MB">
+  <!ENTITY seahorse-time          "0.7 SBU">
 ]>
 
 <sect1 id="seahorse" xreflabel="Seahorse-&seahorse-version;">
@@ -33,7 +33,7 @@
     interface for managing and using encryption keys. Currently it supports PGP
     keys (using GPG/GPGME) and SSH keys.</para>
 
-    &lfs65_built;
+    &lfs70_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -60,20 +60,22 @@
     <bridgehead renderas="sect3">Seahorse Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="GConf"/>,
+    <para role="required"><xref linkend="gnome-doc-utils"/>,
     <xref linkend="gnome-doc-utils"/>,
-    <xref linkend="gpgme"/>,
-    <xref linkend="gnupg"/> or <xref linkend="gnupg2"/>, and
+    <xref linkend="gpgme"/> (required for LDAP support) or
+    <xref linkend="gnupg"/> or <xref linkend="gnupg2"/>,
+    <xref linkend="gtk3"/>, and
     <xref linkend="libgnome-keyring"/></para>
 
+    <bridgehead renderas="sect4">Rarian:</bridgehead>
+    <para role="optional"><xref linkend="rarian"/></para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="avahi"/>,
-    <xref linkend="gnome-keyring"/>,
     <xref linkend="gtk-doc"/>,
     <xref linkend="libnotify"/>,
     <xref linkend="libsoup"/>,
-    <xref linkend="openldap"/>, and
-    <xref linkend="rarian"/></para>
+    <xref linkend="openldap"/></para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/seahorse"/></para>
@@ -86,9 +88,7 @@
     <para>Install <application>Seahorse</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --disable-scrollkeeper &amp;&amp;
+<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
@@ -108,10 +108,6 @@ make</userinput></screen>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gnome-sysconfdir.xml"/>
 
-    <para><parameter>--disable-scrollkeeper</parameter>: Do not make updates to
-    the <application>scrollkeeper</application> database. Remove it if you have
-    <application>rarian</application> installed.</para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
@@ -126,9 +122,9 @@ make</userinput></screen>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>seahorse, seahorse-daemon, and xloadimage</seg>
-        <seg>libcryptui.{so,a}</seg>
-        <seg><envar>$GNOME_PREFIX</envar>/{include/libcryptui,lib/seahorse,
+        <seg>seahorse, seahorse-ssh-askpass</seg>
+        <seg>none</seg>
+        <seg><envar>$GNOME_PREFIX</envar>/lib/seahorse,
         share/{gnome/help/seahorse/*,gtk-doc/html/{libcryptui,libseahorse},
         omf/seahorse,pixmaps/seahorse/{22x22,48x48,scalable},seahorse/ui}}</seg>
       </seglistitem>
@@ -150,6 +146,7 @@ make</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <!-- no longer present
       <varlistentry id="seahorse-daemon">
         <term><command>seahorse-daemon</command></term>
         <listitem>
@@ -170,7 +167,7 @@ make</userinput></screen>
             <primary sortas="c-libcryptui">libcryptui.{so,a}</primary>
           </indexterm>
         </listitem>
-      </varlistentry>
+      </varlistentry> -->
 
     </variablelist>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index f95176ef2a..497f73a455 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -50,6 +50,9 @@
         <listitem>
           <para>[abenton] - added Openbox 3.5.0.</para>
         </listitem>
+        <listitem>
+          <para>[ken] - merged seahorse-3.2.2 from Wayne.</para>
+        </listitem>
       </itemizedlist>
     </listitem>