From 4dd0208dd5e250d06f642c14f8d0878b4603c759 Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@linuxfromscratch.org>
Date: Sun, 28 Jan 2007 07:59:46 +0000
Subject: [PATCH] Removed modification of jai source file in fop instructions.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@6475 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  4 ++++
 pst/ps/fop.xml                     | 13 +++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 3276883443..cdff89ec5f 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>January 28th, 2007</para>
       <itemizedlist>
+        <listitem>
+          <para>[dj] - Removed modification of jai source file in fop 
+          instructions.</para>
+        </listitem>
         <listitem>
           <para>[dj] - Updated to JDK-1.5.0_10.</para>
         </listitem>
diff --git a/pst/ps/fop.xml b/pst/ps/fop.xml
index 3eb4824d48..18bf693a9b 100644
--- a/pst/ps/fop.xml
+++ b/pst/ps/fop.xml
@@ -20,7 +20,7 @@
   <!ENTITY fop-download-ftp  "ftp://apache.mirrors.pair.com/xml/fop/source/fop-&fop-version;-src.tar.gz">
   <!ENTITY fop-md5sum        "1a31eb1357e5d4b8d32d4cb3edae2da2">
   <!ENTITY fop-size          "7.8 MB">
-  <!ENTITY fop-buildsize     "45.3 MB">
+  <!ENTITY fop-buildsize     "47.9 MB">
   <!ENTITY fop-time          "0.25 SBU">
 
   <!ENTITY jai-download      "http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&amp;PartDetailId=jai-1_1_2_01-oth-JPR&amp;SiteId=JSC&amp;TransactionId=noreg">
@@ -141,7 +141,7 @@
 
       <tip>
         <para>The
-        <command>$FOP_BUILD_DIR/../jai-1_1_2_01-lib-linux-i586-jdk.bin</command>
+        <command>$FOP_BUILD_DIR/jai-1_1_2_01-lib-linux-i586-jdk.bin</command>
         command below installs the JAI components in the JDK tree. You will be
         required to view, and then accept (by entering a <keycap>y</keycap>
         keypress), a license agreement before the installation will continue.
@@ -156,12 +156,13 @@
       the <systemitem class="username">root</systemitem> user while in the
       root of the <application>FOP</application> source tree:</para>
 
-<screen role="root"><userinput>sed -i 's/tail +122/tail -n +122/' \
-    ../jai-1_1_2_01-lib-linux-i586-jdk.bin &amp;&amp;
-chmod 755 ../jai-1_1_2_01-lib-linux-i586-jdk.bin &amp;&amp;
+<screen role="root"><userinput>cp ../jai-1_1_2_01-lib-linux-i586-jdk.bin . &amp;&amp;
+sed -i 's/tail +122/tail -n +122/' \
+    jai-1_1_2_01-lib-linux-i586-jdk.bin &amp;&amp;
+chmod 755 jai-1_1_2_01-lib-linux-i586-jdk.bin &amp;&amp;
 FOP_BUILD_DIR=$(pwd) &amp;&amp;
 cd $JAVA_HOME &amp;&amp;
-$FOP_BUILD_DIR/../jai-1_1_2_01-lib-linux-i586-jdk.bin &amp;&amp;
+$FOP_BUILD_DIR/jai-1_1_2_01-lib-linux-i586-jdk.bin &amp;&amp;
 cd $FOP_BUILD_DIR</userinput></screen>
 
     </sect3>