Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (1cabf706129449c1ebd6e5637072636106149e1b)
  • Date: Sat, 4 Aug 2007 15:24:57 -0500

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

dev/null
|binary
z-editors/openoffice2-bin/DETAILS |
5 ++-
z-editors/openoffice2-bin/HISTORY |
9 ++++++
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_de.tar.gz.sig |
0
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_en-US.tar.gz.sig |
0
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_fr.tar.gz.sig |
0
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_it.tar.gz.sig |
0
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_nb.tar.gz.sig |
0
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_nn.tar.gz.sig |
0
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_pl.tar.gz.sig |
0
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_ru.tar.gz.sig |
0
z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_tr.tar.gz.sig |
0
z-editors/openoffice2-bin/OOo_2.2.1_LinuxIntel_install_en-US.tar.gz.sig
|binary
z-editors/openoffice2-bin/OOo_2.2.1_LinuxIntel_install_nl.tar.gz.sig
|binary
z-editors/openoffice2-bin/PRE_BUILD |
15 +++++++---
z-editors/openoffice2-bin/locales |
1
z-editors/openoffice2-bin/openoffice.org-core04u-2.2.1-9161.i586.rpm.sig
|binary
17 files changed, 25 insertions(+), 5 deletions(-)

New commits:
commit 1cabf706129449c1ebd6e5637072636106149e1b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

openoffice2-bin: Safe for unattended updates

commit c8d7e63e08170eeef4e4529c0f0824b1a34091d3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

openoffice2-bin: Found a replacement for the corrupt English core04u

commit 36eb52d931558b318972c2e1013dc8e7fbc10e88
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "Revert "openoffice2-bin: added dutch locale and bumped to 2.2.1""

This reverts commit cb9381e55a1e446bd17328de0e83fed7bd431f54.

Trying to get OO 2.2.1 to work as 2.2.0 tarballs are a PITA

diff --git a/z-editors/openoffice2-bin/DETAILS
b/z-editors/openoffice2-bin/DETAILS
index f8e745b..88706e7 100755
--- a/z-editors/openoffice2-bin/DETAILS
+++ b/z-editors/openoffice2-bin/DETAILS
@@ -1,7 +1,10 @@
SPELL=openoffice2-bin
- VERSION=2.2.0
+ VERSION=2.2.1
if [ "${OO2_LOCALE:-en}" == "en" ]; then
SOURCE=OOo_${VERSION/-*/}_LinuxIntel_install_en-US.tar.gz
+ SOURCE2=openoffice.org-core04u-2.2.1-9161.i586.rpm
+
SOURCE2_URL[0]=http://live.prooo-box.org/openoffice.org/linux/OOo_2.2.1_LinuxIntel_de_rpms/RPMS/$SOURCE2
+ SOURCE2_GPG="gurus.gpg:$SOURCE.sig"
COMMON_PATH=openoffice/stable/${VERSION/-*/}
SOURCE_DIRECTORY=$BUILD_DIRECTORY/openoffice2
else
diff --git a/z-editors/openoffice2-bin/HISTORY
b/z-editors/openoffice2-bin/HISTORY
index 8528644..b88d864 100644
--- a/z-editors/openoffice2-bin/HISTORY
+++ b/z-editors/openoffice2-bin/HISTORY
@@ -1,3 +1,12 @@
+2007-08-04 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Addes second SOURCE for English version to fix broken
core04u
+ * PRE_BUILD: Unpack the uncorrupted core04u instead of the corrupt
core04u
+ * UNATTEND_SAFE: Safe for unattended updates
+
+2007-07-11 Arjan Bouter <abouter AT sourcemage.org>
+ * DETAILS: version bumped to 2.2.1
+ * locales: added dutch
+
2007-06-13 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD, INSTALL: Use ${VERSION%.*} instead of ${VERSION/.0/} to
always remove the last digit for "branch" (e.g. 2.2)
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
deleted file mode 100644
index f451ea2..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_de.tar.gz.sig and
/dev/null 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
deleted file mode 100644
index 14644de..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_en-US.tar.gz.sig and
/dev/null 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
deleted file mode 100644
index 5cf1af8..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_fr.tar.gz.sig and
/dev/null 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
deleted file mode 100644
index a66e7ab..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_it.tar.gz.sig and
/dev/null 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
deleted file mode 100644
index 4882f96..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_nb.tar.gz.sig and
/dev/null 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
deleted file mode 100644
index 5218e07..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_nn.tar.gz.sig and
/dev/null 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
deleted file mode 100644
index 084788a..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_pl.tar.gz.sig and
/dev/null 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
deleted file mode 100644
index 3cd6bba..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_ru.tar.gz.sig and
/dev/null 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
deleted file mode 100644
index feef0fb..0000000
Binary files
a/z-editors/openoffice2-bin/OOo_2.2.0_LinuxIntel_install_tr.tar.gz.sig and
/dev/null differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.2.1_LinuxIntel_install_en-US.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.2.1_LinuxIntel_install_en-US.tar.gz.sig
new file mode 100644
index 0000000..b468c66
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.2.1_LinuxIntel_install_en-US.tar.gz.sig
differ
diff --git
a/z-editors/openoffice2-bin/OOo_2.2.1_LinuxIntel_install_nl.tar.gz.sig
b/z-editors/openoffice2-bin/OOo_2.2.1_LinuxIntel_install_nl.tar.gz.sig
new file mode 100644
index 0000000..3e55084
Binary files /dev/null and
b/z-editors/openoffice2-bin/OOo_2.2.1_LinuxIntel_install_nl.tar.gz.sig differ
diff --git a/z-editors/openoffice2-bin/PRE_BUILD
b/z-editors/openoffice2-bin/PRE_BUILD
index 88b68e3..19c3071 100755
--- a/z-editors/openoffice2-bin/PRE_BUILD
+++ b/z-editors/openoffice2-bin/PRE_BUILD
@@ -1,7 +1,7 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
-
unpack_file '' &&
+#verify_file '1' &&

