diff options
| author | George Sherwood | 2010-08-14 13:34:10 -0500 |
|---|---|---|
| committer | George Sherwood | 2010-08-14 13:34:10 -0500 |
| commit | c62f268941ab55534370fc6b2288bfaec2b8cea8 (patch) | |
| tree | dfd375083dd821ce221a53aa7611de85dbd3b06c | |
| parent | 4acfa2c3c2655262074b0d48c61fa540a50458d4 (diff) | |
openoffice: Updated to use rpm2targz. See Bug #15715
| -rwxr-xr-x | bin-editors/openoffice3-bin/DEPENDS | 2 | ||||
| -rw-r--r-- | bin-editors/openoffice3-bin/HISTORY | 4 | ||||
| -rwxr-xr-x | bin-editors/openoffice3-bin/PRE_BUILD | 10 |
3 files changed, 9 insertions, 7 deletions
diff --git a/bin-editors/openoffice3-bin/DEPENDS b/bin-editors/openoffice3-bin/DEPENDS index 5382075..15e7336 100755 --- a/bin-editors/openoffice3-bin/DEPENDS +++ b/bin-editors/openoffice3-bin/DEPENDS @@ -1,5 +1,5 @@ depends gmp && -depends rpmunpack && +depends rpm2targz && depends freetype2 && depends zlib && depends OPENGL && diff --git a/bin-editors/openoffice3-bin/HISTORY b/bin-editors/openoffice3-bin/HISTORY index 9b0b307..51428e3 100644 --- a/bin-editors/openoffice3-bin/HISTORY +++ b/bin-editors/openoffice3-bin/HISTORY @@ -1,3 +1,7 @@ +2010-08-14 George Sherwood <gsherwood@sourcemage.org> + * DEPENDS: depends rpm2targz. See Bug #15715 + * PRE_BUILD: use rpm2tar and tar uncompress + 2010-03-06 Pol Vinogradov <vin.public@gmail.com> * DETAILS: 3.2.0 Build 9483 * PRE_BUILD: Freedesktop menus updated to Build 9483 diff --git a/bin-editors/openoffice3-bin/PRE_BUILD b/bin-editors/openoffice3-bin/PRE_BUILD index e6da0f6..ff810f9 100755 --- a/bin-editors/openoffice3-bin/PRE_BUILD +++ b/bin-editors/openoffice3-bin/PRE_BUILD @@ -14,9 +14,8 @@ do PART=$(sed 's/openoffice.org-\([^-]*\)-.*$/\1/;' <<< $FILE) message "${MESSAGE_COLOR}Extracting $PART ${DEFAULT_COLOR}" && - rpmunpack $FILE.${OO_ARCH}.rpm && - gzip -d $FILE.cpio.gz && - cpio -idm < $FILE.cpio + rpm2tar $FILE.${OO_ARCH}.rpm && + tar xvf $FILE.${OO_ARCH}.tar done && message "${MESSAGE_COLOR}Extracting icons ${DEFAULT_COLOR}" && @@ -25,6 +24,5 @@ if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then else FILENAME="openoffice.org${VERSION%.*}-freedesktop-menus-${VERSION%.*}-9472" fi && -rpmunpack desktop-integration/${FILENAME}.noarch.rpm && -gzip -d ${FILENAME}.cpio.gz && -cpio -idm < ${FILENAME}.cpio +rpm2tar desktop-integration/${FILENAME}.noarch.rpm && +tar xvf ${FILENAME}.noarch.tar |