summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--office/openoffice.org/openoffice.org.SlackBuild46
-rw-r--r--office/openoffice.org/openoffice.org.info10
2 files changed, 31 insertions, 25 deletions
diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild
index d16802e767..4ee5a89eb1 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-2010 Robby Workman, Northport, Alabama, ASA
+# Copyright 2006,2007,2008,2009,2010 Robby Workman, Northport, Alabama, ASA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,15 +23,15 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# 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 Fred Emmott for some better code in a few places and ideas
+# to include the Optimization Solver and disable javaldx.
# Thanks to hba for the idea to include support for other languages.
# Thanks to Nille Akerstrom for the diff to support w/JRE tarballs
# Thanks to ivo@linvo.org for hints on installing extensions
# Thsnks to necropresto for better x86_64 support
PRGNAM=openoffice.org
-VERSION=3.2.0
+VERSION=3.2.1
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -60,8 +60,10 @@ OUTPUT=${OUTPUT:-/tmp}
OOLANG=${OOLANG:-en-US}
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}
+# script to work on those as well... More importantly, the non-jre tarballs
+# don't seem to hang around on the mirrors for the last two releases, so I'm
+# just going to use the jre-bundled tarballs.
+WJRE=${WJRE:-yes}
# If you want to disable java support by removing executable permissions
# form OOo's java loader (this will not affect other apps), set this
@@ -70,26 +72,22 @@ DISABLE_JAVA=${DISABLE_JAVA:-NO}
# Change source package name
if [ "$ARCH" = "x86_64" ]; then
- SRCARCH="X86-64"
+ SRCARCH="x86-64"
PKGARCH="$ARCH"
- WJRE=yes #Overwrite WJRE option since the only x86_64 I see has jre
elif [ "$ARCH" = "arm" ]; then
printf "\n$ARCH is unsupported for OOo...\n\n"
exit 1
else
- SRCARCH="Intel"
+ SRCARCH="x86"
PKGARCH="i586"
fi
-# Yes, I know there is a Slackware integration file in the desktop-integration
-# directory, but it's worthless to us. I'd prefer to do things correctly.
-
# 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${SRCARCH}_install_wJRE_${OOLANG}.tar.gz | head -1 | tr -d \/)
+ SOURCEDIR=$(tar tzf $CWD/OOo_${VERSION}_Linux_${SRCARCH}_install-rpm-wJRE_${OOLANG}.tar.gz | head -1 | tr -d \/)
else
- SOURCEDIR=$(tar tzf $CWD/OOo_${VERSION}_Linux${SRCARCH}_install_${OOLANG}.tar.gz | head -1 | tr -d \/)
+ SOURCEDIR=$(tar tzf $CWD/OOo_${VERSION}_Linux_${SRCARCH}_install-rpm_${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
@@ -103,16 +101,24 @@ rm -rf $TMP/$SOURCEDIR
# Handle the tarballs that include a bundled JRE
if [ $WJRE != no ]; then
- 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-*.rpm}
+ tar xvf $CWD/OOo_${VERSION}_Linux_${SRCARCH}_install-rpm-wJRE_${OOLANG}.tar.gz -C $TMP
else
- tar xvf $CWD/OOo_${VERSION}_Linux${SRCARCH}_install_${OOLANG}.tar.gz -C $TMP
+ tar xvf $CWD/OOo_${VERSION}_Linux_${SRCARCH}_install-rpm_${OOLANG}.tar.gz -C $TMP
fi
+# We'll remove this regardless of whether we're using the jre tarball...
+rm -rf $TMP/$SOURCEDIR/{JavaSetup.jar,installdata,setup}
+rm -rf $TMP/$SOURCEDIR/RPMS/{userland,jre-*-linux-*.rpm}
+
cd $TMP/$SOURCEDIR/RPMS/
-mv desktop-integration/openoffice.org3.2-freedesktop-menus-3.2-9472.noarch.rpm .
-rm *onlineupdate*.rpm # We don't want this
+
+# Yes, I know there is a Slackware integration file in the desktop-integration
+# directory, but it's worthless to us. I'd prefer to do things correctly.
+mv desktop-integration/openoffice.org3.2-freedesktop-menus-3.2-9502.noarch.rpm .
+
+# No, I don't want to update our packaged files after the fact
+rm -f *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
diff --git a/office/openoffice.org/openoffice.org.info b/office/openoffice.org/openoffice.org.info
index fa43bcb749..2ef2540ea9 100644
--- a/office/openoffice.org/openoffice.org.info
+++ b/office/openoffice.org/openoffice.org.info
@@ -1,10 +1,10 @@
PRGNAM="openoffice.org"
-VERSION="3.2.0"
+VERSION="3.2.1"
HOMEPAGE="http://openoffice.org"
-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"
+DOWNLOAD="http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_Linux_x86_install-rpm-wJRE_en-US.tar.gz"
+MD5SUM="ae1cd777d5e06676dceae0901cab7185"
+DOWNLOAD_x86_64="http://download.services.openoffice.org/files/stable/3.2.1/OOo_3.2.1_Linux_x86-64_install-rpm-wJRE_en-US.tar.gz"
+MD5SUM_x86_64="c5acb46e8c288942829fceebd2c8ec72"
MAINTAINER="Robby Workman"
EMAIL="rw@rlworkman.net"
APPROVED="michiel"