#
# Not all tarballs are created equal
@@ -25,9 +25,16 @@ do
FILE="${FILE%.i586.rpm}"
PART=$(sed 's/openoffice.org-\([^-]*\)-.*$/\1/;' <<< $FILE)
message "${MESSAGE_COLOR}Extracting $PART ${DEFAULT_COLOR}" &&
- rpmunpack $FILE.i586.rpm &&
- gzip -d $FILE.cpio.gz &&
- cpio -idm < $FILE.cpio
+
+ if [[ "$FILE" == "openoffice.org-core04u-2.2.1-9161.i586.rpm" ]];
then
+ rpmunpack $SOURCE_CACHE/$SOURCE2 &&
+ gzip -d ${SOURCE2/.i586.rpm/.cpio.gz} &&
+ cpio -idm < ${SOURCE2/.i586.rpm/.cpio}
+ else
+ rpmunpack $FILE.i586.rpm &&
+ gzip -d $FILE.cpio.gz &&
+ cpio -idm < $FILE.cpio
+ fi
done &&

message "${MESSAGE_COLOR}Extracting icons ${DEFAULT_COLOR}" &&
diff --git a/z-editors/openoffice2-bin/UNATTEND_SAFE
b/z-editors/openoffice2-bin/UNATTEND_SAFE
new file mode 100644
index 0000000..e69de29
diff --git a/z-editors/openoffice2-bin/locales
b/z-editors/openoffice2-bin/locales
index 10e4d34..3c0393c 100644
--- a/z-editors/openoffice2-bin/locales
+++ b/z-editors/openoffice2-bin/locales
@@ -3,6 +3,7 @@ de German_locale off
fr French_locale off
it Italy_locale off
nb NB_locale off
+nl Dutch_locale off
nn NN_locale off
pl PL_locale off
ru Russia_locale off
diff --git
a/z-editors/openoffice2-bin/openoffice.org-core04u-2.2.1-9161.i586.rpm.sig
b/z-editors/openoffice2-bin/openoffice.org-core04u-2.2.1-9161.i586.rpm.sig
new file mode 100644
index 0000000..9837ee0
Binary files /dev/null and
b/z-editors/openoffice2-bin/openoffice.org-core04u-2.2.1-9161.i586.rpm.sig
differ



  • [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (1cabf706129449c1ebd6e5637072636106149e1b), Eric Sandall, 08/04/2007

Archive powered by MHonArc 2.6.24.

Top of Page