office/openoffice.org: Updated for version 3.0.0

6 files changed, 125 insertions, 145 deletions

diff --git a/office/openoffice.org/README b/office/openoffice.org/README
index a07a634b2cdea..edf509468a6d8 100644
--- a/office/openoffice.org/README
+++ b/office/openoffice.org/README
@@ -18,8 +18,8 @@ not change it.  See these two links for more info:
 Please don't file reports about us not using the the 'slackware-menus' package
 included in the desktop-integration/ directory.  We don't use that package for
 the following reasons:
-  1. The package installs to /opt/openoffice.org2.4, but then a symlink is 
-     created in /etc to that same directory (/etc/openoffice.org2.4).
+  1. The package installs to /opt/openoffice.org3, but then a symlink is 
+     created in /etc to that same directory (/etc/openoffice.org3).
      This is not expected behavior from Slackware packages - we don't typically
      put binary files in /etc, and we certainly don't have entire software 
      packages installed there.
@@ -30,11 +30,7 @@ the following reasons:
      in that respect, as it puts everything in /usr/share/icons/  
   3. The only other thing the 'slackware-menus' package does is set up the 
      symlinks for the *.desktop files in /usr/share/applications, and it's done
-     with them linked from /etc/openoffice.org2.4...  Since we don't want the
+     with them linked from /etc/openoffice.org3...  Since we don't want the
      link to /etc at all, this is useless to us.  
 
