7 files changed, 147 insertions, 175 deletions
diff --git a/office/openoffice.org/README b/office/openoffice.org/README
index 30224f2924..a07a634b2c 100644
--- a/office/openoffice.org/README
+++ b/office/openoffice.org/README
@@ -5,32 +5,36 @@ This script builds a Slackware package from the official binary (RPM's)
 distributed by openoffice.org.  Everything needed by the application should 
 be built statically into it, so there aren't any dependencies not satisfied 
 by a normal installation.  A java runtime environment (jre) is suggested by 
-openoffice.org, but it is not required.
+openoffice.org, but it is not required (note that jre is part of a standard
+installation of Slackware).
 
 Please don't file bug reports relating to the fact that the resulting package 
 doesn't open MS Office files by default.  Default applications to open specific 
 file types is a per-user setting, and and installing some application should 
 not change it.  See these two links for more info: 
-  http://freedesktop.org/wiki/Standards_2fshared_2dmime_2dinfo_2dspec
-  http://freedesktop.org/wiki/Standards_2fmime_2dactions_2dspec
+  http://freedesktop.org/wiki/Standards/shared-mime-info-spec
+  http://freedesktop.org/wiki/Standards/mime-actions-spec
 
 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.2, but then a symlink is 
-     created in /etc to that same directory (/etc/openoffice.org2.2).
+  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).
      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 - that will wreak havoc on anyone who does a 
-     regular backup of the entire /etc directory.
+     packages installed there.
   2. It installs the icons to /opt/kde/share/icons instead of /usr/share/icons.
