From 6d59558f1e33331e029dc21d18de7f554ee3d604 Mon Sep 17 00:00:00 2001
From: Ragnar Thomsen <rthomsen@linuxfromscratch.org>
Date: Sat, 3 Mar 2012 10:53:23 +0000
Subject: [PATCH] Update soprano+correct dep in kde4libs.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9571 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general.ent                        |  2 +-
 introduction/welcome/changelog.xml |  3 ++
 kde4/core/kde4libs.xml             |  2 +-
 server/other/soprano.xml           | 51 +++++++++++++++++++-----------
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/general.ent b/general.ent
index 306a7e2835..766c01575b 100644
--- a/general.ent
+++ b/general.ent
@@ -567,7 +567,7 @@ $Date$
 <!ENTITY openldap-download-version    "stable-20100719">
 <!ENTITY openldap-version             "2.4.23">
 <!ENTITY virtuoso-version             "6.1.2">
-<!ENTITY soprano-version              "2.5.63">
+<!ENTITY soprano-version              "2.7.4">
 <!-- rsync (chapter 14) -->
 <!-- cvs (chapter 12) -->
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index c777ba7d41..3600265b79 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,6 +45,9 @@
       <para>March 3nd, 2012</para>
       <itemizedlist>
         <listitem>
+          <para>[rthomsen] - Updated to Soprano 2.7.4.</para>
+        </listitem>
+	<listitem>
           <para>[rthomsen] - Updated to Kde4libs 4.8.0.</para>
         </listitem>
         <listitem>
diff --git a/kde4/core/kde4libs.xml b/kde4/core/kde4libs.xml
index 7126d55902..3f1b594fef 100644
--- a/kde4/core/kde4libs.xml
+++ b/kde4/core/kde4libs.xml
@@ -104,7 +104,7 @@
     <ulink url="http://www.gitorious.org/grantlee/pages/Home">Grantlee</ulink>, 
     <ulink url="http://oss.sgi.com/projects/fam/">FAM</ulink>, 
     <ulink url="http://www.herqq.org/">HUPnP</ulink>, 
-    <ulink url="http://web.mit.edu/kerberos/www">GSSAPI</ulink> and
+    <xref linkend="mitkrb"/> and
     <ulink url="http://www.openexr.com/">OpenEXR</ulink>
     
     </para>
diff --git a/server/other/soprano.xml b/server/other/soprano.xml
index a4edb23420..db610e5c69 100644
--- a/server/other/soprano.xml
+++ b/server/other/soprano.xml
@@ -6,7 +6,7 @@
 
   <!ENTITY soprano-download-http "&sourceforge-repo;/soprano/soprano-&soprano-version;.tar.bz2">
   <!ENTITY soprano-download-ftp  " ">
-  <!ENTITY soprano-md5sum        "bef6147f1245cd99aa9ad1a37f7d48ac">
+  <!ENTITY soprano-md5sum        "783fb07f9679f45e987aff7a17bef649">
   <!ENTITY soprano-size          "1.9 MB">
   <!ENTITY soprano-buildsize     "23 MB">
   <!ENTITY soprano-time          "1.1 SBU">
@@ -29,10 +29,12 @@
   <sect2 role="package">
     <title>Introduction to Soprano</title>
 
-    <para><application>Soprano</application> Software library that provides 
-    an object oriented C++/Qt4 framework for RDF data.</para>
+    <para><application>Soprano</application> (formally known as QRDF) is a 
+    library which provides a nice Qt interface to RDF storage solutions. It 
+    has a modular structure which allows to  replace the actual RDF storage 
+    implementation used.</para>
 
-    &lfs67_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -69,17 +71,23 @@ no longer required in 4.6
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="qt4"/>,
-    <xref linkend="cmake"/>,
-    <xref linkend="rasqal"/>,
-    <xref linkend="raptor"/>,
+    <xref linkend="cmake"/>, 
+    <xref linkend="qt4"/>, 
+    <xref linkend="dbus"/> and
     <xref linkend="redland"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="clucene"/>,
-    <xref linkend="jdk"/>
+    <xref linkend="libiodbc"/> (required for the Virtuoso backend. Besides, <xref linkend="virtuoso"/> 
+    is required as a runtime dependency for this backend.)
+    </para>
+    
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+    <xref linkend="doxygen"/> (to build the documentation), 
+    <xref linkend="clucene"/> (no longer required to use soprano in KDE4) and 
+    <ulink url="http://www.openrdf.org/">Sesame2</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -106,14 +114,14 @@ make</userinput></screen>
 <screen role="root"><userinput>make install</userinput></screen>
 
 </sect2>
-<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><option>- -xyz</option>: This option is set for ...</para>
+    <para><option>-DSOPRANO_DISABLE_CLUCENE_INDEX=1</option>: Soprano might not 
+    build with recent Clucene versions. Use this option to fix it.</para>
 
   </sect2>
--->
+  
   <sect2 role="configuration">
     <title>Configuration of Soprano</title>
 
@@ -123,22 +131,27 @@ make</userinput></screen>
 <screen role="root"><userinput>install -m755 -d /srv/soprano</userinput></screen>
 
     <para>The <application>soprano</application>d accepts some parameter. To not
-    hardcode them in the startscript, create a configuratuion file:</para>
+    hardcode them in the startscript, create a configuration file:</para>
 
 <screen role="root"><userinput>cat &gt; /etc/sysconfig/soprano &lt;&lt;EOF
 # Begin /etc/sysconfig/soprano
 
 SOPRANO_STORAGE="/srv/soprano"
-SOPRANO_BACKEND="virtuosobackend"        # virtuoso, sesame2, redland
-SOPRANO_OPTIONS="--with-index"           # using CLucene index
+SOPRANO_BACKEND="virtuoso"                       # virtuoso, sesame2, redland
 #SOPRANO_OPTIONS="$SOPRANO_OPTIONS --port 4711"  # Default port is 5000
 
 # End /etc/sysconfig/soprano
 EOF</userinput></screen>
 
-    <sect3 id="soprano-init">
+
+<sect3 id="soprano-init">
       <title>Boot Script</title>
 
+      <note>
+      <para>It is not required to start the soprano server at boottime for KDE4. 
+      KDE4 will start soprano as needed.</para>
+      </note>
+      
       <para>In order to get <application>Soprano</application> started
       automatically when the system is booted, install the
       <filename>/etc/rc.d/init.d/soprano</filename> init script included
@@ -163,10 +176,10 @@ EOF</userinput></screen>
       <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
-        <seg>sopranod, sopranocmd, onto2vocabularyclass</seg>
+        <seg>sopranod, sopranocmd and onto2vocabularyclass</seg>
         <seg>libsoprano.so, libsopranoclient.so, libsopranoserver.so and
         several other libs in /usr/lib/soprano/</seg>
-        <seg>/usr/{lib,share}/soprano</seg>
+	<seg>/usr/include/soprano, /usr/include/Soprano, /usr/share/soprano</seg>
       </seglistitem>
     </segmentedlist>
 <!--