office/libreoffice: Updated for version 3.3.0.

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

3 files changed, 12 insertions, 19 deletions

diff --git a/office/libreoffice/README b/office/libreoffice/README
index a6ecb13134..0d4185ba98 100644
--- a/office/libreoffice/README
+++ b/office/libreoffice/README
@@ -10,12 +10,8 @@ dependencies not satisfied by a normal installation.
 Be sure to look at the script for some optional things you can do when
 building.
 
-NOTE:
-  See the separate SlackBuild script for the language packs.
-
-NOTE2:
-   To keep LibreOffice installed concurrently with OpenOffice, run the
-   included open-libre-together.sh script saved in the
-   /usr/doc/libreoffice-<version>/ directory to patch the .desktop menu
-   files.
+NOTE: See the separate SlackBuild script for the language packs.
 
+NOTE2: To keep LibreOffice installed concurrently with OpenOffice, run the
+       included "open-libre-together.sh" script saved in the documentation
+       directory of this package to patch the .desktop menu files.
diff --git a/office/libreoffice/libreoffice.SlackBuild b/office/libreoffice/libreoffice.SlackBuild
index c81e879e1c..83c456cde2 100644
--- a/office/libreoffice/libreoffice.SlackBuild
+++ b/office/libreoffice/libreoffice.SlackBuild
@@ -2,9 +2,6 @@
 
 # Slackware build script for LibreOffice
 
-# This is somewhat like a "fork" of the OpenOffice.org script, with permission
-# from its author, Robby Workman
-
 # Copyright 2006,2007,2008,2009,2010  Robby Workman, Northport, Alabama, USA
 # Copyright 2010,2011 Niels Horn, Rio de Janeiro, RJ, Brazil
 # All rights reserved.
@@ -30,7 +27,7 @@
 # Revision date: 2011/01/03
 
 PRGNAM=libreoffice
-VERSION="3.3.0rc2"
+VERSION="3.3.0"
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -112,7 +109,7 @@ 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-4.noarch.rpm .
+mv desktop-integration/libreoffice3.3-freedesktop-menus-3.3-6.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 fd2e74cf5d..b745b84b18 100644
--- a/office/libreoffice/libreoffice.info
+++ b/office/libreoffice/libreoffice.info
@@ -1,10 +1,10 @@
 PRGNAM="libreoffice"
-VERSION="3.3.0rc2"
+VERSION="3.3.0"
 HOMEPAGE="http://www.documentfoundation.org"
-DOWNLOAD="http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc2/rpm/x86/LibO_3.3.0rc2_Linux_x86_install-rpm_en-US.tar.gz"
-MD5SUM="19917f506434c12f1f8f8ce264275f8e"
-DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc2/rpm/x86_64/LibO_3.3.0rc2_Linux_x86-64_install-rpm_en-US.tar.gz"
-MD5SUM_x86_64="b4ae8fed64330c96b2228ef372b59c96"
+DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/3.3.0/rpm/x86/LibO_3.3.0_Linux_x86_install-rpm_en-US.tar.gz"
+MD5SUM="8e9c2e374fb96ed85c7a7878ce718ef6"
+DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/3.3.0/rpm/x86_64/LibO_3.3.0_Linux_x86-64_install-rpm_en-US.tar.gz"
+MD5SUM_x86_64="82c0f1428b841567d76428d57b6c1b18"
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
-APPROVED="dsomero"
+APPROVED="rworkman"