-Be sure to look at the script for some optional things you can do when building 
-(disable the Java loader and add the Optimization Solver).
-
-NOTE: DO NOT use OpenOffice.org's built-in updater to update after installing
-      with this script.
+Be sure to look at the script for some optional things you can do when building.
diff --git a/office/openoffice.org/desktop-file-fix-2.4.0.diff b/office/openoffice.org/desktop-file-fix-2.4.0.diff
deleted file mode 100644
index e357857b43274..0000000000000
--- a/office/openoffice.org/desktop-file-fix-2.4.0.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -Nur orig/opt/openoffice.org2.4/share/xdg/base.desktop fixed/opt/openoffice.org2.4/share/xdg/base.desktop
---- orig/opt/openoffice.org2.4/share/xdg/base.desktop	2008-03-14 15:42:17.000000000 -0500
-+++ fixed/opt/openoffice.org2.4/share/xdg/base.desktop	2008-03-23 16:14:17.331439021 -0500
-@@ -6,7 +6,7 @@
- Type=Application
- InitialPreference=2
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-MoreApplications-Databases;
--Exec=openoffice.org2.4 -base %U
-+Exec=sbase %U
- MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base
- Name=OpenOffice.org 2.4 Base
- GenericName=Database Development
-diff -Nur orig/opt/openoffice.org2.4/share/xdg/calc.desktop fixed/opt/openoffice.org2.4/share/xdg/calc.desktop
---- orig/opt/openoffice.org2.4/share/xdg/calc.desktop	2008-03-14 15:42:40.000000000 -0500
-+++ fixed/opt/openoffice.org2.4/share/xdg/calc.desktop	2008-03-23 16:14:24.724377432 -0500
-@@ -6,7 +6,7 @@
- Type=Application
- InitialPreference=2
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
--Exec=openoffice.org2.4 -calc %U
-+Exec=scalc %U
- MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel
- Name=OpenOffice.org 2.4 Calc
- GenericName=Spreadsheet
-diff -Nur orig/opt/openoffice.org2.4/share/xdg/draw.desktop fixed/opt/openoffice.org2.4/share/xdg/draw.desktop
---- orig/opt/openoffice.org2.4/share/xdg/draw.desktop	2008-03-14 15:42:10.000000000 -0500
-+++ fixed/opt/openoffice.org2.4/share/xdg/draw.desktop	2008-03-23 16:14:45.627028307 -0500
-@@ -6,7 +6,7 @@
- Type=Application
- InitialPreference=2
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing;
--Exec=openoffice.org2.4 -draw %U
-+Exec=sdraw %U
- MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw
- Name=OpenOffice.org 2.4 Draw
- Comment=Create and edit drawings, flow charts, and logos by using Draw.
-diff -Nur orig/opt/openoffice.org2.4/share/xdg/impress.desktop fixed/opt/openoffice.org2.4/share/xdg/impress.desktop
---- orig/opt/openoffice.org2.4/share/xdg/impress.desktop	2008-03-14 15:42:01.000000000 -0500
-+++ fixed/opt/openoffice.org2.4/share/xdg/impress.desktop	2008-03-23 16:15:35.953410981 -0500
-@@ -6,7 +6,7 @@
- Type=Application
- InitialPreference=2
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations;
--Exec=openoffice.org2.4 -impress %U
-+Exec=simpress %U
- MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint
- Name=OpenOffice.org 2.4 Impress
- GenericName=Presentation
-diff -Nur orig/opt/openoffice.org2.4/share/xdg/math.desktop fixed/opt/openoffice.org2.4/share/xdg/math.desktop
---- orig/opt/openoffice.org2.4/share/xdg/math.desktop	2008-03-14 15:42:29.000000000 -0500
-+++ fixed/opt/openoffice.org2.4/share/xdg/math.desktop	2008-03-23 16:15:44.998558367 -0500
-@@ -6,7 +6,7 @@
- Type=Application
- InitialPreference=2
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
--Exec=openoffice.org2.4 -math %U
-+Exec=smath %U
- MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math
- Name=OpenOffice.org 2.4 Math
- Comment=Create and edit scientific formulas and equations by using Math.
-diff -Nur orig/opt/openoffice.org2.4/share/xdg/printeradmin.desktop fixed/opt/openoffice.org2.4/share/xdg/printeradmin.desktop
---- orig/opt/openoffice.org2.4/share/xdg/printeradmin.desktop	2008-03-14 15:36:23.000000000 -0500
-+++ fixed/opt/openoffice.org2.4/share/xdg/printeradmin.desktop	2008-03-23 16:13:25.876915512 -0500
-@@ -2,7 +2,7 @@
- Version=1.0
- Encoding=UTF-8
- Terminal=false
--Icon=openofficeorg24-printeradmin.png
-+Icon=openofficeorg24-printeradmin
- Type=Application
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
- Exec=openoffice.org2.4-printeradmin
-diff -Nur orig/opt/openoffice.org2.4/share/xdg/writer.desktop fixed/opt/openoffice.org2.4/share/xdg/writer.desktop
---- orig/opt/openoffice.org2.4/share/xdg/writer.desktop	2008-03-14 15:41:47.000000000 -0500
-+++ fixed/opt/openoffice.org2.4/share/xdg/writer.desktop	2008-03-23 16:16:04.965089685 -0500
-@@ -6,7 +6,7 @@
- Type=Application
- InitialPreference=2
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors;
--Exec=openoffice.org2.4 -writer %U
-+Exec=swriter %U
- MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;application/vnd.wordperfect;application/wordperfect
- Name=OpenOffice.org 2.4 Writer
- GenericName=Word Processor
diff --git a/office/openoffice.org/desktop-file-fix-3.0.0.diff b/office/openoffice.org/desktop-file-fix-3.0.0.diff
new file mode 100644
index 0000000000000..106dd2c8fe472
--- /dev/null
+++ b/office/openoffice.org/desktop-file-fix-3.0.0.diff
@@ -0,0 +1,72 @@
+diff -Nur a/opt/openoffice.org3/share/xdg/base.desktop b/opt/openoffice.org3/share/xdg/base.desktop
+--- a/opt/openoffice.org3/share/xdg/base.desktop	2008-09-19 20:04:46.000000000 -0500
++++ b/opt/openoffice.org3/share/xdg/base.desktop	2008-09-30 14:05:11.639524235 -0500
+@@ -4,7 +4,7 @@
+ Icon=openofficeorg3-base
+ Type=Application
+ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-MoreApplications-Databases;
+-Exec=openoffice.org3 -base %U
++Exec=sbase %U
+ MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
+ Name=OpenOffice.org 3.0 Base
+ GenericName=Database Development
+diff -Nur a/opt/openoffice.org3/share/xdg/calc.desktop b/opt/openoffice.org3/share/xdg/calc.desktop
+--- a/opt/openoffice.org3/share/xdg/calc.desktop	2008-09-19 20:04:46.000000000 -0500
++++ b/opt/openoffice.org3/share/xdg/calc.desktop	2008-09-30 14:05:19.224052521 -0500
+@@ -4,7 +4,7 @@
+ Icon=openofficeorg3-calc
+ Type=Application
+ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
+-Exec=openoffice.org3 -calc %U
++Exec=scalc %U
+ MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;
+ Name=OpenOffice.org 3.0 Calc
+ GenericName=Spreadsheet
+diff -Nur a/opt/openoffice.org3/share/xdg/draw.desktop b/opt/openoffice.org3/share/xdg/draw.desktop
+--- a/opt/openoffice.org3/share/xdg/draw.desktop	2008-09-19 20:04:46.000000000 -0500
++++ b/opt/openoffice.org3/share/xdg/draw.desktop	2008-09-30 14:05:26.016528565 -0500
+@@ -4,7 +4,7 @@
+ Icon=openofficeorg3-draw
+ Type=Application
+ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing;
+-Exec=openoffice.org3 -draw %U
++Exec=sdraw %U
+ MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
+ Name=OpenOffice.org 3.0 Draw
+ Comment=Create and edit drawings, flow charts, and logos by using Draw.
+diff -Nur a/opt/openoffice.org3/share/xdg/impress.desktop b/opt/openoffice.org3/share/xdg/impress.desktop
+--- a/opt/openoffice.org3/share/xdg/impress.desktop	2008-09-19 20:04:46.000000000 -0500
++++ b/opt/openoffice.org3/share/xdg/impress.desktop	2008-09-30 14:05:32.997015784 -0500
+@@ -4,7 +4,7 @@
+ Icon=openofficeorg3-impress
+ Type=Application
+ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations;
+-Exec=openoffice.org3 -impress %U
++Exec=simpress %U
+ MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
+ Name=OpenOffice.org 3.0 Impress
+ GenericName=Presentation
+diff -Nur a/opt/openoffice.org3/share/xdg/math.desktop b/opt/openoffice.org3/share/xdg/math.desktop
+--- a/opt/openoffice.org3/share/xdg/math.desktop	2008-09-19 20:04:46.000000000 -0500
++++ b/opt/openoffice.org3/share/xdg/math.desktop	2008-09-30 14:05:40.449534571 -0500
+@@ -4,7 +4,7 @@
+ Icon=openofficeorg3-math
+ Type=Application
+ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
+-Exec=openoffice.org3 -math %U
++Exec=smath %U
+ MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
+ Name=OpenOffice.org 3.0 Math
+ Comment=Create and edit scientific formulas and equations by using Math.
+diff -Nur a/opt/openoffice.org3/share/xdg/writer.desktop b/opt/openoffice.org3/share/xdg/writer.desktop
+--- a/opt/openoffice.org3/share/xdg/writer.desktop	2008-09-19 20:04:46.000000000 -0500
++++ b/opt/openoffice.org3/share/xdg/writer.desktop	2008-09-30 14:06:00.938967174 -0500
+@@ -4,7 +4,7 @@
+ Icon=openofficeorg3-writer
+ Type=Application
+ Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors;
+-Exec=openoffice.org3 -writer %U
++Exec=swriter %U
+ MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;
+ Name=OpenOffice.org 3.0 Writer
+ GenericName=Word Processor
diff --git a/office/openoffice.org/doinst.sh b/office/openoffice.org/doinst.sh
index daaf27f81230f..88ab9f58ff611 100644
--- a/office/openoffice.org/doinst.sh
+++ b/office/openoffice.org/doinst.sh
@@ -5,3 +5,12 @@ fi
 if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
