Ticket #2507: OOo_2nd.diff

xsoft/suites/openoffice.xml

@@ -161 +161 @@
     <para>The <application>OpenOffice</application> source code is now
     distributed in several tarballs.  You should extract each from the
     same top-level directory before entering the build directory.  At
-    a minimum, you will need to extract the src and core tarballs.
-    Additionally, the source directory name is not consistent with
-    the tarball name and will be named
+    a minimum, you will need to extract the <quote>Core</quote> and
+    <quote>System</quote>. Note that the source directory name is not
+    consistent with the tarball name and will be named
     <filename class='directory'>OOG680_m9</filename>.</para>
 
     <para>If you wish to build an in-tree <application>Mozilla</application>,
@@ -196 +196 @@
       <command>configure</command>.</para>
     </note>
 
-    <para>Configure <application>OpenOffice</application> using the following
-    commands:</para>
+    <para><application>OpenOffice</application> fails to compile if
+    <command>umask</command> is set to something exotic. The build can also
+    fail if the <envar>LANG</envar> or <envar>LC_ALL</envar> environment
+    variables are set. Use the following commands to change your
+    environment accordingly:</para>
 
-<screen><userinput>pushd config_office &amp;&amp;
+<screen><userinput>umask 0022 &amp;&amp;
+unset LANG LC_ALL</userinput></screen>
+
+    <para>Install <application>OpenOffice</application> by running the
+    following commands:</para>
+
+<screen><userinput>patch -Np1 -i ../OOo_&openoffice-version;-use_bin_hsqldb-1.patch &amp;&amp;
+
+pushd config_office &amp;&amp;
 ./configure --prefix=/opt/openoffice-&openoffice-version; \
             --enable-libart                \
             --disable-fontooo              \
@@ -220 +231 @@
             --disable-odk                  \
             --disable-qadevooo             \
             --with-use-shell=bash &amp;&amp;
-popd</userinput></screen>
-
-    <para><application>OpenOffice</application> fails to compile if
-    <command>umask</command> is set to something exotic. The build can also
-    fail if the <envar>LANG</envar> or <envar>LC_ALL</envar> environment
-    variables are set. Use the following commands to change your
-    environment accordingly:</para>
-
-<screen><userinput>umask 0022 &amp;&amp;
-unset LANG LC_ALL</userinput></screen>
-
-    <para>Compile <application>OpenOffice</application> using the following
-    commands:</para>
+popd &amp;&amp;
 
-<screen><userinput>patch -Np1 -i ../OOo_&openoffice-version;-use_bin_hsqldb-1.patch &amp;&amp;
 ./bootstrap &amp;&amp;
 source LinuxX86Env.Set.sh &amp;&amp;
 dmake</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
 
-    <para>Install <application>OpenOffice</application> as the
-    <systemitem class="username">root</systemitem> user with the
-    following commands:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem>
+     user:</para>
 
 <screen role="root"><userinput>pushd instsetoo_native/unxlngi6.pro/OpenOffice/\
 native/install/en-US/linux-2.6-intel/buildroot/opt &amp;&amp;