[SM-Commit] GIT changes to master binary grimoire by sandalle (bea2b870151c2ba710a3368b52c24815c009d46a)

sandalle scm at sourcemage.org
Sat Feb 7 00:59:23 EST 2009


GIT changes to master binary grimoire by sandalle <sandalle at pangomer.(none)>:

 bin-editors/openoffice3-bin-lang/CONFIGURE                                |    4 +++-
 bin-editors/openoffice3-bin-lang/DETAILS                                  |    2 +-
 bin-editors/openoffice3-bin-lang/HISTORY                                  |    4 ++++
 bin-editors/openoffice3-bin/DETAILS                                       |    9 ++++++---
 bin-editors/openoffice3-bin/HISTORY                                       |    6 ++++++
 bin-editors/openoffice3-bin/OOo_3.0.1_LinuxIntel_install_en-US.tar.gz.sig |binary
 bin-editors/openoffice3-bin/PRE_BUILD                                     |    6 +++++-
 7 files changed, 25 insertions(+), 6 deletions(-)

New commits:
commit bea2b870151c2ba710a3368b52c24815c009d46a
Author: sandalle <sandalle at pangomer.(none)>
Commit: sandalle <sandalle at pangomer.(none)>

    openoffice3-bin-lang: Updated to 3.0.1, lost language vi

commit b68e5878fb2688fd947a5bf22173f02182e3ccb1
Author: sandalle <sandalle at pangomer.(none)>
Commit: sandalle <sandalle at pangomer.(none)>

    openoffice3-bin: x86_64 SOURCE_HASH should use sha512, not sha513 ;)

commit 98074b086159c175bcf50838777ae7973ac8afd3
Author: sandalle <sandalle at pangomer.(none)>
Commit: sandalle <sandalle at pangomer.(none)>

    openoffice3-bin: Updated x86 to 3.0.1 (Build 9379)
    No x86_64 3.0.1 available yet
    3.0.1 freedesktop-menus at Build 9376