+
+if [ -x /usr/bin/gtk-update-icon-cache ]; then 
+  for theme in gnome locolor hicolor ; do
+    if [ -e usr/share/icons/$theme/icon-theme.cache ]; then 
+      /usr/bin/gtk-update-icon-cache usr/share/icons/$theme >/dev/null 2>&1
+    fi
+  done
+fi
+
diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild
index 5523bf220d2ee..536a5c58b7b64 100644
--- a/office/openoffice.org/openoffice.org.SlackBuild
+++ b/office/openoffice.org/openoffice.org.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/sh
 
-# Slackware build script for OpenOffice.org (binary repackaging)
+# Slackware build script for OpenOffice.org
 
 # Copyright 2006-2008  Robby Workman, Northport, Alabama, ASA
 # All rights reserved.
@@ -25,12 +25,12 @@
 # Thanks to Sandman1, Larhzu, and MacIver for early assistance.
 # Thanks to Fred Emmott (http://slamd64.com) for some better code in a few
 #  places and ideas to include the Optimization Solver and disable javaldx.
-# Thanks to eroc for the idea to include support for other languages.
+# Thanks to hba for the idea to include support for other languages.
 
 PRGNAM=openoffice.org
-VERSION=2.4.0
+VERSION=3.0.0
 ARCH=i586	# The binaries are built for i586 - leave this alone
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -54,77 +54,64 @@ PKG_LANG=$(echo $OOLANG | sed s/-/_/)	# Leave this alone
 # According to Fred Emmott, this is *highly* desirable on 64 bit systems
 DISABLE_JAVA=${DISABLE_JAVA:-NO}
 
