[SM-Commit] GIT changes to master z-rejected grimoire by George Sherwood (a36759443a7a2da3a3ce03304e898f46bae897e3)

George Sherwood scm at sourcemage.org
Wed Oct 15 10:00:45 EDT 2008


GIT changes to master z-rejected grimoire by George Sherwood <gsherwood at sourcemage.org>:

 z-editors/openoffice3-bin/DETAILS   |   12 ++++++------
 z-editors/openoffice3-bin/HISTORY   |    6 ++++++
 z-editors/openoffice3-bin/PRE_BUILD |    2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit a36759443a7a2da3a3ce03304e898f46bae897e3
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    openoffice3-bin: Updated to 3.0.0 release version.  Hardcoding one version
    number will need to be fixed, but didn't want to create another variable
    for one version. Appears HASH is the same as last rc.

diff --git a/z-editors/openoffice3-bin/DETAILS b/z-editors/openoffice3-bin/DETAILS
index f942554..c605c01 100755
--- a/z-editors/openoffice3-bin/DETAILS
+++ b/z-editors/openoffice3-bin/DETAILS
@@ -1,18 +1,18 @@
            SPELL=openoffice3-bin
-         VERSION=3.0.0rc4
-   BUILD_VERSION=9354
-    VERSION_DATE=20080930
+         VERSION=3.0.0
+   BUILD_VERSION=9358
+#    VERSION_DATE=20080930
 if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
-          SOURCE=OOo_${VERSION}_${VERSION_DATE}_LinuxX86-64_install_en-US.tar.gz
+          SOURCE=OOo_${VERSION}_LinuxX86-64_install_en-US.tar.gz
      SOURCE_HASH=sha512:28fd589d0d4b2d3837d37cbfd0bff725933990588ccf919ce2955ea6097431e1fbe783e23c310dcd2a4a5cd870686e26271c6cc0e48352244ace46e9dabb25fa
          OO_ARCH=x86_64
 else
-          SOURCE=OOo_${VERSION}_${VERSION_DATE}_LinuxIntel_install_en-US.tar.gz
+          SOURCE=OOo_${VERSION}_LinuxIntel_install_en-US.tar.gz
      SOURCE_HASH=sha512:dd3bcb247e09328fe19a6ce173818f80b83f3f9e6a96b453ab7e0cfff94e784bc413b0ee91946dbf6989c37329a2679bea8997aaf404f9d991eb6363d513db64
          OO_ARCH=i586
 fi
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/openoffice3
-     COMMON_PATH=openoffice/contrib/rc/${VERSION}
+     COMMON_PATH=openoffice/stable/${VERSION}
    SOURCE_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${SOURCE}
    SOURCE_URL[1]=ftp://ftp.ussg.iu.edu/pub/${COMMON_PATH}/${SOURCE}
    SOURCE_URL[2]=http://mirror.pacific.net.au/${COMMON_PATH}/${SOURCE}
diff --git a/z-editors/openoffice3-bin/HISTORY b/z-editors/openoffice3-bin/HISTORY
index 095348b..b020f86 100644
--- a/z-editors/openoffice3-bin/HISTORY
+++ b/z-editors/openoffice3-bin/HISTORY
@@ -1,3 +1,9 @@
+2008-10-15 George Sherwood <gsherwood at sourcemage.org>
+	* DETAILS: Updated to version release 3.0.0. Updated SOURCE_URL
+	  VERSION_DATE not include now.
+	* PRE_BUILD: Adjusted desktop integraton files.  They are using
+	  the files from last build.
+
 2008-10-07 Julien "_kaze_" ROZO <julien at rozo.org>
 	* DETAILS: updated version to 3.0.0rc4
 
diff --git a/z-editors/openoffice3-bin/PRE_BUILD b/z-editors/openoffice3-bin/PRE_BUILD
index 0e86046..19f436f 100755
--- a/z-editors/openoffice3-bin/PRE_BUILD
+++ b/z-editors/openoffice3-bin/PRE_BUILD
@@ -20,7 +20,7 @@ do
 done  &&
 
 message  "${MESSAGE_COLOR}Extracting icons ${DEFAULT_COLOR}"  &&
-FILENAME="openoffice.org${VERSION%.*}*-freedesktop-menus-${VERSION%.*}-${BUILD_VERSION}" &&
+FILENAME="openoffice.org${VERSION%.*}-freedesktop-menus-${VERSION%.*}-9354" &&
 rpmunpack  desktop-integration/${FILENAME}.noarch.rpm  &&
 gzip  -d  ${FILENAME}.cpio.gz     &&
 cpio  -idm  <  ${FILENAME}.cpio



More information about the SM-Commit mailing list