diff --git a/bin-editors/openoffice3-bin-lang/CONFIGURE b/bin-editors/openoffice3-bin-lang/CONFIGURE
index e4612ef..26fcb49 100755
--- a/bin-editors/openoffice3-bin-lang/CONFIGURE
+++ b/bin-editors/openoffice3-bin-lang/CONFIGURE
@@ -7,8 +7,10 @@ get_ooo3languages()  {
   rm -f  $CFG                    &&
   touch  $CFG                    &&
 
+list_remove OOO3_LANG vi  ||  true  &&
+
 config_query_multi OOO3_LANG "please specify the desired languages" \
-fr nl vi  &&
+fr nl &&
 
 # should perhaps use SOURCE_IGNORE=unversioned instead of MD5[0]="IGNORE" 
       local  i=1                        &&
diff --git a/bin-editors/openoffice3-bin-lang/DETAILS b/bin-editors/openoffice3-bin-lang/DETAILS
index 1298d00..173e897 100755
--- a/bin-editors/openoffice3-bin-lang/DETAILS
+++ b/bin-editors/openoffice3-bin-lang/DETAILS
@@ -1,6 +1,6 @@
 # the remaining details of this spell are provided by CONFIGURE
            SPELL=openoffice3-bin-lang
-         VERSION=3.0.0
+         VERSION=3.0.1
          OO_ARCH=i586
             SITE=http://mirrors.isc.org/pub/openoffice/localized
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
diff --git a/bin-editors/openoffice3-bin-lang/HISTORY b/bin-editors/openoffice3-bin-lang/HISTORY
index 3281f13..f7ace87 100644
--- a/bin-editors/openoffice3-bin-lang/HISTORY
+++ b/bin-editors/openoffice3-bin-lang/HISTORY
@@ -1,3 +1,7 @@
+2009-02-05 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 3.0.1
+	* CONFIGURE: vi language has not been updated to 3.0.1
+
 2008-11-24 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS, BUILD, CONFIGURE, INSTALL, PRE_BUILD, HISTORY:
 	  created this spell
diff --git a/bin-editors/openoffice3-bin/DETAILS b/bin-editors/openoffice3-bin/DETAILS
index a396fa7..ccf5d39 100755
--- a/bin-editors/openoffice3-bin/DETAILS
+++ b/bin-editors/openoffice3-bin/DETAILS
@@ -1,14 +1,17 @@
            SPELL=openoffice3-bin
-         VERSION=3.0.0
-   BUILD_VERSION=9358
 #    VERSION_DATE=20080930
 if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+         VERSION=3.0.0
+   BUILD_VERSION=9358
           SOURCE=OOo_${VERSION}_LinuxX86-64_install_en-US.tar.gz
      SOURCE_HASH=sha512:28fd589d0d4b2d3837d37cbfd0bff725933990588ccf919ce2955ea6097431e1fbe783e23c310dcd2a4a5cd870686e26271c6cc0e48352244ace46e9dabb25fa
          OO_ARCH=x86_64
 else
+         VERSION=3.0.1
+   BUILD_VERSION=9379
           SOURCE=OOo_${VERSION}_LinuxIntel_install_en-US.tar.gz
-     SOURCE_HASH=sha512:dd3bcb247e09328fe19a6ce173818f80b83f3f9e6a96b453ab7e0cfff94e784bc413b0ee91946dbf6989c37329a2679bea8997aaf404f9d991eb6363d513db64
+#     SOURCE_HASH=sha512:dd3bcb247e09328fe19a6ce173818f80b83f3f9e6a96b453ab7e0cfff94e784bc413b0ee91946dbf6989c37329a2679bea8997aaf404f9d991eb6363d513db64
+      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
          OO_ARCH=i586
 fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/openoffice3
diff --git a/bin-editors/openoffice3-bin/HISTORY b/bin-editors/openoffice3-bin/HISTORY
index c688e67..a76347e 100644
--- a/bin-editors/openoffice3-bin/HISTORY
+++ b/bin-editors/openoffice3-bin/HISTORY
@@ -1,3 +1,9 @@
+2009-02-05 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated x86 to 3.0.1 (Build 9379)
+	  No x86_64 3.0.1 available yet
+	  x86_64 SOURCE_HASH should use sha512, not sha513 ;)
+	* PRE_BUILD: 3.0.1 freedesktop-menus at Build 9376
+
 2008-11-24 Julien "_kaze_" ROZO <julien at rozo.org>
 	* FINAL: added, suggest to add languagepacks
 
diff --git a/bin-editors/openoffice3-bin/OOo_3.0.1_LinuxIntel_install_en-US.tar.gz.sig b/bin-editors/openoffice3-bin/OOo_3.0.1_LinuxIntel_install_en-US.tar.gz.sig
new file mode 100644
index 0000000..4a06427
Binary files /dev/null and b/bin-editors/openoffice3-bin/OOo_3.0.1_LinuxIntel_install_en-US.tar.gz.sig differ
diff --git a/bin-editors/openoffice3-bin/PRE_BUILD b/bin-editors/openoffice3-bin/PRE_BUILD
index 19f436f..c09dca7 100755
--- a/bin-editors/openoffice3-bin/PRE_BUILD
+++ b/bin-editors/openoffice3-bin/PRE_BUILD
@@ -20,7 +20,11 @@ do
 done  &&
 
 message  "${MESSAGE_COLOR}Extracting icons ${DEFAULT_COLOR}"  &&
-FILENAME="openoffice.org${VERSION%.*}-freedesktop-menus-${VERSION%.*}-9354" &&
+if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+  FILENAME="openoffice.org${VERSION%.*}-freedesktop-menus-${VERSION%.*}-9354"
+else
+  FILENAME="openoffice.org${VERSION%.*}-freedesktop-menus-${VERSION%.*}-9376"
+fi  &&
 rpmunpack  desktop-integration/${FILENAME}.noarch.rpm  &&
 gzip  -d  ${FILENAME}.cpio.gz     &&
 cpio  -idm  <  ${FILENAME}.cpio



More information about the SM-Commit mailing list