-# If you want to include the new experimental Optimization Solver, 
-# download "scsolver.uno.zip" from the following location:
-# http://wiki.services.openoffice.org/wiki/Optimization_Solver
-# and place it in the same directory as the SlackBuild script ($CWD)
-# Set the following variable to "YES"   Default is "NO"
-ADD_SOLVER=${ADD_SOLVER:-NO}
-
 # Yes, I know there is a Slackware integration file in the desktop-integration
 # directory, but it's worthless to us.  I mailed the maintainer of this
 # module with suggestions on how to make it more compliant with standard 
 # Slackware packaging, but I received no response.  Anyway, to sum up, we're 
 # not using that file...
 
-set -e # Require the script to exit if any command fails
+set -e
 
 # Ignore this - it's just to get the toplevel directory name of the 
 # extracted tarball archive
-SOURCEDIR=$(tar -tzf $CWD/OOo_${VERSION}_LinuxIntel_install_${OOLANG}.tar.gz | head -1 | tr -d \/)
+SOURCEDIR=$(tar tzf $CWD/OOo_${VERSION}_LinuxIntel_install_${OOLANG}.tar.gz | head -1 | tr -d \/)
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SOURCEDIR
-tar xvf $CWD/OOo_${VERSION}_LinuxIntel_install_${OOLANG}.tar.gz
-cd $SOURCEDIR/RPMS/
-mv desktop-integration/openoffice.org-freedesktop-menus-*.noarch.rpm .
+rm -rf $TMP/$SOURCEDIR
+tar xvf $CWD/OOo_${VERSION}_LinuxIntel_install_${OOLANG}.tar.gz -C $TMP
+cd $TMP/$SOURCEDIR/RPMS/
+mv desktop-integration/openoffice.org3.0-freedesktop-menus-3.0-9354.noarch.rpm .
+rm *onlineupdate*.rpm # We don't want this
 for FILE in *.rpm ; do rpm2cpio < $FILE | cpio -imdv ; done
 rm -rf desktop-integration *.rpm
 mv opt usr $PKG
 cd $PKG
 
-# Create symlinks in /usr/bin to actual binaries and edit the 
-# included wrapper scripts in /usr/bin to correct the paths
-( cd $PKG/usr/bin
-  for FILE in sbase scalc sdraw simpress smath soffice spadmin swriter unopkg ; do 
-    rm -f $FILE
-    ln -sf ../../opt/openoffice.org2.4/program/$FILE . ;
+# Create symlinks in /usr/bin to actual binaries
+cd $PKG/usr/bin
+  for FILE in \
+    sbase scalc sdraw simpress smath soffice spadmin swriter unopkg ; do 
+      rm -f $FILE
+      ln -sf /opt/openoffice.org3/program/$FILE . ;
   done 
-  for i in $(find . -type f) ; do sed -i 's/etc/opt/g' $i ; done
-)
-
-# Correct symlinks in /usr/share/applications
-( cd $PKG/usr/share/applications
-  for APP in base calc draw extension impress math printeradmin writer qstart ; do
-    rm -f openoffice.org2.4-$APP.desktop
-    ln -sf ../../../opt/openoffice.org2.4/share/xdg/$APP.desktop \
-      openoffice.org2.4-$APP.desktop ;
-  done
-)
+cd -
 
 # Fix Exec commands in the desktop files
 # See http://bugzilla.xfce.org/show_bug.cgi?id=2430 
-patch -p1 < $CWD/desktop-file-fix-2.4.0.diff
+patch -p1 < $CWD/desktop-file-fix-3.0.0.diff
+
+# Install dictionary extensions for spellchecking
+UNOPKG_BIN=$PKG/opt/openoffice.org3/program/unopkg
+DICT_DIR=$PKG/opt/openoffice.org3/share/extension/install
+if [ -x "$UNOPKG_BIN" ]; then
+  UNOPKG_TMP=$TMP/$$$$$$
+  find $DICT_DIR -type f -name "dict-*.oxt" \
+    -exec $UNOPKG_BIN add --shared {} \
+    "-env:UserInstallation=file:///$UNOPKG_TMP" \;
+  rm -rf $UNOPKG_TMP 	# Clean up after ourselves
+fi
 
-# Move docs to their correct locations
+# Move docs to their expected locations
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-for i in README README.html LICENSE LICENSE.html THIRDPARTYLICENSEREADME.html ; do
-  mv $PKG/opt/openoffice.org2.4/$i $PKG/usr/doc/$PRGNAM-$VERSION/$i ;
-done
+cd $PKG/opt/openoffice.org3
+  mv README* *LICENSE* readmes licenses $PKG/usr/doc/$PRGNAM-$VERSION
+cd -
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Disable Java support if desired (see above)
 if [ "$DISABLE_JAVA" = "YES" ]; then
-  chmod -x $PKG/opt/openoffice.org2.4/program/javaldx
-fi
-
-# Add optimization solver if desired (see above)
-if [ "$ADD_SOLVER" = "YES" -a -f "$CWD/scsolver.uno.zip" ]; then
-  ( cd $PKG/opt/openoffice.org2.4
-    program/unopkg add --shared $CWD/scsolver.uno.zip
-  )
+  chmod -x $PKG/opt/openoffice.org/ure/bin/javaldx
 fi
 
 mkdir -p $PKG/install
diff --git a/office/openoffice.org/openoffice.org.info b/office/openoffice.org/openoffice.org.info
index 467eba68199c3..7b54dee66398e 100644
--- a/office/openoffice.org/openoffice.org.info
+++ b/office/openoffice.org/openoffice.org.info
@@ -1,8 +1,8 @@
 PRGNAM="openoffice.org"
-VERSION="2.4.0"
+VERSION="3.0.0"
 HOMEPAGE="http://openoffice.org"
-DOWNLOAD="http://openoffice.osuosl.org/stable/2.4.0/OOo_2.4.0_LinuxIntel_install_en-US.tar.gz"
-MD5SUM="7039276920b5fe6c00fee3e1b883ba24"
+DOWNLOAD="http://ftp-atl.osuosl.org/pub/openoffice/stable/3.0.0/OOo_3.0.0_LinuxIntel_install_en-US.tar.gz"
+MD5SUM="aa8935aa6a71e4fd7ddae4d56eedb59b"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="Michiel"
+APPROVED="Erik Hanson"