-     This is fine if you're running kde, but for those people who use gnome,
-     it's not.  There's no good reason not to put them in /usr/share/icons or
-     /usr/share/pixmaps.
+     This is fine if you're running kde on Slackware 11.0 or earlier, but for
+     those people who use gnome or anything on Slackware 12.0 or later, it's 
+     a Bad Thing.  The generic freedesktop menu integration package is better
+     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.2...  Since we don't want the
+     with them linked from /etc/openoffice.org2.4...  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.
diff --git a/office/openoffice.org/desktop-file-fix-2.2.diff b/office/openoffice.org/desktop-file-fix-2.2.diff
deleted file mode 100644
index 8769a0bc64..0000000000
--- a/office/openoffice.org/desktop-file-fix-2.2.diff
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -Naur OLD/opt/openoffice.org2.2/share/xdg/base.desktop NEW/opt/openoffice.org2.2/share/xdg/base.desktop
---- OLD/opt/openoffice.org2.2/share/xdg/base.desktop	2007-02-16 08:59:53.000000000 -0600
-+++ NEW/opt/openoffice.org2.2/share/xdg/base.desktop	2007-02-21 17:22:21.000000000 -0600
-@@ -2,11 +2,11 @@
- Version=1.0
- Encoding=UTF-8
- Terminal=false
--Icon=openofficeorg22-base
-+Icon=/usr/share/pixmaps/openofficeorg22-base.png
- Type=Application
- InitialPreference=2
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
--Exec=openoffice.org2.2 -base %U
-+Exec=sbase %U
- MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base
- Name=OpenOffice.org 2.2 Base
- Comment=Manage databases, create queries and reports to track and manage your information by using Base.
-diff -Naur OLD/opt/openoffice.org2.2/share/xdg/calc.desktop NEW/opt/openoffice.org2.2/share/xdg/calc.desktop
---- OLD/opt/openoffice.org2.2/share/xdg/calc.desktop	2007-02-16 08:58:50.000000000 -0600
-+++ NEW/opt/openoffice.org2.2/share/xdg/calc.desktop	2007-02-21 17:22:28.000000000 -0600
-@@ -2,11 +2,11 @@
- Version=1.0
- Encoding=UTF-8
- Terminal=false
--Icon=openofficeorg22-calc
-+Icon=/usr/share/pixmaps/openofficeorg22-calc.png
- Type=Application
- InitialPreference=2
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
--Exec=openoffice.org2.2 -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.2 Calc
- Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
-diff -Naur OLD/opt/openoffice.org2.2/share/xdg/draw.desktop NEW/opt/openoffice.org2.2/share/xdg/draw.desktop
---- OLD/opt/openoffice.org2.2/share/xdg/draw.desktop	2007-02-16 08:59:31.000000000 -0600
-+++ NEW/opt/openoffice.org2.2/share/xdg/draw.desktop	2007-02-21 17:22:33.000000000 -0600
-@@ -2,11 +2,11 @@
- Version=1.0
- Encoding=UTF-8
- Terminal=false
--Icon=openofficeorg22-draw
-+Icon=/usr/share/pixmaps/openofficeorg22-draw.png
- Type=Application
- InitialPreference=2
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
--Exec=openoffice.org2.2 -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.2 Draw
- Comment=Create and edit drawings, flow charts, and logos by using Draw.
-diff -Naur OLD/opt/openoffice.org2.2/share/xdg/impress.desktop NEW/opt/openoffice.org2.2/share/xdg/impress.desktop
---- OLD/opt/openoffice.org2.2/share/xdg/impress.desktop	2007-02-16 08:59:40.000000000 -0600
-+++ NEW/opt/openoffice.org2.2/share/xdg/impress.desktop	2007-02-21 17:23:56.000000000 -0600
-@@ -2,11 +2,11 @@
- Version=1.0
- Encoding=UTF-8
- Terminal=false
--Icon=openofficeorg22-impress
-+Icon=/usr/share/pixmaps/openofficeorg22-impress.png
- Type=Application
- InitialPreference=2
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
--Exec=openoffice.org2.2 -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.2 Impress
- Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
-diff -Naur OLD/opt/openoffice.org2.2/share/xdg/math.desktop NEW/opt/openoffice.org2.2/share/xdg/math.desktop
---- OLD/opt/openoffice.org2.2/share/xdg/math.desktop	2007-02-16 09:00:12.000000000 -0600
-+++ NEW/opt/openoffice.org2.2/share/xdg/math.desktop	2007-02-21 17:24:01.000000000 -0600
-@@ -2,11 +2,11 @@
- Version=1.0
- Encoding=UTF-8
- Terminal=false
--Icon=openofficeorg22-math
-+Icon=/usr/share/pixmaps/openofficeorg22-math.png
- Type=Application
- InitialPreference=2
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
--Exec=openoffice.org2.2 -math %U
-+Exec=smath %U
- MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math
- Name=OpenOffice.org 2.2 Math
- Comment=Create and edit scientific formulas and equations by using Math.
-diff -Naur OLD/opt/openoffice.org2.2/share/xdg/printeradmin.desktop NEW/opt/openoffice.org2.2/share/xdg/printeradmin.desktop
---- OLD/opt/openoffice.org2.2/share/xdg/printeradmin.desktop	2007-02-16 09:18:11.000000000 -0600
-+++ NEW/opt/openoffice.org2.2/share/xdg/printeradmin.desktop	2007-02-21 17:21:50.000000000 -0600
-@@ -2,7 +2,7 @@
- Version=1.0
- Encoding=UTF-8
- Terminal=false
--Icon=openofficeorg22-printeradmin.png
-+Icon=/usr/share/pixmaps/openofficeorg22-printeradmin.png
- Type=Application
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
- Exec=openoffice.org2.2-printeradmin
-diff -Naur OLD/opt/openoffice.org2.2/share/xdg/writer.desktop NEW/opt/openoffice.org2.2/share/xdg/writer.desktop
---- OLD/opt/openoffice.org2.2/share/xdg/writer.desktop	2007-02-16 08:58:36.000000000 -0600
-+++ NEW/opt/openoffice.org2.2/share/xdg/writer.desktop	2007-02-21 17:24:38.000000000 -0600
-@@ -2,11 +2,11 @@
- Version=1.0
- Encoding=UTF-8
- Terminal=false
--Icon=openofficeorg22-writer
-+Icon=/usr/share/pixmaps/openofficeorg22-writer.png
- Type=Application
- InitialPreference=2
- Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
--Exec=openoffice.org2.2 -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.2 Writer
- Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
diff --git a/office/openoffice.org/desktop-file-fix-2.4.0.diff b/office/openoffice.org/desktop-file-fix-2.4.0.diff
new file mode 100644
index 0000000000..e357857b43
--- /dev/null
+++ b/office/openoffice.org/desktop-file-fix-2.4.0.diff
@@ -0,0 +1,84 @@
+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/doinst.sh b/office/openoffice.org/doinst.sh
index a1aa08630c..daaf27f812 100644
--- a/office/openoffice.org/doinst.sh
+++ b/office/openoffice.org/doinst.sh
@@ -1,7 +1,7 @@
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database -q usr/share/applications
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
 fi
 
