Author: krejzi
Date: 2012-10-05 14:30:08 -0600 (Fri, 05 Oct 2012)
New Revision: 10717

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/office/libreoffice.xml
Log:
LibreOffice 3.6.2.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2012-10-02 18:49:50 UTC (rev 10716)
+++ trunk/BOOK/general.ent      2012-10-05 20:30:08 UTC (rev 10717)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "30">                   <!-- Always 2 digits -->
-<!ENTITY month        "09">                   <!-- Always 2 digits -->
+<!ENTITY day          "05">                   <!-- Always 2 digits -->
+<!ENTITY month        "10">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "September 30th, &year;">
+<!ENTITY releasedate  "October 5th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -778,8 +778,11 @@
 <!ENTITY AbiWord-version              "2.8.6">
 <!ENTITY gnumeric-version             "1.10.17">
 <!ENTITY gnucash-version              "2.4.11">
-<!ENTITY libreoffice-version          "3.6.0">
 
+<!ENTITY libreoffice-version          "3.6.2">
+<!ENTITY libreoffice-patch            ".2">
+<!ENTITY libreoffice-dlversion        
"&libreoffice-version;&libreoffice-patch;">
+
 <!-- Chapter 36 -->
 <!ENTITY seamonkey-version            "2.12.1">
 <!ENTITY firefox-version              "&xulrunner-version;">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2012-10-02 18:49:50 UTC 
(rev 10716)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2012-10-05 20:30:08 UTC 
(rev 10717)
@@ -44,6 +44,15 @@
 
 -->
     <listitem>
+      <para>October 5th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[krejzi] - LibreOffice 3.6.2.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>September 30th, 2012</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/xsoft/office/libreoffice.xml
===================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml     2012-10-02 18:49:50 UTC (rev 
10716)
+++ trunk/BOOK/xsoft/office/libreoffice.xml     2012-10-05 20:30:08 UTC (rev 
10717)
@@ -5,15 +5,15 @@
   %general-entities;
 
   <!ENTITY libreoffice-core-download-http
-    
"http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;/libreoffice-core-&libreoffice-version;.4.tar.xz";>
+           
"http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;/libreoffice-core-&libreoffice-dlversion;.tar.xz";>
   <!ENTITY libreoffice-core-download-ftp  " ">
-  <!ENTITY libreoffice-core-md5sum        "67cf97e86c75363238a371f64ef5f606">
-  <!ENTITY libreoffice-core-size          "102 MB">
-  <!ENTITY libreoffice-buildsize          "7.1 GB (446 MB installed)">
-  <!ENTITY libreoffice-time               "55 SBU">
+  <!ENTITY libreoffice-core-md5sum        "ae171ba4633cc72dba4451b1bdd3385e">
+  <!ENTITY libreoffice-core-size          "105 MB">
+  <!ENTITY libreoffice-buildsize          "5.2 GB (360 MB installed)">
+  <!ENTITY libreoffice-time               "60 SBU">
 ]>
 
-<sect1 id="libreoffice" xreflabel="libreoffice-&libreoffice-version;">
+<sect1 id="libreoffice" xreflabel="LibreOffice-&libreoffice-version;">
   <?dbhtml filename="libreoffice.html"?>
 
   <sect1info>
@@ -21,10 +21,10 @@
     <date>$Date$</date>
   </sect1info>
 
-  <title>libreoffice-&libreoffice-version;</title>
+  <title>LibreOffice-&libreoffice-version;</title>
 
   <indexterm zone="libreoffice">
-    <primary sortas="a-libreoffice">libreoffice</primary>
+    <primary sortas="a-LibreOffice">LibreOffice</primary>
   </indexterm>
 
   <sect2 role="package">
@@ -33,7 +33,7 @@
     <para>
       <application>LibreOffice</application> is a full-featured office suite.
       It is largely compatible with <application>Microsoft Office</application>
-      and is descended from OpenOffice.org.
+      and is descended from <application>OpenOffice.org</application>.
     </para>
 
     &lfs72_checked;
@@ -75,12 +75,16 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Optional patch (required if you have Boost 1.50+): <ulink
-        
url="&patch-root;/libreoffice-core-&libreoffice-version;.4-boost_fix-1.patch"/></para>
+        <para>
+          Required patch:
+          <ulink 
url="&patch-root;/libreoffice-core-&libreoffice-dlversion;-boost_fix-1.patch"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Optional patch (required if you are using system version of 
Poppler): <ulink
-        
url="&patch-root;/libreoffice-core-&libreoffice-version;.4-poppler_fix-1.patch"/></para>
+        <para>
+          Required patch:
+          <ulink 
url="&patch-root;/libreoffice-core-&libreoffice-dlversion;-poppler_fix-1.patch"/>
+        </para>
       </listitem>
     </itemizedlist>
     
@@ -148,7 +152,7 @@
 
     <warning>
       <para>
