office/openoffice.org: Updated for version 3.2.0

2 files changed, 29 insertions, 23 deletions

diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild
index 4a4c418a5c49..648a65c6bd4a 100644
--- a/office/openoffice.org/openoffice.org.SlackBuild
+++ b/office/openoffice.org/openoffice.org.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for OpenOffice.org
 
-# Copyright 2006-2009  Robby Workman, Northport, Alabama, ASA
+# Copyright 2006-2010  Robby Workman, Northport, Alabama, ASA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -31,9 +31,9 @@
 # Thsnks to necropresto for better x86_64 support
 
 PRGNAM=openoffice.org
-VERSION=3.1.0
-ARCH=${ARCH:-i586}
-BUILD=${BUILD:-4}
+VERSION=3.2.0
+ARCH=${ARCH:-i486}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -49,23 +49,24 @@ OUTPUT=${OUTPUT:-/tmp}
 # 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
+PKG_LANG=${OOLANG//-/_}	# Leave this alone
 # Some localized versions only ship with a bundled JRE, and we'd like this
 # script to work on those as well...
 WJRE=${WJRE:-no}
 
-
 # If you want to disable java support by removing executable permissions
 # form OOo's java loader (this will not affect other apps), set this
 # variable to "YES"   Default is "NO"
 DISABLE_JAVA=${DISABLE_JAVA:-NO}
 
 # Change source package name
-if [ "$ARCH" = "i586" ]; then
-  PKGARCH="Intel"
-elif [ "$ARCH" = "x86_64" ]; then
-  PKGARCH="X86-64"
-  WJRE=no  #Overwrite WJRE option since they don't ship a x86_64 with JRE.
+if [ "$ARCH" = "x86_64" ]; then
+  SRCARCH="X86-64"
+  PKGARCH="$ARCH"
+  WJRE=yes #Overwrite WJRE option since the only x86_64 I see has jre
+else
+  SRCARCH="Intel"
+  PKGARCH="i586"
 fi
 
 # Yes, I know there is a Slackware integration file in the desktop-integration
@@ -74,9 +75,9 @@ fi
 # Ignore this - it's just to get the toplevel directory name of the 
 # extracted tarball archive
 if [ $WJRE != no ]; then
-  SOURCEDIR=$(tar tzf $CWD/OOo_${VERSION}_Linux${PKGARCH}_install_wJRE_${OOLANG}.tar.gz | head -1 | tr -d \/)
+  SOURCEDIR=$(tar tzf $CWD/OOo_${VERSION}_Linux${SRCARCH}_install_wJRE_${OOLANG}.tar.gz | head -1 | tr -d \/)
 else
-  SOURCEDIR=$(tar tzf $CWD/OOo_${VERSION}_Linux${PKGARCH}_install_${OOLANG}.tar.gz | head -1 | tr -d \/)
+  SOURCEDIR=$(tar tzf $CWD/OOo_${VERSION}_Linux${SRCARCH}_install_${OOLANG}.tar.gz | head -1 | tr -d \/)
 fi
 # If the above operation failed for some reason, unset SOURCEDIR so that
 # the "set -eu" below will cause us to bail out with an error
@@ -90,21 +91,24 @@ rm -rf $TMP/$SOURCEDIR
 
 # Handle the tarballs that include a bundled JRE
 if [ $WJRE != no ]; then
-  tar xvf $CWD/OOo_${VERSION}_Linux${PKGARCH}_install_wJRE_${OOLANG}.tar.gz -C $TMP
+  tar xvf $CWD/OOo_${VERSION}_Linux${SRCARCH}_install_wJRE_${OOLANG}.tar.gz -C $TMP
   rm -rf $TMP/$SOURCEDIR/{JavaSetup.jar,installdata,setup}
-  rm -rf $TMP/$SOURCEDIR/RPMS/{userland,jre-*-linux-i586.rpm}
+  rm -rf $TMP/$SOURCEDIR/RPMS/{userland,jre-*-linux-*.rpm}
 else
-  tar xvf $CWD/OOo_${VERSION}_Linux${PKGARCH}_install_${OOLANG}.tar.gz -C $TMP
+  tar xvf $CWD/OOo_${VERSION}_Linux${SRCARCH}_install_${OOLANG}.tar.gz -C $TMP
 fi
 
 cd $TMP/$SOURCEDIR/RPMS/
-mv desktop-integration/openoffice.org3.1-freedesktop-menus-3.1-9393.noarch.rpm .
+mv desktop-integration/openoffice.org3.2-freedesktop-menus-3.2-9472.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
 
+# Kill a broken symlink
+rm -f $PKG/usr/share/applications/openoffice.org3-startcenter.desktop
+
 # Create symlinks in /usr/bin to actual binaries
 cd $PKG/usr/bin
   for FILE in \
@@ -115,7 +119,7 @@ cd $PKG/usr/bin
 cd -
 
 # Remove DejaVu and Liberation fonts - these are included in other packages
-rm -f opt/openoffice.org/basis3.1/share/fonts/truetype/[DL]*.ttf
+rm -f opt/openoffice.org/basis3.2/share/fonts/truetype/[DL]*.ttf
 
 # Fix Exec commands in the desktop files
 # See http://bugzilla.xfce.org/show_bug.cgi?id=2430 
@@ -156,4 +160,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 chown -R root:root .
 find . -type d -exec chmod 755 {} \;
 chmod -R u+rw,go+r-w,a-s .
-/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-${VERSION}_${PKG_LANG}-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-${VERSION}_${PKG_LANG}-$PKGARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/openoffice.org/openoffice.org.info b/office/openoffice.org/openoffice.org.info
index 84872b83cfd2..fa43bcb7493d 100644
--- a/office/openoffice.org/openoffice.org.info
+++ b/office/openoffice.org/openoffice.org.info
@@ -1,8 +1,10 @@
 PRGNAM="openoffice.org"
-VERSION="3.1.0"
+VERSION="3.2.0"
 HOMEPAGE="http://openoffice.org"
-DOWNLOAD="http://mirrors.isc.org/pub/openoffice/stable/3.1.0/OOo_3.1.0_LinuxIntel_install_en-US.tar.gz"
-MD5SUM="b89dbf7da6c4d25195345b0d5bd80102"
+DOWNLOAD="http://ftp.osuosl.org/pub/openoffice/stable/3.2.0/OOo_3.2.0_LinuxIntel_install_en-US.tar.gz"
+MD5SUM="0ffaddb7207284646ed617d6ba9cf5b1"
+DOWNLOAD_x86_64="http://ftp.osuosl.org/pub/openoffice/stable/3.2.0/OOo_3.2.0_LinuxX86-64_install_wJRE_en-US.tar.gz"
+MD5SUM_x86_64="18de2cdf19a7e29ef4aa9a30bd05b32a"
 MAINTAINER="Robby Workman"
 EMAIL="rw@rlworkman.net"
-APPROVED="chess"
+APPROVED="michiel"