openoffice3-bin: Updated to 3.1.1 Build 9420

SOURCE for x86_64 is now only available wJRE
Freedesktop menus updated to Build 9420

7 files changed, 12 insertions, 7 deletions

diff --git a/bin-editors/openoffice3-bin/DETAILS b/bin-editors/openoffice3-bin/DETAILS
index 2c380e1..108aa1c 100755
--- a/bin-editors/openoffice3-bin/DETAILS
+++ b/bin-editors/openoffice3-bin/DETAILS
@@ -1,15 +1,15 @@
            SPELL=openoffice3-bin
 #    VERSION_DATE=20080930
 if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
-         VERSION=3.1.0
-   BUILD_VERSION=9399
-          SOURCE=OOo_${VERSION}_LinuxX86-64_install_en-US.tar.gz
+         VERSION=3.1.1
+   BUILD_VERSION=9420
+          SOURCE=OOo_${VERSION}_LinuxX86-64_install_wJRE_en-US.tar.gz
 #     SOURCE_HASH=sha512:28fd589d0d4b2d3837d37cbfd0bff725933990588ccf919ce2955ea6097431e1fbe783e23c310dcd2a4a5cd870686e26271c6cc0e48352244ace46e9dabb25fa
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
          OO_ARCH=x86_64
 else
-         VERSION=3.1.0
-   BUILD_VERSION=9399
+         VERSION=3.1.1
+   BUILD_VERSION=9420
           SOURCE=OOo_${VERSION}_LinuxIntel_install_en-US.tar.gz
 #     SOURCE_HASH=sha512:dd3bcb247e09328fe19a6ce173818f80b83f3f9e6a96b453ab7e0cfff94e784bc413b0ee91946dbf6989c37329a2679bea8997aaf404f9d991eb6363d513db64
       SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
diff --git a/bin-editors/openoffice3-bin/HISTORY b/bin-editors/openoffice3-bin/HISTORY
index 3b758bf..12de6fd 100644
--- a/bin-editors/openoffice3-bin/HISTORY
+++ b/bin-editors/openoffice3-bin/HISTORY
@@ -1,3 +1,8 @@
+2009-11-30 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 3.1.1 Build 9420
+	  SOURCE for x86_64 is now only available wJRE
+	* PRE_BUILD: Freedesktop menus updated to Build 9420
+
 2009-05-07 Julien "_kaze_" ROZO <julien@rozo.org>
 	* DETAILS: updated version to 3.1.0 (build 9399)
 	* PRE_BUILD: icons are at build 9393
diff --git a/bin-editors/openoffice3-bin/OOo_3.1.0_LinuxIntel_install_en-US.tar.gz.sig b/bin-editors/openoffice3-bin/OOo_3.1.0_LinuxIntel_install_en-US.tar.gz.sig
deleted file mode 100644
index c218db2..0000000
--- a/bin-editors/openoffice3-bin/OOo_3.1.0_LinuxIntel_install_en-US.tar.gz.sig
+++ /dev/null
diff --git a/bin-editors/openoffice3-bin/OOo_3.1.0_LinuxX86-64_install_en-US.tar.gz.sig b/bin-editors/openoffice3-bin/OOo_3.1.0_LinuxX86-64_install_en-US.tar.gz.sig
deleted file mode 100644
index 96212c3..0000000
--- a/bin-editors/openoffice3-bin/OOo_3.1.0_LinuxX86-64_install_en-US.tar.gz.sig
+++ /dev/null
diff --git a/bin-editors/openoffice3-bin/OOo_3.1.1_LinuxIntel_install_en-US.tar.gz.sig b/bin-editors/openoffice3-bin/OOo_3.1.1_LinuxIntel_install_en-US.tar.gz.sig
new file mode 100644
index 0000000..1519dd8
--- /dev/null
+++ b/bin-editors/openoffice3-bin/OOo_3.1.1_LinuxIntel_install_en-US.tar.gz.sig
diff --git a/bin-editors/openoffice3-bin/OOo_3.1.1_LinuxX86-64_install_wJRE_en-US.tar.gz.sig b/bin-editors/openoffice3-bin/OOo_3.1.1_LinuxX86-64_install_wJRE_en-US.tar.gz.sig
new file mode 100644
index 0000000..11f1a65
--- /dev/null
+++ b/bin-editors/openoffice3-bin/OOo_3.1.1_LinuxX86-64_install_wJRE_en-US.tar.gz.sig
diff --git a/bin-editors/openoffice3-bin/PRE_BUILD b/bin-editors/openoffice3-bin/PRE_BUILD
index d45614e..bd2080d 100755
--- a/bin-editors/openoffice3-bin/PRE_BUILD
+++ b/bin-editors/openoffice3-bin/PRE_BUILD
@@ -21,9 +21,9 @@ done  &&
 
 message  "${MESSAGE_COLOR}Extracting icons ${DEFAULT_COLOR}"  &&
 if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
-  FILENAME="openoffice.org${VERSION%.*}-freedesktop-menus-${VERSION%.*}-9393"
+  FILENAME="openoffice.org${VERSION%.*}-freedesktop-menus-${VERSION%.*}-9420"
 else
-  FILENAME="openoffice.org${VERSION%.*}-freedesktop-menus-${VERSION%.*}-9393"
+  FILENAME="openoffice.org${VERSION%.*}-freedesktop-menus-${VERSION%.*}-9420"
 fi  &&
 rpmunpack  desktop-integration/${FILENAME}.noarch.rpm  &&
 gzip  -d  ${FILENAME}.cpio.gz     &&