[SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (5d73dc4b546f91af629ceba211971c35e8f983e2)
Eric Sandall
scm at sourcemage.org
Sun Aug 5 00:46:03 EDT 2007
GIT changes to master z-rejected grimoire by Eric Sandall <sandalle at sourcemage.org>:
z-editors/openoffice2-bin/HISTORY | 1 +
z-editors/openoffice2-bin/PRE_BUILD | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5d73dc4b546f91af629ceba211971c35e8f983e2
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>
openoffice2-bin: This didn't work after committing, no idea why, but using PART works better
diff --git a/z-editors/openoffice2-bin/HISTORY b/z-editors/openoffice2-bin/HISTORY
index b88d864..801f3b0 100644
--- a/z-editors/openoffice2-bin/HISTORY
+++ b/z-editors/openoffice2-bin/HISTORY
@@ -1,6 +1,7 @@
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
+ Use PART to compare instead of FILE, works better
* UNATTEND_SAFE: Safe for unattended updates
2007-07-11 Arjan Bouter <abouter at sourcemage.org>
diff --git a/z-editors/openoffice2-bin/PRE_BUILD b/z-editors/openoffice2-bin/PRE_BUILD
index 19c3071..088b842 100755
--- a/z-editors/openoffice2-bin/PRE_BUILD
+++ b/z-editors/openoffice2-bin/PRE_BUILD
@@ -26,7 +26,7 @@ do
PART=$(sed 's/openoffice.org-\([^-]*\)-.*$/\1/;' <<< $FILE)
message "${MESSAGE_COLOR}Extracting $PART ${DEFAULT_COLOR}" &&
- if [[ "$FILE" == "openoffice.org-core04u-2.2.1-9161.i586.rpm" ]]; then
+ if [[ "$PART" == "core04u" ]]; then
rpmunpack $SOURCE_CACHE/$SOURCE2 &&
gzip -d ${SOURCE2/.i586.rpm/.cpio.gz} &&
cpio -idm < ${SOURCE2/.i586.rpm/.cpio}
More information about the SM-Commit
mailing list