Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 0766071429b60fb1ebfa72fc7c6056780ec77f1f)
+++ introduction/welcome/changelog.xml	(revision 3b4b69996cc1a403e2943ba6ea800526c310bbba)
@@ -11,4 +11,7 @@
 
 <itemizedlist>
+
+<listitem><para>April 24th, 2004 [tushar]: Updated to
+openoffice-1.1.1.</para></listitem>
 
 <listitem><para>April 24th, 2004 [larry]: Updated to
Index: xsoft/suites/openoffice/openoffice-exp.xml
===================================================================
--- xsoft/suites/openoffice/openoffice-exp.xml	(revision 0766071429b60fb1ebfa72fc7c6056780ec77f1f)
+++ xsoft/suites/openoffice/openoffice-exp.xml	(revision 3b4b69996cc1a403e2943ba6ea800526c310bbba)
@@ -7,9 +7,19 @@
 <para><parameter>--with-lang=ALL</parameter>: Make install sets for all available languages.</para>
 
+<para><parameter>--with-dict=ALL</parameter>: Install dictionaries for all available languages..</para>
+
+<para><parameter>--with-libart</parameter>: Use libart instead of gpc for polygon clipping.</para>
+
+<para><parameter>--with-libsn</parameter>: Use startup-notification.</para>
+
+<para><parameter>--disable-java</parameter>: Do not build components that need java.</para>
+
+<para><parameter>--without-gpc</parameter>: Do not use gpc. Removes polygon clipping capability.</para>
+
 <para><command>./bootstrap</command>: Create packages required to bootstrap the build.</para>
 
 <para><command>dmake</command>: Compile the package.</para>
 
-<para><command>sed -e "s:^oo_home=...</command>: Remove version specific
+<para><command>sed -i "s:^oo_home=...</command>: Remove version specific
 installation directory</para>
 
Index: xsoft/suites/openoffice/openoffice-inst.xml
===================================================================
--- xsoft/suites/openoffice/openoffice-inst.xml	(revision 0766071429b60fb1ebfa72fc7c6056780ec77f1f)
+++ xsoft/suites/openoffice/openoffice-inst.xml	(revision 3b4b69996cc1a403e2943ba6ea800526c310bbba)
@@ -2,8 +2,7 @@
 <title>Installation of <application>OpenOffice</application></title>
 
-<para>Apply the downloaded patches and copy gpc files.</para>
+<para>Apply the downloaded patches and optionally copy the gpc files.</para>
 
 <screen><userinput><command>mv ../gpc231/* external/gpc &amp;&amp;
-rm -rf ../gpc231 &amp;&amp;
 for p in ../openoffice-&openoffice-version;-*.patch
 do patch -Np1 -i $p
@@ -16,9 +15,6 @@
 The following command removes an incorrect -mcpu option in the above file.</para>
 
-<screen><userinput><command>cd solenv/inc &amp;&amp;
-cp unxlngi4.mk unxlngi4.mk.orig &amp;&amp;
-sed -e "s:\-mcpu=pentiumpro::" \
-unxlngi4.mk.orig &gt; unxlngi4.mk &amp;&amp;
-cd ../..</command></userinput></screen>
+<screen><userinput><command>sed -i "s:\-mcpu=pentiumpro::" \
+solenv/inc/unxlngi4.mk</command></userinput></screen>
 
 <para>Configure openoffice using the following commands. You may build install
@@ -33,5 +29,7 @@
 
 <screen><userinput><command>cd config_office/ &amp;&amp;
-./configure --with-lang=ALL &amp;&amp;
+./configure --with-lang=ALL \
+--with-dict=ALL \
+--enable-libsn --with-system-zlib &amp;&amp;
 cd ..</command></userinput></screen>
 
@@ -67,6 +65,5 @@
 
 <screen><userinput><command>cd instsetoo/unxlngi4.pro/01/normal &amp;&amp;
-cp install install.orig &amp;&amp;
-sed -e "s:^oo_home=.*:oo_home=openoffice:" install.orig > install &amp;&amp;
+sed -i "s:^oo_home=.*:oo_home=openoffice:" install &amp;&amp;
 ./install --prefix=/opt &amp;&amp;
 for appl in swriter scalc sdraw simpress smath soffice spadmin
Index: xsoft/suites/openoffice/openoffice-intro.xml
===================================================================
--- xsoft/suites/openoffice/openoffice-intro.xml	(revision 0766071429b60fb1ebfa72fc7c6056780ec77f1f)
+++ xsoft/suites/openoffice/openoffice-intro.xml	(revision 3b4b69996cc1a403e2943ba6ea800526c310bbba)
@@ -21,9 +21,13 @@
 <sect3><title><application>OpenOffice</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="xfree86"/>, <xref linkend="j2sdk"/>,
+<para><xref linkend="xfree86"/>
 <xref linkend="zip"/>, <xref linkend="unzip"/>, <xref linkend="tcsh"/>,
 <xref linkend="which"/></para></sect4>
+<sect4><title>Recommended</title>
+<para><xref linkend="j2sdk"/></para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="Linux_PAM"/> and <ulink
+<para><xref linkend="Linux_PAM"/>,
+<xref linkend="libart_lgpl"/>,
+<xref linkend="startup-notification"/> and <ulink
 url="http://ant.apache.org/">Apache Ant</ulink></para></sect4>
 </sect3>
@@ -31,8 +35,6 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>General Polygon Clipper Library (Required): <ulink
+<listitem><para>General Polygon Clipper Library (Optional if <xref linkend="libart_lgpl"/> is used): <ulink
 url="ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"/></para></listitem>
-<listitem><para>Required patch (Disable building of mozilla addressbook): <ulink
-url="&patch-root;/openoffice-&openoffice-version;-no-mozab.patch"/></para></listitem>
 <listitem><para>Required patch (Executable <command>test</command> is in
 <filename class="directory">/bin</filename>,
Index: xsoft/suites/openoffice/openoffice.ent
===================================================================
--- xsoft/suites/openoffice/openoffice.ent	(revision 0766071429b60fb1ebfa72fc7c6056780ec77f1f)
+++ xsoft/suites/openoffice/openoffice.ent	(revision 3b4b69996cc1a403e2943ba6ea800526c310bbba)
@@ -4,8 +4,8 @@
 <!ENTITY openoffice-exp SYSTEM "openoffice-exp.xml">
 <!ENTITY openoffice-desc SYSTEM "openoffice-desc.xml">
-<!ENTITY openoffice-version "1.1.0">
-<!ENTITY openoffice-download-http "http://www.openoffice.org/dev_docs/source/&openoffice-version;/source.html">
+<!ENTITY openoffice-version "1.1.1">
+<!ENTITY openoffice-download-http "http://download.openoffice.org/&openoffice-version;/source.html">
 <!ENTITY openoffice-download-ftp "">
-<!ENTITY openoffice-size "155 MB">
+<!ENTITY openoffice-size "189 MB">
 <!ENTITY openoffice-buildsize "5.0 GB">
 <!ENTITY openoffice-time "">