-if [ -x usr/bin/update-mime-database ]; then
-  usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
 fi
diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild
index 17b973988b..5523bf220d 100644
--- a/office/openoffice.org/openoffice.org.SlackBuild
+++ b/office/openoffice.org/openoffice.org.SlackBuild
@@ -1,8 +1,8 @@
 #!/bin/bash
-#
-# Slackware build script of openoffice.org (binary repackaging)
 
-# Copyright 2006-2007  Robby Workman  (http://rlworkman.net) 
+# Slackware build script for OpenOffice.org (binary repackaging)
+
+# Copyright 2006-2008  Robby Workman, Northport, Alabama, ASA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -11,7 +11,7 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -24,14 +24,15 @@
 
 # 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.
+#  places and ideas to include the Optimization Solver and disable javaldx.
 # Thanks to eroc for the idea to include support for other languages.
 
 PRGNAM=openoffice.org
-VERSION=2.2.1
+VERSION=2.4.0
 ARCH=i586	# The binaries are built for i586 - leave this alone
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -41,7 +42,9 @@ OUTPUT=${OUTPUT:-/tmp}
 # run the script (OOLANG=pt-BR ./openoffice.org.SlackBuild for example) or
 # change it in this script.  Note that you will need to have the correct
 # tarball in the build directory for this to work...
-# TODO: Find where someone can obtain these localized tarballs...
+# You can get localized tarballs from the following location:
+# ftp://ftp.free.fr/mirrors/ftp.openoffice.org/localized/$OOLANG/$VERSION/
+# Thanks to Niki Kovacs for finding this :-)
 OOLANG=${OOLANG:-en-US}
 PKG_LANG=$(echo $OOLANG | sed s/-/_/)	# Leave this alone
 
@@ -58,37 +61,36 @@ DISABLE_JAVA=${DISABLE_JAVA:-NO}
 # 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 mostly worthless to us.  I mailed the maintainer of this
+# 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...
 
-# Require the script to exit if any command fails
-set -e
+set -e # Require the script to exit if any command fails
 
 # 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 \/)
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SOURCEDIR
-tar -xzf $CWD/OOo_${VERSION}_LinuxIntel_install_${OOLANG}.tar.gz || exit 1
+tar xvf $CWD/OOo_${VERSION}_LinuxIntel_install_${OOLANG}.tar.gz
 cd $SOURCEDIR/RPMS/
 mv desktop-integration/openoffice.org-freedesktop-menus-*.noarch.rpm .
-rm -rf desktop-integration
 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 /usr/bin to correct the paths
+# included wrapper scripts in /usr/bin to correct the paths
 ( cd $PKG/usr/bin
-  rm -f unopkg_gui	# Broken upstream?
   for FILE in sbase scalc sdraw simpress smath soffice spadmin swriter unopkg ; do 
     rm -f $FILE
-    ln -sf ../../opt/openoffice.org2.2/program/$FILE . ;
+    ln -sf ../../opt/openoffice.org2.4/program/$FILE . ;
   done 
   for i in $(find . -type f) ; do sed -i 's/etc/opt/g' $i ; done
 )
@@ -96,43 +98,31 @@ cd $PKG
 # 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.2-$APP.desktop