-        Untaring the libreoffice-core-&libreoffice-version;.4 tarball as
+        Untaring the libreoffice-core-&libreoffice-dlversion; tarball as
         <systemitem class="username">root</systemitem> has the curious effect 
of
         changing the ownership of the <emphasis>parent</emphasis> directory
         to a user with numerical id 11012 and with the permissions set to allow
@@ -171,47 +175,49 @@
       </para>
     </warning>
 
-<screen role="root"><userinput>tar -xf 
libreoffice-core-&libreoffice-version;.4.tar.xz --no-overwrite-dir &amp;&amp;
-cd libreoffice-core-&libreoffice-version;.4</userinput></screen>
+<screen role="root"><userinput>tar -xf 
libreoffice-core-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &amp;&amp;
+cd libreoffice-core-&libreoffice-dlversion;</userinput></screen>
 
     <para>
       Install <application>LibreOffice</application> by running the following
       commands:
     </para>
 
-<screen><userinput>patch -Np1 -i 
../libreoffice-core-&libreoffice-version;.4-boost_fix-1.patch &amp;&amp;
-patch -Np1 -i ../libreoffice-core-&libreoffice-version;.4-poppler_fix-1.patch 
&amp;&amp;
-./autogen.sh --prefix=/usr  \
-  --disable-binfilter       \
-  --disable-gconf           \
-  --disable-mozilla         \
-  --disable-odk             \
-  --disable-postgresql-sdbc \
-  --with-system-boost       \
-  --with-system-cairo       \
-  --with-system-curl        \
-  --with-system-db          \
-  --with-system-expat       \
-  --with-system-gettext     \
-  --with-system-icu         \
-  --with-system-jpeg        \
-  --with-system-libpng      \
-  --with-system-libxml      \
-  --with-system-neon        \
-  --with-system-nss         \
-  --with-system-openssl     \
-  --with-system-poppler     \
-  --with-system-redland     \
-  --with-system-zlib        \
-  --without-java            \
-  --with-num-cpus=$(getconf _NPROCESSORS_ONLN) &amp;&amp;
-./download                                     &amp;&amp;
-mkdir -p ../libreoffice-downloads              &amp;&amp;
-cp src/*.{xz,gz,txt,zip,bz2,tgz,jar,dll,oxt}   \
-      src/*LICENSE* ../libreoffice-downloads   &amp;&amp;
+<screen><userinput>patch -Np1 -i 
../libreoffice-core-&libreoffice-dlversion;-boost_fix-1.patch &amp;&amp;
+patch -Np1 -i ../libreoffice-core-&libreoffice-dlversion;-poppler_fix-1.patch 
&amp;&amp;
+./autogen.sh --prefix=/usr             \
+             --disable-binfilter       \
+             --disable-gconf           \
+             --disable-mozilla         \
+             --disable-odk             \
+             --disable-postgresql-sdbc \
+             --with-system-boost       \
+             --with-system-cairo       \
+             --with-system-curl        \
+             --with-system-db          \
+             --with-system-expat       \
+             --with-system-gettext     \
+             --with-system-icu         \
+             --with-system-jpeg        \
+             --with-system-libpng      \
+             --with-system-libxml      \
+             --with-system-neon        \
+             --with-system-nss         \
+             --with-system-openssl     \
+             --with-system-poppler     \
+             --with-system-redland     \
+             --with-system-zlib        \
+             --without-java            \
+             --with-num-cpus=$(getconf _NPROCESSORS_ONLN) &amp;&amp;
+./download                                                &amp;&amp;
+mkdir -p ../libreoffice-downloads                         &amp;&amp;
+cp src/*.{xz,gz,txt,zip,bz2,tgz,jar,dll,oxt} \
+      src/*LICENSE* ../libreoffice-downloads              &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>
+      This package does not come with a test suite.
+    </para>
 
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
@@ -242,12 +248,6 @@
 
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>patch -Np1 -i
-      ../libreoffice-core-&libreoffice-version;.4-boost_fix-1.patch</command>:
-      Fixes linking to <application>Boost</application> 1.50.
-    </para>
     
     <para>
       <option>--enable-gtk3</option>: Add this option if you've installed and
@@ -367,6 +367,7 @@
       <filename>/usr/share/icons/hicolor/icon-theme.cache</filename> to include
       the new icons.
     </para>
+
   </sect2>
 
   <sect2 role="configuration">
@@ -409,23 +410,16 @@
 
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
       <seglistitem>
         <seg>
-          base,
-          calc,
-          draw,
-          impress,
-          math,
-          printeradmin and
-          writer.</seg>
+          base, calc, draw, impress, math,
+          printeradmin and writer
+        </seg>
         <seg>
-          hundreds of shared libraries in
-          <filename class="directory">/usr/lib/libreoffice</filename>.
+          /usr/lib/libreoffice
         </seg>
-        <seg>/usr/lib/libreoffice.</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -532,6 +526,9 @@
           </indexterm>
         </listitem>
       </varlistentry>
+
     </variablelist>
+
   </sect2>
+
 </sect1>

-- 
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