office/libreoffice: Updated for version 3.3.0rc1.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

2 files changed, 15 insertions, 22 deletions

diff --git a/office/libreoffice/libreoffice.SlackBuild b/office/libreoffice/libreoffice.SlackBuild
index d7edc19227..dc3f982d9d 100644
--- a/office/libreoffice/libreoffice.SlackBuild
+++ b/office/libreoffice/libreoffice.SlackBuild
@@ -27,14 +27,15 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Modified by Niels Horn <niels.horn@gmail.com>
-# Revision date: 2010/11/24
+# Revision date: 2010/12/10
 
 PRGNAM=libreoffice
-VERSION="3.3.0_beta3"
+VERSION="3.3.0rc1"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVERSION=$(echo $VERSION | cut -f1 -d_)
+# I'll leave this line here, since I have to change it with every release...
+SRCVERSION=$VERSION
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -49,21 +50,12 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# This should allow you to either pass a different value of LOLANG when you
-# run the script (LOLANG=pt-BR ./libreoffice.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...
-# You can get localized tarballs from the following location:
-### --> TODO: No localized versions available yet <-- ###
-# ???://???/$LOLANG/$VERSION/
-# Thanks to Niki Kovacs for finding this :-)
+# For now it seems upstream will have only one "base" program in 'en-US' and
+#   LanguagePacks for all other languages.
 LOLANG=${LOLANG:-en-US}
 PKG_LANG=${LOLANG//-/_}	# Leave this alone
-# Some localized versions only ship with a bundled JRE, and we'd like this
-# 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.
-### --> TODO: Changed default to "no" for now <-- ###
+
+# Until now all releases were without the JRE...
 WJRE=${WJRE:-no}
 
 # If you want to disable java support by removing executable permissions
@@ -117,9 +109,10 @@ rm -rf $TMP/$SOURCEDIR/{JavaSetup.jar,installdata,setup}
 rm -rf $TMP/$SOURCEDIR/RPMS/{userland,jre-*-linux-*.rpm}
 
 cd $TMP/$SOURCEDIR/RPMS/
+
 # 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/libreoffice3.3-freedesktop-menus-3.3-2.noarch.rpm .
+mv desktop-integration/libreoffice3.3-freedesktop-menus-3.3-3.noarch.rpm .
 
 # No, I don't want to update our packaged files after the fact
 rm -f *onlineupdate*.rpm # We don't want this
diff --git a/office/libreoffice/libreoffice.info b/office/libreoffice/libreoffice.info
index 9b5cf790cf..2a80d87711 100644
--- a/office/libreoffice/libreoffice.info
+++ b/office/libreoffice/libreoffice.info
@@ -1,10 +1,10 @@
 PRGNAM="libreoffice"
-VERSION="3.3.0_beta3"
+VERSION="3.3.0rc1"
 HOMEPAGE="http://www.documentfoundation.org"
-DOWNLOAD="http://download.documentfoundation.org/libreoffice/testing/3.3.0-beta3/rpm/x86/LibO_3.3.0_Linux_x86_install-rpm_en-US.tar.gz"
-MD5SUM="712d2ec29a6c6f89511d82a40dbf9d4c"
-DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/testing/3.3.0-beta3/rpm/x86_64/LibO_3.3.0_Linux_x86-64_install-rpm_en-US.tar.gz"
-MD5SUM_x86_64="f0abb53d6a85343b0c0b23ba9db27753"
+DOWNLOAD="http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc1/rpm/x86/LibO_3.3.0rc1_Linux_x86_install-rpm_en-US.tar.gz"
+MD5SUM="59c670fcd9e45d087ec1c5e0b9dbcab0"
+DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc1/rpm/x86_64/LibO_3.3.0rc1_Linux_x86-64_install-rpm_en-US.tar.gz"
+MD5SUM_x86_64="019bd7b634cccf6d8b03518103956f2a"
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
 APPROVED="rworkman"