-    ln -sf ../../../opt/openoffice.org2.2/share/xdg/$APP.desktop \
-      openoffice.org2.2-$APP.desktop ;
+    rm -f openoffice.org2.4-$APP.desktop
+    ln -sf ../../../opt/openoffice.org2.4/share/xdg/$APP.desktop \
+      openoffice.org2.4-$APP.desktop ;
   done
 )
 
-# Correct icon paths and Exec commands in the desktop files
-# See http://bugzilla.xfce.org/show_bug.cgi?id=2430 for why we want to
-# change the Exec lines 
-cat $CWD/desktop-file-fix-2.2.diff | patch -p1
-
-# Add /usr/share/pixmaps directory and link icons to it
-mkdir -p $PKG/usr/share/pixmaps
-( cd $PKG/usr/share/pixmaps
-  for APP in base calc draw extension impress math printeradmin writer ; do
-    ln -sf ../../../usr/share/icons/hicolor/48x48/apps/openofficeorg22-$APP.png . ;
-  done
-)
+# 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
 
 # Move docs to their correct 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.2/$i $PKG/usr/doc/$PRGNAM-$VERSION/$i ;
+  mv $PKG/opt/openoffice.org2.4/$i $PKG/usr/doc/$PRGNAM-$VERSION/$i ;
 done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Fix the permissions on a few icons that are executable
-find $PKG/usr/share/icons -name "*.png" -exec chmod 0644 {} \;
-
 # Disable Java support if desired (see above)
 if [ "$DISABLE_JAVA" = "YES" ]; then
-  chmod -x $PKG/opt/openoffice.org2.2/program/javaldx
+  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.2
+  ( cd $PKG/opt/openoffice.org2.4
     program/unopkg add --shared $CWD/scsolver.uno.zip
   )
 fi
@@ -142,7 +132,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 # Fix ownership and permissions and make the package
-#chown -R root:root .
+chown -R root:root .
 find . -type d -exec chmod 755 {} \;
 chmod -R u+rw,go+r-w,a-s .
-/sbin/makepkg -p -c n -l y $OUTPUT/$PRGNAM-${VERSION}_${PKG_LANG}-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-${VERSION}_${PKG_LANG}-$ARCH-$BUILD$TAG.tgz
diff --git a/office/openoffice.org/openoffice.org.info b/office/openoffice.org/openoffice.org.info
index 210d87e20e..467eba6819 100644
--- a/office/openoffice.org/openoffice.org.info
+++ b/office/openoffice.org/openoffice.org.info
@@ -1,8 +1,8 @@
 PRGNAM="openoffice.org"
-VERSION="2.2.1"
+VERSION="2.4.0"
 HOMEPAGE="http://openoffice.org"
-DOWNLOAD="http://openoffice.osuosl.org/stable/2.2.1/OOo_2.2.1_LinuxIntel_install_en-US.tar.gz"
-MD5SUM="145dd00f6bda18b9848bb72bcec6e7b3"
+DOWNLOAD="http://openoffice.osuosl.org/stable/2.4.0/OOo_2.4.0_LinuxIntel_install_en-US.tar.gz"
+MD5SUM="7039276920b5fe6c00fee3e1b883ba24"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="BP{k}"
+APPROVED="Michiel"
diff --git a/office/openoffice.org/slack-desc b/office/openoffice.org/slack-desc
index a7ef28d7e1..dc4cc81962 100644
--- a/office/openoffice.org/slack-desc
+++ b/office/openoffice.org/slack-desc
@@ -1,11 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+              |-----handy-ruler-----------------------------------------------|
 openoffice.org: OpenOffice.org Office Suite
 openoffice.org: 
 openoffice.org: OpenOffice.org is a full-featured open-source office suite
 openoffice.org: that is compatible with all other major office software.
 openoffice.org: 
-openoffice.org: Homepage: http://openoffice.org
-openoffice.org: 
-openoffice.org: 
+openoffice.org: This is a repackaging of the official OpenOffice.org binary
+openoffice.org: RPM's distributed by the upstream developers.
 openoffice.org: 
+openoffice.org: Homepage: http://openoffice.org
 openoffice.org: 
 openoffice.org: