Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (4987b17ecdf0c37439c216798b3e73c4fc90d067)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (4987b17ecdf0c37439c216798b3e73c4fc90d067)
  • Date: Sun, 1 Apr 2007 13:23:51 -0500

GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

dev/null
|binary
z-editors/openoffice2-bin/CONFIGURE |
17 ------
z-editors/openoffice2-bin/DETAILS |
19 +++----
z-editors/openoffice2-bin/HISTORY |
20 +++++++
z-editors/openoffice2-bin/INSTALL |
24 +++++++-
z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install.tar.gz.sig |
0
z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_de.tar.gz.sig |
0
z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_fr.tar.gz.sig |
0
z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_nl.tar.gz.sig |
0
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_de.tar.gz.sig
|binary
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_en-US.tar.gz.sig
|binary
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_fr.tar.gz.sig
|binary
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_it.tar.gz.sig
|binary
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_nb.tar.gz.sig
|binary
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_nn.tar.gz.sig
|binary
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_pl.tar.gz.sig
|binary
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_ru.tar.gz.sig
|binary
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_tr.tar.gz.sig
|binary
z-editors/openoffice2-bin/PREPARE |
20 +++++++
z-editors/openoffice2-bin/PRE_BUILD |
27 +++++++---
z-editors/openoffice2-bin/locales |
7 ++
21 files changed, 94 insertions(+), 40 deletions(-)

New commits:
commit 4987b17ecdf0c37439c216798b3e73c4fc90d067
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

openoffice2-bin: Updated to 2.2.0

diff --git a/z-editors/openoffice2-bin/CONFIGURE
b/z-editors/openoffice2-bin/CONFIGURE
deleted file mode 100755
index 15b6b6b..0000000
--- a/z-editors/openoffice2-bin/CONFIGURE
+++ /dev/null
@@ -1,17 +0,0 @@
-# Standard rejected warnings.
-#
-source $GRIMOIRE/REJECTED_MSG &&
-
-persistent_add OO2_LOCALE &&
-OO2_LOCALE=en &&
-if query "Do you want to select a localization?" n; then
- local ALL_LOCALES=$( cat $SCRIPT_DIRECTORY/locales ) &&
- echo $ALL_LOCALES &&
- OO2_LOCALE=$( dialog --backtitle "OpenOffice 2 localization
selection" \
- --stdout \
- --title "Select locale please" \
- --radiolist \
- "" \
- 0 0 5 \
- $ALL_LOCALES )
-fi
diff --git a/z-editors/openoffice2-bin/DETAILS
b/z-editors/openoffice2-bin/DETAILS
index b0a6f82..f8e745b 100755
--- a/z-editors/openoffice2-bin/DETAILS
+++ b/z-editors/openoffice2-bin/DETAILS
@@ -1,20 +1,19 @@
SPELL=openoffice2-bin
- VERSION=2.0.4-5
+ VERSION=2.2.0
if [ "${OO2_LOCALE:-en}" == "en" ]; then
- SOURCE=OOo_${VERSION/-*/}_LinuxIntel_install.tar.gz
- COMMON_PATH=openoffice/stable
+ SOURCE=OOo_${VERSION/-*/}_LinuxIntel_install_en-US.tar.gz
+ COMMON_PATH=openoffice/stable/${VERSION/-*/}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/openoffice2
else
SOURCE=OOo_${VERSION/-*/}_LinuxIntel_install_${OO2_LOCALE}.tar.gz
- COMMON_PATH=openoffice/localized/${OO2_LOCALE}
+ COMMON_PATH=openoffice/localized/${OO2_LOCALE}/${VERSION/-*/}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/openoffice2
fi
-
SOURCE_URL[0]=http://mirrors.isc.org/pub/${COMMON_PATH}/${VERSION/-*/}/${SOURCE}
-
SOURCE_URL[1]=ftp://ftp.ussg.iu.edu/pub/${COMMON_PATH}/${VERSION/-*/}/${SOURCE}
-
SOURCE_URL[2]=http://mirror.pacific.net.au/${COMMON_PATH}/${VERSION/-*/}/${SOURCE}
-
SOURCE_URL[3]=http://downloads.planetmirror.com/pub/${COMMON_PATH}/${VERSION/-*/}/${SOURCE}
-
SOURCE_URL[4]=http://ftp.scarlet.be/pub/${COMMON_PATH}/${VERSION/-*/}/${SOURCE}
-#
SOURCE_URL[1]=ftp://ftp.ussg.iu.edu/pub/openoffice/developer/680_m130/$SOURCE
+ 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}
+
SOURCE_URL[3]=http://downloads.planetmirror.com/pub/${COMMON_PATH}/${SOURCE}
+ SOURCE_URL[4]=http://ftp.scarlet.be/pub/${COMMON_PATH}/${SOURCE}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=LGPL
WEB_SITE=http://www.openoffice.org
diff --git a/z-editors/openoffice2-bin/HISTORY
b/z-editors/openoffice2-bin/HISTORY
index f2dd732..f570bed 100644
--- a/z-editors/openoffice2-bin/HISTORY
+++ b/z-editors/openoffice2-bin/HISTORY
@@ -1,3 +1,23 @@
+2007-03-30 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 2.2.0
+ * CONFIGURE: Renamed to PREPARE so we have OO2_LOCALES set in DETAILS
+ Only set OO2_LOCALE if not configuring, defalt to en
+ * PRE_BUILD: RPM doesn't use .0 in VERSIONs
+ Switch to Redhat menus as the freedesktop ones fail to gunzip
+ Some languages (e.g. nb) do not have the OO* directory...
+ And "ru" and "tr" use yet another subdir...
+ * INSTALL: Use VERSION (minus the .0) for directory to copy
+ use SOURCE_DIRECTORY rather than BUILD_DIRECTORY
+ Some languages (e.g. nb) do not have the OO* directory...
+ And "ru" and "tr" use yet another subdir...
+ * locales: Added Italy (it)
+ Added (nb)
+ Added (nn)
+ Added (pl)
+ Added Russia (ru)
+ Added (tr)
+ Removed Netherlands (nl)
+
2007-01-19 Pieter Lenaerts <e-type AT sourcemage.org>
* INSTALL: creates /usr/share/icons

diff --git a/z-editors/openoffice2-bin/INSTALL
b/z-editors/openoffice2-bin/INSTALL
index 210bbcc..ef7e740 100755
--- a/z-editors/openoffice2-bin/INSTALL
+++ b/z-editors/openoffice2-bin/INSTALL
@@ -2,11 +2,25 @@ INSTALLDIR=$INSTALL_ROOT/opt/openoffice
mkdir -pv $INSTALLDIR/
&&
mkdir -pv ${INSTALL_ROOT}/usr/share/icons
&&

-# Extracted root directories don't have the same names between localized
-# versions, so use * wildcard although I don't find that very elegant
-cd $BUILD_DIRECTORY/openoffice2/OO*/RPMS &&
-cp -Rv opt/openoffice.org2.0/* $INSTALLDIR
&&
-cp -Rv usr/share/icons/* $INSTALL_ROOT/usr/share/icons
&&
+#
+# Not all tarballs are created equal
+#
+if [[ "$OO2_LOCALE" == "nb" ||
+ "$OO2_LOCALE" == "nn" ]]; then
+ cd $SOURCE_DIRECTORY/RPMS
+elif [[ "$OO2_LOCALE" == "ru" ||
+ "$OO2_LOCALE" == "tr" ]]; then
+ cd $SOURCE_DIRECTORY/$OO2_LOCALE/RPMS
+else
+ #
+ # Extracted root directories don't have the same names between localized
+ # versions, so use * wildcard although I don't find that very elegant
+ #
+ cd $SOURCE_DIRECTORY/OO*/RPMS
+fi &&
+
+cp -Rv opt/openoffice.org${VERSION/.0}/* $INSTALLDIR &&
+cp -Rv usr/share/icons/* $INSTALL_ROOT/usr/share/icons &&

# create bin links for executables.
for LINK in "sbase" "scalc" "sdraw" "simpress" "smath" "soffice"
"swriter" "spadmin"
diff --git
a/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install.tar.gz.sig
deleted file mode 100644
index 86586ef..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install.tar.gz.sig and
/dev/null differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_de.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_de.tar.gz.sig
deleted file mode 100644
index 0ab051a..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_de.tar.gz.sig and
/dev/null differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_fr.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_fr.tar.gz.sig
deleted file mode 100644
index a064fc5..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_fr.tar.gz.sig and
/dev/null differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_nl.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_nl.tar.gz.sig
deleted file mode 100644
index 44f6a55..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.0.4_LinuxIntel_install_nl.tar.gz.sig and
/dev/null differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_de.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_de.tar.gz.sig
new file mode 100644
index 0000000..f451ea2
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_de.tar.gz.sig differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_en-US.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_en-US.tar.gz.sig
new file mode 100644
index 0000000..14644de
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_en-US.tar.gz.sig
differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_fr.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_fr.tar.gz.sig
new file mode 100644
index 0000000..5cf1af8
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_fr.tar.gz.sig differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_it.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_it.tar.gz.sig
new file mode 100644
index 0000000..a66e7ab
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_it.tar.gz.sig differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_nb.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_nb.tar.gz.sig
new file mode 100644
index 0000000..4882f96
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_nb.tar.gz.sig differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_nn.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_nn.tar.gz.sig
new file mode 100644
index 0000000..5218e07
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_nn.tar.gz.sig differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_pl.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_pl.tar.gz.sig
new file mode 100644
index 0000000..084788a
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_pl.tar.gz.sig differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_ru.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_ru.tar.gz.sig
new file mode 100644
index 0000000..3cd6bba
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_ru.tar.gz.sig differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_tr.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_tr.tar.gz.sig
new file mode 100644
index 0000000..feef0fb
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_tr.tar.gz.sig differ
diff --git a/z-editors/openoffice2-bin/PREPARE
b/z-editors/openoffice2-bin/PREPARE
new file mode 100755
index 0000000..4e3bf30
--- /dev/null
+++ b/z-editors/openoffice2-bin/PREPARE
@@ -0,0 +1,20 @@
+# Standard rejected warnings.
+#
+source $GRIMOIRE/REJECTED_MSG &&
+
+persistent_add OO2_LOCALE &&
+if query "Do you want to select a localization?" n; then
+ local ALL_LOCALES=$( cat $SCRIPT_DIRECTORY/locales ) &&
+ echo $ALL_LOCALES &&
+ OO2_LOCALE=$( dialog --backtitle "OpenOffice 2 localization
selection" \
+ --stdout \
+ --title "Select locale please" \
+ --radiolist \
+ "" \
+ 0 0 5 \
+ $ALL_LOCALES )
+else
+ if [[ -z $OO2_LOCALE ]]; then
+ OO2_LOCALE=en
+ fi
+fi
diff --git a/z-editors/openoffice2-bin/PRE_BUILD
b/z-editors/openoffice2-bin/PRE_BUILD
index 9836eb5..584e412 100755
--- a/z-editors/openoffice2-bin/PRE_BUILD
+++ b/z-editors/openoffice2-bin/PRE_BUILD
@@ -1,11 +1,24 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
+
unpack_file '' &&

-#cd OOO680_m3_native_packed-2_en-US.8968/RPMS &&
-# Extracted root directories don't have the same names between localized
-# versions, so use * wildcard although I don't find that very elegant
-cd OO*/RPMS &&
+#
+# Not all tarballs are created equal
+#
+if [[ "$OO2_LOCALE" == "nb" ||
+ "$OO2_LOCALE" == "nn" ]]; then
+ cd RPMS
+elif [[ "$OO2_LOCALE" == "ru" ||
+ "$OO2_LOCALE" == "tr" ]]; then
+ cd $OO2_LOCALE/RPMS
+else
+ #
+ # Extracted root directories don't have the same names between localized
+ # versions, so use * wildcard although I don't find that very elegant
+ #
+ cd OO*/RPMS
+fi &&

for FILE in *.rpm
do
@@ -18,6 +31,6 @@ do
done &&

message "${MESSAGE_COLOR}Extracting icons ${DEFAULT_COLOR}" &&
-rpmunpack
desktop-integration/openoffice.org-freedesktop-menus-${VERSION/-?/}*.noarch.rpm
&&
-gzip -d openoffice.org-freedesktop-menus-${VERSION/-?/}*.cpio.gz &&
-cpio -idm < openoffice.org-freedesktop-menus-${VERSION/-?/}*.cpio
+rpmunpack
desktop-integration/openoffice.org-redhat-menus-${VERSION/.0/}*.noarch.rpm &&
+gzip -d openoffice.org-redhat-menus-${VERSION/.0/}*.cpio.gz &&
+cpio -idm < openoffice.org-redhat-menus-${VERSION/.0/}*.cpio
diff --git a/z-editors/openoffice2-bin/locales
b/z-editors/openoffice2-bin/locales
index 97e20ce..10e4d34 100644
--- a/z-editors/openoffice2-bin/locales
+++ b/z-editors/openoffice2-bin/locales
@@ -1,4 +1,9 @@
en English_locale on
de German_locale off
fr French_locale off
-nl Dutch_locale off
+it Italy_locale off
+nb NB_locale off
+nn NN_locale off
+pl PL_locale off
+ru Russia_locale off
+tr TR_locale off



  • [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (4987b17ecdf0c37439c216798b3e73c4fc90d067), Eric Sandall, 04/01/2007

Archive powered by MHonArc 2.6.24.

Top of Page